property bindings should work together with type hints, e.g. for stub…

…bles\lang\SecureString
stubbles · Aug 10, 2014 · b4e4398 · b4e4398
1 parent c626012
commit b4e4398
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+4.1.3 (2014-08-10)
+------------------
+
+  * fixed bug that property bindings did not work together with type hints, e.g. for `stubbles\lang\SecureString`
+
+
 4.1.2 (2014-08-10)
 ------------------
 

diff --git a/src/main/php/ioc/Injector.php b/src/main/php/ioc/Injector.php
@@ -268,6 +268,10 @@ private function getParamType(ReflectionMethod $method, ReflectionParameter $par
     {
         $paramClass = $param->getClass();
         if (null !== $paramClass) {
+            if ($method->hasAnnotation('Property') || $param->hasAnnotation('Property')) {
+                return BindingIndex::getPropertyType();
+            }
+
             return $paramClass->getName();
         }
 

diff --git a/src/test/php/ioc/binding/PropertyBindingTest.php b/src/test/php/ioc/binding/PropertyBindingTest.php
@@ -8,8 +8,30 @@
  * @package  stubbles
  */
 namespace stubbles\ioc\binding;
+use stubbles\ioc\Binder;
 use stubbles\lang;
 use stubbles\lang\Properties;
+use stubbles\lang\SecureString;
+/**
+ * Class used for tests.
+ *
+ * @since  4.1.3
+ */
+class Example
+{
+    public $password;
+    /**
+     * constructor
+     *
+     * @param  \stubbles\lang\SecureString  $password
+     * @Inject
+     * @Property('example.password')
+     */
+    public function __construct(SecureString $password)
+    {
+        $this->password = $password;
+    }
+}
 /**
  * Test for stubbles\ioc\binding\PropertyBinding.
  *
@@ -47,18 +69,19 @@ public function setUp()
                                        ->disableOriginalConstructor()
                                        ->getMock();
         $this->mockMode         = $this->getMock('stubbles\lang\Mode');
-        $this->propertyBinding  = new PropertyBinding(new Properties(['PROD'   => ['foo.bar' => 'baz',
-                                                                                   'baz'     => __CLASS__ . '.class'
-                                                                                  ],
-                                                                      'config' => ['foo.bar' => 'default',
-                                                                                   'other'   => 'someValue',
-                                                                                   'baz'     => 'stubbles\lang\Properties.class'
-                                                                                  ]
-                                                                     ]
-                                                      ),
-                                                      $this->mockMode
+        $this->propertyBinding  = new PropertyBinding(
+                new Properties(['PROD'   => ['foo.bar' => 'baz',
+                                             'baz'     => __CLASS__ . '.class'
+                                            ],
+                                'config' => ['foo.bar'          => 'default',
+                                             'other'            => 'someValue',
+                                             'baz'              => 'stubbles\lang\Properties.class'
+                                            ]
+                               ]
+                ),
+                $this->mockMode
 
-                                  );
+        );
     }
 
     /**
@@ -186,4 +209,28 @@ public function returnsParsedValuesForCommonProperties()
                 $this->propertyBinding->getInstance($this->mockInjector, 'baz')
         );
     }
+
+    /**
+     * @test
+     * @since  4.1.3
+     */
+    public function propertyBindingUsedWhenParamHasTypeHintButIsAnnotated()
+    {
+        $this->mockMode->expects($this->any())
+                       ->method('name')
+                       ->will($this->returnValue('PROD'));
+        $binder     = new Binder();
+        $properties = new Properties(
+                    ['config' => ['example.password' => 'somePassword']]
+                );
+        $binder->bindProperties($properties, $this->mockMode);
+        $example = $binder->getInjector()->getInstance('stubbles\ioc\binding\Example');
+        $this->assertInstanceOf('stubbles\lang\SecureString', $example->password);
+        // ensure all references are removed to clean up environment
+        // otherwise all *SecureStringTests will fail
+        $properties = null;
+        $example->password = null;
+        $binder = null;
+        gc_collect_cycles();
+    }
 }