Refactors, slimmer code

Author: zacksmash

composer.json

@@ -33,7 +33,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Zacksmash\\LaravelRouteActions\\": "src/"
+            "Zacksmash\\SoftDeleteRoutes\\": "src/"
         }
     },
     "autoload-dev": {
@@ -55,7 +55,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Zacksmash\\LaravelRouteActions\\Providers\\RoutingServiceProvider"
+                "Zacksmash\\SoftDeleteRoutes\\Providers\\RoutingServiceProvider"
             ]
         }
     },

src/Providers/RoutingServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zacksmash\LaravelRouteActions\Providers;
+namespace Zacksmash\SoftDeleteRoutes\Providers;
 
 use Illuminate\Foundation\Application;
 use Illuminate\Routing\Router;
@@ -14,7 +14,7 @@ class RoutingServiceProvider extends ServiceProvider
     public function register(): void
     {
         $this->app->extend(Router::class, function (Router $router, Application $app) {
-            return new \Zacksmash\LaravelRouteActions\Routing\Router($router, $app);
+            return new \Zacksmash\SoftDeleteRoutes\Routing\Router($router, $app);
         });
     }
 

src/Routing/PendingResourceRegistration.php

@@ -1,30 +1,19 @@
 <?php
 
-namespace Zacksmash\LaravelRouteActions\Routing;
+namespace Zacksmash\SoftDeleteRoutes\Routing;
 
 use Illuminate\Routing\PendingResourceRegistration as BasePendingResourceRegistration;
 
 class PendingResourceRegistration extends BasePendingResourceRegistration
 {
-    /**
-     * Create a new pending resource registration instance.
-     *
-     * @param  \Illuminate\Routing\ResourceRegistrar  $registrar
-     * @param  string  $name
-     * @param  string  $controller
-     * @return void
-     */
-    public function __construct($registrar, $name, $controller, array $options)
-    {
-        parent::__construct($registrar, $name, $controller, $options);
-    }
-
     /**
      * Add a restore method to the resource.
      */
     public function withRestore(): self
     {
-        $this->registrar->setResourceDefault('restore');
+        $this->registrar->verbs(['restore' => 'restore']);
+
+        $this->registrar->resourceDefaults('restore');
 
         $this->options['trashed']['restore'] = true;
 
@@ -36,7 +25,9 @@ public function withRestore(): self
      */
     public function withErase(): self
     {
-        $this->registrar->setResourceDefault('erase');
+        $this->registrar->verbs(['erase' => 'erase']);
+
+        $this->registrar->resourceDefaults('erase');
 
         $this->options['trashed']['erase'] = true;
 

src/Routing/ResourceRegistrar.php

@@ -1,31 +1,23 @@
 <?php
 
-namespace Zacksmash\LaravelRouteActions\Routing;
+namespace Zacksmash\SoftDeleteRoutes\Routing;
 
 use Illuminate\Routing\ResourceRegistrar as BaseRegistrar;
 
 class ResourceRegistrar extends BaseRegistrar
 {
     /**
-     * Create a new resource registrar instance.
+     * Get or set the resource defaults used in resourcful controllers.
+     *
+     * @return array|void
      */
-    public function __construct(Router $router)
+    public function resourceDefaults(?string $method = null)
     {
-        parent::__construct($router);
+        if (! $method) {
+            return $this->resourceDefaults;
+        }
 
-        self::$verbs = [
-            'restore' => 'restore',
-            'erase' => 'erase',
-            ...parent::$verbs,
-        ];
-    }
-
-    /**
-     * Add a resource method to the resource defaults.
-     */
-    public function setResourceDefault(string $method): string
-    {
-        return $this->resourceDefaults[] = $method;
+        $this->resourceDefaults[] = $method;
     }
 
     /**

src/Routing/Router.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Zacksmash\LaravelRouteActions\Routing;
+namespace Zacksmash\SoftDeleteRoutes\Routing;
 
 use Illuminate\Routing\Router as BaseRouter;
 

tests/TestCase.php

@@ -3,7 +3,7 @@
 namespace Tests;
 
 use Orchestra\Testbench\TestCase as BaseTestCase;
-use Zacksmash\LaravelRouteActions\Providers\RoutingServiceProvider;
+use Zacksmash\SoftDeleteRoutes\Providers\RoutingServiceProvider;
 
 class TestCase extends BaseTestCase
 {