Merge pull request #19 from jakzal/ignore-base-test-case

Ignore the base phpunit test case during property extraction

Author: jakzal

Diff for: composer.json

@@ -6,7 +6,7 @@
         "php": "^7.2",
         "phpunit/phpunit": "^8.0",
         "psr/container": "^1.0",
-        "zalas/injector": "^1.0"
+        "zalas/injector": "^1.2"
     },
     "require-dev": {
         "symfony/config": "^3.4 || ^4.0",

Diff for: depfile.yml

@@ -75,6 +75,7 @@ ruleset:
   Symfony Compiler:
     - Injector Factory
     - Injector Service
+    - PHPUnit
     - TestCase
     - Symfony Config
     - Symfony DependencyInjection

Diff for: src/Symfony/Compiler/Discovery/PropertyDiscovery.php

@@ -3,6 +3,8 @@
 
 namespace Zalas\Injector\PHPUnit\Symfony\Compiler\Discovery;
 
+use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\TestCase;
 use Zalas\Injector\Factory\DefaultExtractorFactory;
 use Zalas\Injector\PHPUnit\TestCase\ServiceContainerTestCase;
 use Zalas\Injector\Service\ExtractorFactory;
@@ -23,7 +25,7 @@ class PropertyDiscovery
     public function __construct(?ClassFinder $classFinder = null, ?ExtractorFactory $extractorFactory = null)
     {
         $this->classFinder = $classFinder ?? new ClassFinder();
-        $this->extractorFactory = $extractorFactory ?? new DefaultExtractorFactory();
+        $this->extractorFactory = $extractorFactory ?? new DefaultExtractorFactory([TestCase::class, Assert::class]);
     }
 
     /**

Diff for: src/TestListener/ServiceInjectorListener.php

@@ -3,7 +3,9 @@
 
 namespace Zalas\Injector\PHPUnit\TestListener;
 
+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestListener;
 use PHPUnit\Framework\TestListenerDefaultImplementation;
 use Zalas\Injector\Factory\DefaultExtractorFactory;
@@ -17,7 +19,7 @@ class ServiceInjectorListener implements TestListener
     public function startTest(Test $test): void
     {
         if ($test instanceof ServiceContainerTestCase) {
-            $injector = new Injector(new TestCaseContainerFactory($test), new DefaultExtractorFactory());
+            $injector = new Injector(new TestCaseContainerFactory($test), new DefaultExtractorFactory([TestCase::class, Assert::class]));
             $injector->inject($test);
         }
     }