Support scalar types

dakorpar · Oct 10, 2017 · 1db03d8 · 1db03d8
1 parent b832cb6
commit 1db03d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Kdyby/Aop/PhpGenerator/PointcutMethod.php b/src/Kdyby/Aop/PhpGenerator/PointcutMethod.php
@@ -244,7 +244,9 @@ public static function expandTypeHints(\ReflectionMethod $from, Code\Method $met
 
 		foreach ($from->getParameters() as $paramRefl) {
 			try {
-				$parameters[$paramRefl->getName()]->setTypeHint($paramRefl->isArray() ? 'array' : ($paramRefl->getClass() ? '\\' . $paramRefl->getClass()->getName() : ''));
+				if(!in_array($parameters[$paramRefl->getName()]->getTypeHint(),['boolean', 'integer', 'float', 'string', 'object', 'int', 'bool', ])) {
+					$parameters[$paramRefl->getName()]->setTypeHint($paramRefl->isArray() ? 'array' : ($paramRefl->getClass() ? '\\' . $paramRefl->getClass()->getName() : ''));
+				}
 			} catch (\ReflectionException $e) {
 				if (preg_match('#Class (.+) does not exist#', $e->getMessage(), $m)) {
 					$parameters[$paramRefl->getName()]->setTypeHint('\\' . $m[1]);

diff --git a/tests/KdybyTests/Aop/AdvisedClassType.phpt b/tests/KdybyTests/Aop/AdvisedClassType.phpt
@@ -29,10 +29,9 @@ class AdvisedClassTypeTest extends Tester\TestCase
 		$testClass = ClassType::from(TestClass::class);
 
 		$method = Kdyby\Aop\PhpGenerator\AdvisedClassType::setMethodInstance($testClass, $testClass->getMethod('first'));
+		$string = $methodCode = $method->__toString();
 		Assert::count(2, $method->getParameters());
 	}
-
-
 }
 
 class TestClass