#137 - stops dice breaking under some conditions when scalar type hin…

…ts are present

Dice.php

@@ -117,7 +117,7 @@ private function getClosure($name, array $rule) {
 				// Generate the method arguments using getParams() and call the returned closure (in php7 will be ()() rather than __invoke)
 				$params = $this->getParams($class->getMethod($call[0]), ['shareInstances' => isset($rule['shareInstances']) ? $rule['shareInstances'] : [] ])->__invoke($this->expand(isset($call[1]) ? $call[1] : []));
 				$return = $object->{$call[0]}(...$params);
-				if (isset($call[2]) && is_callable($call[2])) call_user_func($call[2], $return);  
+				if (isset($call[2]) && is_callable($call[2])) call_user_func($call[2], $return);
 			}
 			return $object;
 		} : $closure;
@@ -178,7 +178,7 @@ private function getParams(\ReflectionMethod $method, array $rule) {
 					}
 				}
 				// When nothing from $args matches but a class is type hinted, create an instance to use, using a substitution if set
-				if ($class)	try { 
+				if ($class)	try {
 					$parameters[] = $sub ? $this->expand($rule['substitutions'][$class], $share, true) : $this->create($class, [], $share);
 				}
 				catch (\InvalidArgumentException $e) {
@@ -187,7 +187,9 @@ private function getParams(\ReflectionMethod $method, array $rule) {
 				// For variadic parameters, provide remaining $args
 				else if ($param->isVariadic()) $parameters = array_merge($parameters, $args);
 				// There is no type hint, take the next available value from $args (and remove it from $args to stop it being reused)
-				else if ($args) $parameters[] = $this->expand(array_shift($args));
+				// Support PHP 7 scalar type hinting,  is_a('string', 'foo') doesn't work so this a
+				// is hacky AF workaround: call_user_func('is_' . $type, '')
+				else if ($args && (!$param->getType() || call_user_func('is_' . $param->getType()->getName(), $args[0]))) $parameters[] = $this->expand(array_shift($args));
 				// There's no type hint and nothing left in $args, provide the default value or null
 				else $parameters[] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null;
 			}

tests/BasicTest.php

@@ -25,17 +25,17 @@ public function testCreateInvalid() {
 			throw new ErrorException('Error occurred');
 		}
 	}
-	
+
 	public function testNoConstructor() {
-		$a = $this->dice->create('NoConstructor');		
+		$a = $this->dice->create('NoConstructor');
 		$this->assertInstanceOf('NoConstructor', $a);
 	}
 
 
 	public function testSetDefaultRule() {
 		$defaultBehaviour = [];
 		$defaultBehaviour['shared'] = true;
-		$this->dice->addRule('*', $defaultBehaviour);		
+		$this->dice->addRule('*', $defaultBehaviour);
 
 		$rule = $this->dice->getRule('*');
 		foreach ($defaultBehaviour as $name => $value) {
@@ -47,24 +47,24 @@ public function testSetDefaultRule() {
 	public function testDefaultRuleWorks() {
 		$defaultBehaviour = [];
 		$defaultBehaviour['shared'] = true;
-		
+
 		$this->dice->addRule('*', $defaultBehaviour);
-		
+
 		$rule = $this->dice->getRule('A');
-		
+
 		$this->assertTrue($rule['shared']);
-		
+
 		$a1 = $this->dice->create('A');
 		$a2 = $this->dice->create('A');
-		
+
 		$this->assertSame($a1, $a2);
 	}
 
 
 	/*
 	 * Object graph creation cannot be tested with mocks because the constructor need to be tested.
 	 * You can't set 'expects' on the objects which are created making them redundant for that as well
-	 * Need real classes to test with unfortunately. 
+	 * Need real classes to test with unfortunately.
 	 */
 	public function testObjectGraphCreation() {
 		$a = $this->dice->create('A');
@@ -73,15 +73,15 @@ public function testObjectGraphCreation() {
 		$this->assertInstanceOf('D', $a->b->c->d);
 		$this->assertInstanceOf('E', $a->b->c->e);
 		$this->assertInstanceOf('F', $a->b->c->e->f);
-	} 
+	}
 
 	public function testSharedNamed() {
 		$rule = [];
 		$rule['shared'] = true;
 		$rule['instanceOf'] = 'A';
-		
+
 		$this->dice->addRule('[A]', $rule);
-		
+
 		$a1 = $this->dice->create('[A]');
 		$a2 = $this->dice->create('[A]');
 		$this->assertSame($a1, $a2);
@@ -90,55 +90,55 @@ public function testSharedNamed() {
 	public function testSharedRule() {
 		$shared = [];
 		$shared['shared'] = true;
-	
+
 		$this->dice->addRule('MyObj', $shared);
-	
+
 		$obj = $this->dice->create('MyObj');
 		$this->assertInstanceOf('MyObj', $obj);
-	
+
 		$obj2 = $this->dice->create('MyObj');
 		$this->assertInstanceOf('MyObj', $obj2);
-	
+
 		$this->assertSame($obj, $obj2);
-	
-	
+
+
 		//This check isn't strictly needed but it's nice to have that safety measure!
 		$obj->setFoo('bar');
 		$this->assertEquals($obj->getFoo(), $obj2->getFoo());
 		$this->assertEquals($obj->getFoo(), 'bar');
 		$this->assertEquals($obj2->getFoo(), 'bar');
 	}
 
-	
+
 	public function testInterfaceRule() {
 		$rule = [];
 
 		$rule['shared'] = true;
 		$this->dice->addRule('interfaceTest', $rule);
-		
+
 		$one = $this->dice->create('InterfaceTestClass');
-		$two = $this->dice->create('InterfaceTestClass');		
-		
-		$this->assertSame($one, $two);		
+		$two = $this->dice->create('InterfaceTestClass');
+
+		$this->assertSame($one, $two);
 	}
 
 	public function testCyclicReferences() {
 		$rule = [];
 		$rule['shared'] = true;
-		
+
 		$this->dice->addRule('CyclicB', $rule);
-		
+
 		$a = $this->dice->create('CyclicA');
-		
+
 		$this->assertInstanceOf('CyclicB', $a->b);
 		$this->assertInstanceOf('CyclicA', $a->b->a);
-		
+
 		$this->assertSame($a->b, $a->b->a->b);
 	}
 
 	public function testInherit() {
 		$rule = ['shared' => true, 'inherit' => false];
-		
+
 		$this->dice->addRule('ParentClass', $rule);
 		$obj1 = $this->dice->create('Child');
 		$obj2 = $this->dice->create('Child');
@@ -165,4 +165,14 @@ public function testOptionalInterface() {
 
 		$this->assertEquals(null, $optionalInterface->obj);
 	}
+
+
+	public function testScalarTypeHintWithShareInstances() {
+
+		$this->dice->addRule('ScalarTypeHint', ['shareInstances' => ['A']]);
+
+		$obj = $this->dice->create('ScalarTypeHint');
+
+		$this->assertInstanceOf('ScalarTypeHint', $obj);
+	}
 }

tests/TestData/Basic.php

@@ -6,15 +6,15 @@ class NoConstructor {
 
 class CyclicA {
 	public $b;
-	
+
 	public function __construct(CyclicB $b) {
 		$this->b = $b;
 	}
 }
 
 class CyclicB {
 	public $a;
-	
+
 	public function __construct(CyclicA $a) {
 		$this->a = $a;
 	}
@@ -91,7 +91,7 @@ public function getFoo() {
 class MethodWithDefaultValue {
 	public $a;
 	public $foo;
-	
+
 	public function __construct(A $a, $foo = 'bar') {
 		$this->a = $a;
 		$this->foo = $foo;
@@ -126,4 +126,11 @@ class OptionalInterface {
 	public function __construct(InterfaceTest $obj = null) {
 		$this->obj = $obj;
 	}
+}
+
+
+class ScalarTypeHint {
+	public function __construct(string $a = null) {
+
+	}
 }