Merge pull request #197 from apiato/refactor

composer.json

@@ -42,6 +42,7 @@
     "require-dev": {
         "fakerphp/faker": "^1.19.1",
         "friendsofphp/php-cs-fixer": "^3.8.0",
+        "jetbrains/phpstorm-attributes": "^1.0",
         "mockery/mockery": "^1.4.4",
         "orchestra/testbench": "^8.15",
         "php-standard-library/psalm-plugin": "^2.3",

src/Abstracts/Providers/MiddlewareServiceProvider.php

@@ -27,8 +27,6 @@ abstract class MiddlewareServiceProvider extends MainServiceProvider
      * The application's route middleware.
      *
      * @var array<string, class-string|string>
-     *
-     * @deprecated
      */
     protected array $routeMiddleware = [];
 

src/Generator/GeneratorCommand.php

@@ -233,7 +233,7 @@ protected function getStubContent(): string
         // Check if the custom file exists
         if (!$this->fileSystem->exists($file)) {
             // It does not exist - so take the default file!
-            $path = __DIR__ . 'GeneratorCommand.php/' . self::STUB_PATH;
+            $path = __DIR__ . '/' . self::STUB_PATH;
             $file = str_replace('*', $this->stubName, $path);
         }
 

src/Loaders/ProvidersLoaderTrait.php

@@ -9,8 +9,6 @@
 
 trait ProvidersLoaderTrait
 {
-    public array $serviceProviders = [];
-
     /**
      * Loads only the Main Service Providers from the Containers.
      * All the Service Providers (registered inside the main), will be

src/Traits/TestTraits/PhpUnit/TestAssertionHelperTrait.php

@@ -97,23 +97,23 @@ protected function getInaccessiblePropertyValue(object $object, string $property
     }
 
     /**
-     * Create a spy for a task with a specified repository instance.
+     * Create a spy for an Action, SubAction or a Task that uses a repository.
      *
-     * @param string $taskClassName the task class name
+     * @param string $className the Action, SubAction or a Task class name
      * @param string $repositoryClassName the repository class name
      */
-    protected function createTaskSpyWithRepository(string $taskClassName, string $repositoryClassName, bool $allowRun = true): MockInterface
+    protected function createSpyWithRepository(string $className, string $repositoryClassName, bool $allowRun = true): MockInterface
     {
         /** @var MockInterface $taskSpy */
-        $taskSpy = \Mockery::mock($taskClassName, [app($repositoryClassName)])
+        $taskSpy = \Mockery::mock($className, [app($repositoryClassName)])
             ->shouldIgnoreMissing(null, true)
             ->makePartial();
 
         if ($allowRun) {
             $taskSpy->allows('run')->andReturn();
         }
 
-        $this->swap($taskClassName, $taskSpy);
+        $this->swap($className, $taskSpy);
 
         return $taskSpy;
     }