Fix tests and comments

dunglas · dunglas · commit 4a0483dbdf57 · 2018-09-04T13:00:46.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/CHANGELOG.md b/src/Symfony/Component/PropertyInfo/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 4.2.0
 -----
 
-* added `PropertyInitializableExtractorInterface` to test if a property can be initialized through the constructor and an implementation is `ReflectionExtractor` 
+* added `PropertyInitializableExtractorInterface` to test if a property can be initialized through the constructor (implemented by ReflectionExtractor`)
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/PropertyInfo/PropertyInitializableExtractorInterface.php b/src/Symfony/Component/PropertyInfo/PropertyInitializableExtractorInterface.php
@@ -19,7 +19,7 @@
 interface PropertyInitializableExtractorInterface
 {
     /**
-     * Is the property initializable?
+     * Is the property initializable? Returns true if a constructor's parameter matches the given property name.
      */
     public function isInitializable(string $class, string $property, array $context = array()): ?bool;
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -16,7 +16,6 @@
 use Symfony\Component\PropertyInfo\Tests\Fixtures\AdderRemoverDummy;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\NotInstantiable;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Php71Dummy;
-use Symfony\Component\PropertyInfo\Tests\Fixtures\Php71DummyExtended;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Php71DummyExtended2;
 use Symfony\Component\PropertyInfo\Type;
 
@@ -289,7 +288,6 @@ public function getInitializableProperties(): array
             array(Php71Dummy::class, 'string', true),
             array(Php71Dummy::class, 'intPrivate', true),
             array(Php71Dummy::class, 'notExist', false),
-            array(Php71DummyExtended::class, 'intWithAccessor', true),
             array(Php71DummyExtended2::class, 'intWithAccessor', true),
             array(Php71DummyExtended2::class, 'intPrivate', false),
             array(NotInstantiable::class, 'foo', false),
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php71Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php71Dummy.php
@@ -16,6 +16,10 @@
  */
 class Php71Dummy
 {
+    public function __construct(string $string, int $intPrivate)
+    {
+    }
+
     public function getFoo(): ?array
     {
     }
@@ -42,4 +46,8 @@ class Php71DummyExtended2 extends Php71Dummy
     public function __construct(int $intWithAccessor)
     {
     }
+
+    public function getIntWithAccessor()
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`interface PropertyInitializableExtractorInterface`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`		`- * Is the property initializable?`
	`22`	`+ * Is the property initializable? Returns true if a constructor's parameter matches the given property name.`
`23`	`23`	`*/`
`24`	`24`	`public function isInitializable(string $class, string $property, array $context = array()): ?bool;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@`
`16`	`16`	`*/`
`17`	`17`	`class Php71Dummy`
`18`	`18`	`{`
	`19`	`+ public function __construct(string $string, int $intPrivate)`
	`20`	`+ {`
	`21`	`+ }`
	`22`	`+`
`19`	`23`	`public function getFoo(): ?array`
`20`	`24`	`{`
`21`	`25`	`}`
`@@ -42,4 +46,8 @@ class Php71DummyExtended2 extends Php71Dummy`
`42`	`46`	`public function __construct(int $intWithAccessor)`
`43`	`47`	`{`
`44`	`48`	`}`
	`49`	`+`
	`50`	`+ public function getIntWithAccessor()`
	`51`	`+ {`
	`52`	`+ }`
`45`	`53`	`}`