Merge pull request #87 from KacerCZ/remove-nette-reflection

Removed nette/reflection dependency
Kdyby · Dec 9, 2019 · fb2a66a · fb2a66a
2 parents f004495 + 5d6028f
commit fb2a66a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -22,8 +22,7 @@
 		"nette/di": "~2.4.10 || ~3.0",
 		"nette/caching": "~3.0",
 		"nette/http": "~2.4.7 || ~3.0",
-		"nette/utils": "~2.5 || ~3.0",
-		"nette/reflection": "^2.4"
+		"nette/utils": "~2.5 || ~3.0"
 	},
 	"suggest": {
 		"ext-redis": "The php redis extension https://github.com/nicolasff/phpredis/ is required for connecting to redis server"

diff --git a/tests/KdybyTests/Redis/AbstractRedisTestCase.php b/tests/KdybyTests/Redis/AbstractRedisTestCase.php
@@ -6,7 +6,6 @@
 
 use Closure;
 use Kdyby\Redis\RedisClient;
-use Nette\Reflection\ClassType;
 use Nette\Utils\FileSystem;
 use ReflectionClass;
 use ReflectionFunctionAbstract;
@@ -91,10 +90,10 @@ protected function threadStress(Closure $closure, int $repeat = 100, int $thread
 		FileSystem::createDir($dir = \dirname($scriptFile));
 
 		$extractor = new ClosureExtractor($closure);
-		\file_put_contents($scriptFile, $extractor->buildScript(ClassType::from($this), $repeat));
+		$testRefl = new ReflectionClass($this);
+		\file_put_contents($scriptFile, $extractor->buildScript($testRefl, $repeat));
 		@\chmod($scriptFile, 0755);
 
-		$testRefl = new ReflectionClass($this);
 		$collector = new ResultsCollector(\dirname($testRefl->getFileName()) . '/output', $runTest['args'][0]);
 
 		// todo: fix for hhvm

diff --git a/tests/KdybyTests/Redis/ClosureExtractor.php b/tests/KdybyTests/Redis/ClosureExtractor.php
@@ -10,13 +10,13 @@ class ClosureExtractor
 	use \Nette\SmartObject;
 
 	/**
-	 * @var \Nette\Reflection\GlobalFunction
+	 * @var \ReflectionFunction
 	 */
 	private $closure;
 
 	public function __construct(\Closure $closure)
 	{
-		$this->closure = new \Nette\Reflection\GlobalFunction($closure);
+		$this->closure = new \ReflectionFunction($closure);
 	}
 
 	public function buildScript(