Merge pull request #5 from fmasa/robot-loader-3

Add support for nette/robot-loader 3

Author: fmasa

.travis.yml

@@ -16,6 +16,8 @@ php:
 matrix:
   include:
     - php: 5.6
+      env:
+        - COMPOSER_FLAGS="--prefer-lowest --prefer-stable"
     - php: 7.0
     - php: 7.1
       env: COVERAGE="--coverage-clover build/logs/clover.xml"
@@ -25,7 +27,7 @@ before_install:
   - travis_retry composer self-update
 
 install:
-  - travis_retry composer update --no-interaction --prefer-dist
+  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
 
 script:
   - vendor/bin/phpunit $COVERAGE

composer.json

@@ -4,7 +4,7 @@
     "require": {
 	"php": "^5.6 || ^7.0",
         "nette/di": "^2.3",
-        "nette/robot-loader": "^2.3"
+        "nette/robot-loader": "^2.4.2|^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",
@@ -24,5 +24,10 @@
             "Fmasa\\": "src/"
         }
     },
+    "autoload-dev": {
+        "classmap": [
+            "tests/fixtures/"
+        ]
+    },
     "minimum-stability": "stable"
 }

src/AutoDI/DI/AutoDIExtension.php

@@ -15,17 +15,20 @@ class AutoDIExtension extends CompilerExtension
             '%appDir%',
         ],
         'defaults' => [],
+		'tempDir' => '%tempDir%',
     ];
 
     public function beforeCompile()
     {
         $config = $this->getConfig($this->defaults);
 
         $robotLoader = new RobotLoader();
+
         foreach($config['directories'] as $directory) {
             $robotLoader->addDirectory($directory);
         }
 
+        $robotLoader->setTempDirectory($config['tempDir']);
         $robotLoader->rebuild();
 
         $classes = new ClassList(

tests/ClassListTest.php

@@ -2,7 +2,6 @@
 
 namespace Fmasa\AutoDI;
 
-use Nette\Loaders\RobotLoader;
 use PHPUnit\Framework\TestCase;
 use Fmasa\AutoDI\Tests;
 
@@ -16,14 +15,6 @@ class ClassListTest extends TestCase
         Tests\Dir01\SimpleService\AnotherService::class,
     ];
 
-    protected function setUp()
-    {
-        $loader = new RobotLoader();
-        $loader->addDirectory(__DIR__ . '/fixtures');
-        $loader->setTempDirectory(__DIR__ . '/temp');
-        $loader->register();
-    }
-
     public function testClassFilterWithDirectoryWildcard()
     {
         $filter = new ClassList(self::CLASSES);