Add scalar typehints/return types on final/internal/private code

Author: Robin Chalas

Definition.php

@@ -30,7 +30,7 @@ final class Definition
      * @param Transition[] $transitions
      * @param string|null  $initialPlace
      */
-    public function __construct(array $places, array $transitions, $initialPlace = null)
+    public function __construct(array $places, array $transitions, string $initialPlace = null)
     {
         foreach ($places as $place) {
             $this->addPlace($place);
@@ -54,20 +54,20 @@ public function getInitialPlace()
     /**
      * @return string[]
      */
-    public function getPlaces()
+    public function getPlaces(): array
     {
         return $this->places;
     }
 
     /**
      * @return Transition[]
      */
-    public function getTransitions()
+    public function getTransitions(): array
     {
         return $this->transitions;
     }
 
-    private function setInitialPlace($place)
+    private function setInitialPlace(string $place = null)
     {
         if (null === $place) {
             return;
@@ -80,7 +80,7 @@ private function setInitialPlace($place)
         $this->initialPlace = $place;
     }
 
-    private function addPlace($place)
+    private function addPlace(string $place)
     {
         if (!preg_match('{^[\w\d_-]+$}', $place)) {
             throw new InvalidArgumentException(sprintf('The place "%s" contains invalid characters.', $place));

Dumper/GraphvizDumper.php

@@ -201,7 +201,7 @@ protected function dotize($id)
         return strtolower(preg_replace('/[^\w]/i', '_', $id));
     }
 
-    private function addAttributes(array $attributes)
+    private function addAttributes(array $attributes): string
     {
         $code = array();
 
@@ -212,7 +212,7 @@ private function addAttributes(array $attributes)
         return $code ? ', '.implode(', ', $code) : '';
     }
 
-    private function addOptions(array $options)
+    private function addOptions(array $options): string
     {
         $code = array();
 

EventListener/GuardListener.php

@@ -51,7 +51,7 @@ public function onTransition(GuardEvent $event, $eventName)
     }
 
     // code should be sync with Symfony\Component\Security\Core\Authorization\Voter\ExpressionVoter
-    private function getVariables(GuardEvent $event)
+    private function getVariables(GuardEvent $event): array
     {
         $token = $this->tokenStorage->getToken();
 

Registry.php

@@ -61,7 +61,7 @@ public function get($subject, $workflowName = null)
         return $matched;
     }
 
-    private function supports(Workflow $workflow, SupportStrategyInterface $supportStrategy, $subject, $workflowName)
+    private function supports(Workflow $workflow, SupportStrategyInterface $supportStrategy, $subject, $workflowName): bool
     {
         if (null !== $workflowName && $workflowName !== $workflow->getName()) {
             return false;

SupportStrategy/ClassInstanceSupportStrategy.php

@@ -11,10 +11,7 @@ final class ClassInstanceSupportStrategy implements SupportStrategyInterface
 {
     private $className;
 
-    /**
-     * @param string $className a FQCN
-     */
-    public function __construct($className)
+    public function __construct(string $className)
     {
         $this->className = $className;
     }