[Config] Code review changes

jschaedl · jschaedl · commit ef7c09cf0518 · 2019-06-01T11:01:06.000+02:00
- fixed argument and return type hints
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
@@ -44,7 +44,7 @@ public function __construct(?string $name, NodeParentInterface $parent = null)
         $this->name = $name;
     }
 
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeFinder.php b/src/Symfony/Component/Config/Definition/Builder/NodeFinder.php
@@ -21,12 +21,9 @@ class NodeFinder
     /**
      * Finds a node defined by $nodePath within the given $rootNode.
      *
-     * @param string         $nodePath The path of the node to find. e.g "doctrine.orm.mappings"
-     * @param NodeDefinition $rootNode
-     *
-     * @return NodeDefinition
+     * @param string $nodePath The path of the node to find. e.g "doctrine.orm.mappings"
      */
-    public function find($nodePath, NodeDefinition $rootNode)
+    public function find(string $nodePath, NodeDefinition $rootNode): NodeDefinition
     {
         if (!$rootNode instanceof ArrayNodeDefinition) {
             if ($nodePath !== $rootNode->getName()) {
diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/NodeFinderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/NodeFinderTest.php
@@ -101,12 +101,7 @@ public function testItShouldHandleComplexConfigurationProbably()
         $this->assertNode($instagramAccountsNode, 'accounts', ArrayNodeDefinition::class);
     }
 
-    /**
-     * @param NodeDefinition $actualNode
-     * @param string         $expectedName
-     * @param string         $expectedType
-     */
-    private function assertNode(NodeDefinition $actualNode, $expectedName, $expectedType)
+    private function assertNode(NodeDefinition $actualNode, string $expectedName, string $expectedType): void
     {
         $this->assertSame($expectedName, $actualNode->getName());
         $this->assertInstanceOf($expectedType, $actualNode);

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(?string $name, NodeParentInterface $parent = null)`
`44`	`44`	`$this->name = $name;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public function getName()`
	`47`	`+ public function getName(): string`
`48`	`48`	`{`
`49`	`49`	`return $this->name;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,7 @@ public function testItShouldHandleComplexConfigurationProbably()`
`101`	`101`	`$this->assertNode($instagramAccountsNode, 'accounts', ArrayNodeDefinition::class);`
`102`	`102`	`}`
`103`	`103`
`104`		`- /**`
`105`		`- * @param NodeDefinition $actualNode`
`106`		`- * @param string $expectedName`
`107`		`- * @param string $expectedType`
`108`		`- */`
`109`		`- private function assertNode(NodeDefinition $actualNode, $expectedName, $expectedType)`
	`104`	`+ private function assertNode(NodeDefinition $actualNode, string $expectedName, string $expectedType): void`
`110`	`105`	`{`
`111`	`106`	`$this->assertSame($expectedName, $actualNode->getName());`
`112`	`107`	`$this->assertInstanceOf($expectedType, $actualNode);`