\LastDragon_ru\LaraASP\Spa\Provider => `\LastDragon_ru\LaraASP\Spa\…

…PackageProvider`.
LastDragon-ru · Nov 16, 2024 · 2a1ba38 · 2a1ba38
1 parent 3b05adc
commit 2a1ba38
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 53 deletions.
diff --git a/composer.json b/composer.json
@@ -183,7 +183,7 @@
         "LastDragon_ru\\LaraASP\\GraphQL\\PackageProvider",
         "LastDragon_ru\\LaraASP\\Migrator\\PackageProvider",
         "LastDragon_ru\\LaraASP\\Serializer\\PackageProvider",
-        "LastDragon_ru\\LaraASP\\Spa\\Provider"
+        "LastDragon_ru\\LaraASP\\Spa\\PackageProvider"
       ]
     }
   },

diff --git a/packages/spa/UPGRADE.md b/packages/spa/UPGRADE.md
@@ -41,6 +41,8 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases)
 
 * [ ] Package config now uses objects instead of an array, it is recommended to migrate to the new format. 🤝
 
+* [ ] Use [`PackageProvider`][code-links/fd2e6dfbce2f47cb] instead of [`💀Provider`][code-links/15f480832d63e0d6].
+
 # Upgrade from v5
 
 [include:file]: ../../docs/Shared/Upgrade/FromV5.md
@@ -50,3 +52,14 @@ Please also see [changelog](https://github.com/LastDragon-ru/lara-asp/releases)
 * [ ] Laravel v9 is not supported anymore. Migrate to the newer version.
 
 [//]: # (end: preprocess/2e85dad2b0618274)
+
+[//]: # (start: code-links)
+[//]: # (warning: Generated automatically. Do not edit.)
+
+[code-links/fd2e6dfbce2f47cb]: src/PackageProvider.php
+    "\LastDragon_ru\LaraASP\Spa\PackageProvider"
+
+[code-links/15f480832d63e0d6]: src/Provider.php
+    "\LastDragon_ru\LaraASP\Spa\Provider"
+
+[//]: # (end: code-links)
diff --git a/packages/spa/composer.json b/packages/spa/composer.json
@@ -56,7 +56,7 @@
   "extra": {
     "laravel": {
       "providers": [
-        "LastDragon_ru\\LaraASP\\Spa\\Provider"
+        "LastDragon_ru\\LaraASP\\Spa\\PackageProvider"
       ]
     },
     "lara-asp": {

diff --git a/packages/spa/src/Http/Controllers/SpaControllerTest.php b/packages/spa/src/Http/Controllers/SpaControllerTest.php
@@ -4,7 +4,7 @@
 
 use LastDragon_ru\LaraASP\Spa\Config\Config;
 use LastDragon_ru\LaraASP\Spa\PackageConfig;
-use LastDragon_ru\LaraASP\Spa\Provider;
+use LastDragon_ru\LaraASP\Spa\PackageProvider;
 use LastDragon_ru\LaraASP\Spa\Testing\Package\TestCase;
 use LastDragon_ru\LaraASP\Testing\Constraints\Json\JsonSchemaFile;
 use LastDragon_ru\LaraASP\Testing\Constraints\Response\Response;
@@ -47,7 +47,7 @@ static function (Config $config) use ($routes, $prefix, $settings): void {
             },
         );
 
-        $provider = new class($this->app()) extends Provider {
+        $provider = new class($this->app()) extends PackageProvider {
             // empty
         };
         $provider->boot();

diff --git a/packages/spa/src/PackageProvider.php b/packages/spa/src/PackageProvider.php
@@ -0,0 +1,49 @@
+<?php declare(strict_types = 1);
+
+namespace LastDragon_ru\LaraASP\Spa;
+
+use Illuminate\Support\ServiceProvider;
+use LastDragon_ru\LaraASP\Core\Provider\WithConfig;
+use LastDragon_ru\LaraASP\Core\Provider\WithRoutes;
+use LastDragon_ru\LaraASP\Core\Provider\WithTranslations;
+use Override;
+
+class PackageProvider extends ServiceProvider {
+    use WithConfig;
+    use WithRoutes;
+    use WithTranslations;
+
+    // <editor-fold desc="\Illuminate\Support\ServiceProvider">
+    // =========================================================================
+    #[Override]
+    public function register(): void {
+        parent::register();
+
+        $this->registerConfig(PackageConfig::class);
+    }
+
+    public function boot(): void {
+        $this->bootTranslations();
+        $this->bootRoutes(function (): array {
+            $config   = $this->app->make(PackageConfig::class)->getInstance();
+            $settings = [
+                'enabled'    => $config->routes->enabled,
+                'attributes' => [
+                    'prefix'     => $config->routes->prefix,
+                    'middleware' => $config->routes->middleware,
+                ],
+            ];
+
+            return $settings;
+        });
+    }
+    // </editor-fold>
+
+    // <editor-fold desc="Functions">
+    // =========================================================================
+    #[Override]
+    protected function getName(): string {
+        return Package::Name;
+    }
+    // </editor-fold>
+}
diff --git a/packages/spa/src/ProviderTest.php → packages/spa/src/PackageProviderTest.php b/packages/spa/src/ProviderTest.php → packages/spa/src/PackageProviderTest.php
@@ -10,8 +10,8 @@
 /**
  * @internal
  */
-#[CoversClass(Provider::class)]
-final class ProviderTest extends TestCase {
+#[CoversClass(PackageProvider::class)]
+final class PackageProviderTest extends TestCase {
     public function testConfig(): void {
         self::assertConfigurationExportable(PackageConfig::class);
     }
@@ -30,7 +30,7 @@ public function testLegacyConfig(): void {
 
         self::assertIsArray($config->get($package));
 
-        (new Provider($app))->register();
+        (new PackageProvider($app))->register();
 
         // Test
         $expected                  = new Config();

diff --git a/...ges/spa/src/ProviderTest~LegacyConfig.php → .../src/PackageProviderTest~LegacyConfig.php b/...ges/spa/src/ProviderTest~LegacyConfig.php → .../src/PackageProviderTest~LegacyConfig.php
diff --git a/packages/spa/src/Provider.php b/packages/spa/src/Provider.php
@@ -2,48 +2,9 @@
 
 namespace LastDragon_ru\LaraASP\Spa;
 
-use Illuminate\Support\ServiceProvider;
-use LastDragon_ru\LaraASP\Core\Provider\WithConfig;
-use LastDragon_ru\LaraASP\Core\Provider\WithRoutes;
-use LastDragon_ru\LaraASP\Core\Provider\WithTranslations;
-use Override;
-
-class Provider extends ServiceProvider {
-    use WithConfig;
-    use WithRoutes;
-    use WithTranslations;
-
-    // <editor-fold desc="\Illuminate\Support\ServiceProvider">
-    // =========================================================================
-    #[Override]
-    public function register(): void {
-        parent::register();
-
-        $this->registerConfig(PackageConfig::class);
-    }
-
-    public function boot(): void {
-        $this->bootTranslations();
-        $this->bootRoutes(function (): array {
-            $config   = $this->app->make(PackageConfig::class)->getInstance();
-            $settings = [
-                'enabled'    => $config->routes->enabled,
-                'attributes' => [
-                    'prefix'     => $config->routes->prefix,
-                    'middleware' => $config->routes->middleware,
-                ],
-            ];
-
-            return $settings;
-        });
-    }
-    // </editor-fold>
-
-    // <editor-fold desc="Functions">
-    // =========================================================================
-    #[Override]
-    protected function getName(): string {
-        return Package::Name;
-    }
-    // </editor-fold>
+/**
+ * @deprecated %{VERSION} The {@see PackageProvider} should be used instead.
+ */
+class Provider extends PackageProvider {
+    // empty
 }
diff --git a/packages/spa/src/Testing/Package/TestCase.php b/packages/spa/src/Testing/Package/TestCase.php
@@ -3,7 +3,7 @@
 namespace LastDragon_ru\LaraASP\Spa\Testing\Package;
 
 use LastDragon_ru\LaraASP\Core\PackageProvider as CoreProvider;
-use LastDragon_ru\LaraASP\Spa\Provider;
+use LastDragon_ru\LaraASP\Spa\PackageProvider;
 use LastDragon_ru\LaraASP\Testing\Testing\TestCase as PackageTestCase;
 use Override;
 
@@ -19,7 +19,7 @@ abstract class TestCase extends PackageTestCase {
     #[Override]
     protected function getPackageProviders(mixed $app): array {
         return array_merge(parent::getPackageProviders($app), [
-            Provider::class,
+            PackageProvider::class,
             CoreProvider::class,
         ]);
     }