Check same passed parameters.

sapsan4eg · Apr 2, 2016 · e38a6e9 · e38a6e9
1 parent ed0ad37
commit e38a6e9
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 1 deletion.
diff --git a/src/Inject.php b/src/Inject.php
@@ -89,7 +89,7 @@ protected static function getParameters(\ReflectionMethod $method, array $parame
 
         try {
             foreach ($method->getParameters() as $parameter) {
-                if (isset($parameters[$parameter->getName()]))
+                if (self::sameParameter($parameter, $parameters))
                     $arguments[$parameter->getName()] = $parameters[$parameter->getName()];
                 elseif (null != $parameter->getClass() && self::container()->isInjected($parameter->getClass()->name, $method->getDocComment()))
                     $arguments[$parameter->getName()] = self::instantiation(self::container()->getServiceName($parameter->getClass()->name, $method->getDocComment()));
@@ -105,6 +105,28 @@ protected static function getParameters(\ReflectionMethod $method, array $parame
         return $arguments;
     }
 
+    /**
+     * @param \ReflectionParameter $parameter
+     * @param null|array $parameters
+     * @return bool
+     */
+    protected static function sameParameter(\ReflectionParameter $parameter, $parameters = null)
+    {
+        if (! isset($parameters[$parameter->getName()]))
+            return false;
+
+        if (null == $parameter->getClass() && is_object($parameters[$parameter->getName()]))
+            return false;
+
+        if (null != $parameter->getClass() && ! is_object($parameters[$parameter->getName()]))
+            return false;
+
+        if (null != $parameter->getClass() && ! $parameter->getClass()->isInstance($parameters[$parameter->getName()]))
+            return false;
+
+        return true;
+    }
+
     /**
      * @param object $class
      * @param array|null $properties

diff --git a/tests/InjectExceptionTest.php b/tests/InjectExceptionTest.php
@@ -68,4 +68,14 @@ public function testExceptionClassMustImplements()
         $class->bind("INext", "Start");
         $class->isInjected("INext");
     }
+
+    /**
+     * @expectedException \Sixx\DependencyInjection\Exceptions\InjectException
+     * @expectedExceptionMessage Required parameter [c] in SimpleParameter::__construct is not specified.
+     */
+    public function testExceptionRequiredParameterDifferent()
+    {
+        Inject::bind("INext", "Next");
+        Inject::instantiation("SimpleParameter", ["c" => new Next()]);
+    }
 }
diff --git a/tests/InjectTest.php b/tests/InjectTest.php
@@ -29,4 +29,11 @@ public function testCheckAllInInjected()
         $this->assertInstanceOf("Starter", Inject::method("ChildClass", "getStarter", ["c" => "fff"]));
         $this->assertInstanceOf("Starter", $class->starter);
     }
+
+    public function testCheckInjectParameter()
+    {
+        Inject::instantiation("SimpleParameter", ["c" => 1]);
+        Inject::instantiation("SimpleParameter", ["c" => 1, "d" => new Next()]);
+        Inject::instantiation("SimpleParameter", ["c" => 1, "d" => 2]);
+    }
 }
diff --git a/tests/TestClasses/Classes.php b/tests/TestClasses/Classes.php
@@ -107,3 +107,13 @@ interface IStart
 {
 
 }
+
+class SimpleParameter
+{
+    public $d;
+
+    public function __construct($c, \INext $d)
+    {
+        $this->d = $d;
+    }
+}