Избавление от лишней зависимости

Author: ProklUng

Resources/config/services.yaml

@@ -112,7 +112,7 @@ services:
   # Поисковик классов в директориях.
   class.collector:
     class: Prokl\WpSymfonyRouterBundle\Services\Annotations\SearchAnnotatedClasses
-    arguments: ['%kernel.project_dir%', '%controller.annotations.path%']
+    arguments: ['%controller.annotations.path%']
 
   # Проверка роутов на существование контроллеров.
   router.checker.exists:

Services/Annotations/SearchAnnotatedClasses.php

@@ -17,26 +17,25 @@
  */
 class SearchAnnotatedClasses
 {
-    /** @var array|null $paths Пути, где искать классы. */
+    /**
+     * @var array|null $paths Пути, где искать классы. Указываются с DOCUMENT_ROOT.
+     */
     private $paths;
 
-    /** @var array $classes Результат. Классы. */
+    /**
+     * @var array $classes Результат. Классы.
+     */
     private $classes = [];
-    /** @var string $documentRoot DOCUMENT_ROOT */
-    private $documentRoot;
 
     /**
      * SearchAnnotatedClasses constructor.
      *
-     * @param string     $documentRoot DOCUMENT_ROOT.
      * @param array|null $paths        Пути, где искать классы.
      */
     public function __construct(
-        string $documentRoot,
         ?array $paths = []
     ) {
         $this->paths = $paths;
-        $this->documentRoot = $documentRoot;
     }
 
     /**
@@ -52,10 +51,10 @@ public function collect() : array
 
         $result = [];
         foreach ($this->paths as $path) {
-            $result[] = $this->listClassesByPath($this->documentRoot . $path);
+            $result[] = $this->listClassesByPath($path);
         }
 
-        $result = collect($result)->flatten()->toArray();
+        $result = (array)$result[0];
 
         $this->classes = array_merge($this->classes, $result);
 

Tests/Cases/SearchAnnotatedClassesTest.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Prokl\WpSymfonyRouterBundle\Tests\Cases;
+
+use Prokl\TestingTools\Base\BaseTestCase;
+use Prokl\WpSymfonyRouterBundle\Services\Annotations\SearchAnnotatedClasses;
+
+/**
+ * Class AgnosticRoutesLoaderTest
+ * @package Prokl\BitrixSymfonyRouterBundle\Tests
+ * @coversDefaultClass SearchAnnotatedClasses
+ *
+ * @since 08.08.2021
+ */
+class SearchAnnotatedClassesTest extends BaseTestCase
+{
+    /**
+     * @var SearchAnnotatedClasses $obTestObject Тестируемый объект.
+     */
+    protected $obTestObject;
+
+      /**
+     * @var string $paths
+     */
+    private $paths = [__DIR__ . '/../Fixture/AnnotatedClass'];
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->obTestObject = new SearchAnnotatedClasses($this->paths);
+
+    }
+
+    /**
+     * collect().
+     *
+     * @return void
+     */
+    public function testCollect() : void
+    {
+        $result = $this->obTestObject->collect();
+
+        $this->assertNotEmpty($result);
+        $this->assertCount(2, $result);
+    }
+
+    /**
+     * collect(). Пустая переменная controller.annotations.path.
+     *
+     * @return void
+     */
+    public function testCollectEmptyParams() : void
+    {
+        $this->obTestObject = new SearchAnnotatedClasses([]);
+        $result = $this->obTestObject->collect();
+
+        $this->assertEmpty($result);
+    }
+}

Tests/Fixture/AnnotatedClass/AnnotatedClass.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Fixture\AnnotatedClass;
+
+/**
+ * Class AnnotatedClass
+ * @package Fixture\AnnotatedClass
+ */
+class AnnotatedClass
+{
+
+}

Tests/Fixture/AnnotatedClass/SimpleClass.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Fixture\AnnotatedClass;
+
+/**
+ * Class SimpleClass
+ * @package Fixture\AnnotatedClass
+ */
+class SimpleClass
+{
+
+}

composer.json

@@ -38,8 +38,7 @@
     "symfony/event-dispatcher": "^4.4 || ^5.0",
     "symfony/property-access": "^4.4 || ^5.0",
     "symfony/expression-language": "^4.4 || ^5.0",
-    "symfony/serializer": "^4.4 || ^5.0",
-    "illuminate/support": "~5 | ~6 | ~7 | ~8"
+    "symfony/serializer": "^4.4 || ^5.0"
   },
   "require-dev": {
     "proklung/wordpress-test-build": "^1.2"