Refactor static dependencies

Author: sileence

src/Providers/EnlightenServiceProvider.php

@@ -15,6 +15,7 @@
 use Styde\Enlighten\SessionInspector;
 use Styde\Enlighten\TestInspector;
 use Styde\Enlighten\TestRun;
+use Styde\Enlighten\Utils\TestTrace;
 use Styde\Enlighten\View\Components\AppLayoutComponent;
 use Styde\Enlighten\View\Components\ResponseInfoComponent;
 use Styde\Enlighten\View\Components\StatsBadgeComponent;
@@ -26,7 +27,7 @@ public function boot()
     {
         $this->mergeConfigFrom($this->componentPath('config/enlighten.php'), 'enlighten');
 
-        if (! $this->app['config']->get('enlighten.enabled')) {
+        if (!$this->app['config']->get('enlighten.enabled')) {
             return;
         }
 
@@ -43,12 +44,6 @@ public function boot()
         $this->registerViewComponents();
 
         $this->registerPublishing();
-
-        Annotations::addCast('enlighten', function ($value) {
-            $options = json_decode($value, JSON_OBJECT_AS_ARRAY);
-
-            return array_merge(['include' => true], $options ?: []);
-        });
     }
 
     protected function addDatabaseConnection(Config $config)
@@ -88,7 +83,20 @@ private function registerTestRun()
     private function registerTestInspector()
     {
         $this->app->singleton(TestInspector::class, function () {
-            return new TestInspector($this->app[TestRun::class], $this->app['config']->get('enlighten.tests'));
+            $annotations = new Annotations;
+
+            $annotations->addCast('enlighten', function ($value) {
+                $options = json_decode($value, JSON_OBJECT_AS_ARRAY);
+
+                return array_merge(['include' => true], $options ?: []);
+            });
+
+            return new TestInspector(
+                $this->app[TestRun::class],
+                new TestTrace,
+                $annotations,
+                $this->app['config']->get('enlighten.tests')
+            );
         });
     }
 

src/TestInspector.php

@@ -15,26 +15,30 @@ class TestInspector
     protected array $classOptions = [];
 
     private TestRun $testRun;
+    private TestTrace $testTrace;
+    private Annotations $annotations;
 
     protected array $ignore;
 
-    public function __construct(TestRun $testRun, array $config)
+    public function __construct(TestRun $testRun, TestTrace $testTrace, Annotations $annotations, array $config)
     {
         $this->testRun = $testRun;
+        $this->testTrace = $testTrace;
+        $this->annotations = $annotations;
         $this->ignore = $config['ignore'];
     }
 
     public function getCurrentTestInfo(): TestInfo
     {
-        $trace = TestTrace::get();
+        $trace = $this->testTrace->get();
 
-        $info = $this->getInfo($trace->className, $trace->methodName);
+        $info = $this->getInfo($trace['class'], $trace['function']);
 
         if ($info->isIgnored()) {
             return $info;
         }
 
-        return $info->addLine($trace->line);
+        return $info->addLine($trace['line']);
     }
 
     public function getInfo($className, $methodName): TestInfo
@@ -50,7 +54,7 @@ protected function makeTestMethodInfo(string $className, string $methodName): Te
     {
         $testClassInfo = $this->getClassInfo($className);
 
-        $annotations = Annotations::fromMethod($className, $methodName);
+        $annotations = $this->annotations->getFromMethod($className, $methodName);
 
         if ($this->ignoreTest($className, $methodName, $annotations->get('enlighten', []))) {
             return new IgnoredTest($className, $methodName);
@@ -70,7 +74,7 @@ private function getClassInfo($className): TestClassInfo
 
     private function makeTestClassInfo($name): TestClassInfo
     {
-        $annotations = Annotations::fromClass($name);
+        $annotations = $this->annotations->getFromClass($name);
 
         $this->classOptions = $annotations->get('enlighten', []);
 
@@ -80,7 +84,7 @@ private function makeTestClassInfo($name): TestClassInfo
     protected function getTextsFrom(Collection $annotations): array
     {
         return [
-            'title' => $annotations->get('testdox'),
+            'title' => $annotations->get('title') ?: $annotations->get('testdox'),
             'description' => $annotations->get('description'),
         ];
     }

src/Utils/Annotations.php

@@ -16,14 +16,14 @@ public static function addCast(string $key, Closure $callback)
         static::$casts[$key] = $callback;
     }
 
-    public static function fromClass($class): Collection
+    public function getFromClass($class): Collection
     {
         $reflectionClass = new ReflectionClass($class);
 
         return static::fromDocComment($reflectionClass->getDocComment());
     }
 
-    public static function fromMethod($class, $method): Collection
+    public function getFromMethod($class, $method): Collection
     {
         $reflectionMethod = new ReflectionMethod($class, $method);
 

src/Utils/TestTrace.php

@@ -6,21 +6,11 @@
 
 class TestTrace
 {
-    public string $className;
-    public string $methodName;
-
-    public static function get(): self
+    public function get(): array
     {
-        return new static(collect(debug_backtrace())->first(function ($trace) {
+        return collect(debug_backtrace())->first(function ($trace) {
             return Str::contains($trace['file'], '/phpunit/')
                 && Str::endsWith($trace['file'], '/Framework/TestCase.php');
-        }));
-    }
-
-    public function __construct(array $trace)
-    {
-        $this->className = $trace['class'];
-        $this->methodName = $trace['function'];
-        $this->line = $trace['line'];
+        });
     }
 }

tests/Unit/AnnotationsTest.php

@@ -16,7 +16,7 @@ class AnnotationsTest extends TestCase
     /** @test */
     function gets_annotations_from_class()
     {
-        $annotations = Annotations::fromClass(AnnotationsTest::class);
+        $annotations = (new Annotations)->getFromClass(AnnotationsTest::class);
 
         $this->assertInstanceOf(Collection::class, $annotations);
         $this->assertCount(3, $annotations);
@@ -32,7 +32,7 @@ function gets_annotations_from_class()
      */
     function gets_annotations_from_methods()
     {
-        $annotations = Annotations::fromMethod(AnnotationsTest::class, 'gets_annotations_from_methods');
+        $annotations = (new Annotations)->getFromMethod(AnnotationsTest::class, 'gets_annotations_from_methods');
 
         $this->assertInstanceOf(Collection::class, $annotations);
         $this->assertCount(3, $annotations);