Merge pull request #76 from lion-packages/support

lion/route has been integrated with rules integration

Author: GabrielPalac

composer.json

@@ -18,10 +18,10 @@
             "Database\\Seed\\": "database/Seed/"
         },
         "files": [
-            "routes/rules.php",
             "routes/middleware.php",
             "src/LionBundle/Helpers/Bundle/constants.php",
-            "src/LionBundle/Helpers/Bundle/helpers.php"
+            "src/LionBundle/Helpers/Bundle/helpers.php",
+            "tests/Providers/NameRuleProvider.php"
         ]
     },
     "autoload-dev": {

composer.lock

@@ -40,13 +40,13 @@
         </exclude>
     </source>
 
-    <extensions>
+    <!-- <extensions>
         <bootstrap class="RobinIngelbrecht\PHPUnitPrettyPrint\PhpUnitExtension">
             <parameter name="enableByDefault" value="true" />
             <parameter name="displayProfiling" value="true" />
             <parameter name="useCompactMode" value="true" />
         </bootstrap>
-    </extensions>
+    </extensions> -->
 
     <!-- <coverage>
         <report>

phpunit.xml

@@ -6,15 +6,7 @@
 
 require_once(__DIR__ . '/../vendor/autoload.php');
 
-use Lion\Bundle\Kernel\HttpKernel;
-use Lion\Dependency\Injection\Container;
-use Lion\Exceptions\Serialize;
-
-(new Serialize())->exceptionHandler();
-
-include_once(__DIR__ . '/../routes/rules.php');
-
-((new Container())->injectDependencies(new HttpKernel()))->validateRules();
+(new Lion\Exceptions\Serialize())->exceptionHandler();
 
 include_once(__DIR__ . '/../routes/middleware.php');
 include_once(__DIR__ . '/../routes/web.php');

public/index.php

@@ -25,6 +25,7 @@
 use Lion\Mailer\Mailer;
 use Lion\Request\Http;
 use Lion\Request\Status;
+use Tests\Providers\ExampleProvider;
 
 /**
  * -----------------------------------------------------------------------------
@@ -104,6 +105,7 @@
  **/
 
 Route::init();
+
 Route::addMiddleware(Routes::getMiddleware());
 // -----------------------------------------------------------------------------
 Route::get('/', function () {
@@ -128,7 +130,7 @@
 });
 
 Route::prefix('api', function () {
-    Route::post('test', fn () => ['token' => jwt()]);
+    Route::post('test', [ExampleProvider::class, 'getResult']);
     Route::get('test', fn () => success('test-response'));
     Route::put('test/{id:i}', fn (string $id) => success('test-response: ' . $id));
 

routes/rules.php

@@ -111,8 +111,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
                 namespace {$namespace};
 
-                use Lion\Bundle\Helpers\Rules;
-                use Lion\Bundle\Interface\RulesInterface;
+                use Lion\Route\Helpers\Rules;
+                use Lion\Route\Interface\RulesInterface;
                 use Valitron\Validator;
 
                 /**

routes/web.php

@@ -144,7 +144,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->fetchRoutes();
 
-        $this->postmanCollection->addRoutes($this->routes, Routes::getRules());
+        $this->postmanCollection->addRoutes($this->routes);
 
         $path = storage_path('postman/', false);
 

src/LionBundle/Commands/Lion/New/RulesCommand.php

@@ -138,7 +138,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                     $rows[] = [
                         $this->warningOutput($keyMethods),
                         $routeUrl,
-                        $this->transformNamespace($method['handler']['controller']['name']),
+                        $method['handler']['controller']['name'],
                         $this->warningOutput($method['handler']['controller']['function'])
                     ];
                 }
@@ -150,7 +150,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                                 $rows[] = [
                                     $this->infoOutput('MIDDLEWARE:'),
                                     $this->infoOutput($filter),
-                                    $this->transformNamespace($middleware->getClass()),
+                                    $middleware->getClass(),
                                     $this->warningOutput($middleware->getMethodClass())
                                 ];
                             }
@@ -171,7 +171,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                                     ? $this->successOutput('(NAMELESS)')
                                     : $this->successOutput($objectClassRule->field . " ({$requiredParam})")
                                 ),
-                                $this->transformNamespace($objectClassRule::class),
+                                $objectClassRule::class,
                                 $this->warningOutput('passes')
                             ];
                         }
@@ -202,30 +202,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return Command::SUCCESS;
     }
 
-    /**
-     * Add colors in namespace separation
-     *
-     * @param  string $namespace [Class namespace]
-     *
-     * @return string
-     */
-    private function transformNamespace(string $namespace): string
-    {
-        $classNew = '';
-
-        $split = explode("\\", $namespace);
-
-        foreach ($split as $key => $value) {
-            if ($key < (count($split) - 1)) {
-                $classNew .= "{$this->purpleOutput($value)}\\";
-            } else {
-                $classNew .= $value;
-            }
-        }
-
-        return $classNew;
-    }
-
     /**
      * Gets the parameters (Web Routes/Rules/Middleware) of the defined web
      * routes
@@ -245,8 +221,6 @@ private function fetchRoutes(): void
 
         array_pop($this->routes);
 
-        $this->rules = Routes::getRules();
-
         $this->configMiddleware = Routes::getMiddleware();
     }
 }

src/LionBundle/Commands/Lion/Route/PostmanCollectionCommand.php

@@ -391,7 +391,7 @@ private function addRequest(string $name, string $route, string $method, array $
      *
      * @return void
      */
-    public function addRoutes(array $routes, array $rules): void
+    public function addRoutes(array $routes, array $rules = []): void
     {
         foreach ($routes as $routeUrl => $allRoutes) {
             foreach ($allRoutes as $routeMethod => $routeInfo) {

src/LionBundle/Commands/Lion/Route/RouteListCommand.php

@@ -7,51 +7,19 @@
 /**
  * Initializes the defined web rules and filters
  *
- * @property array $rules [List of defined web rules]
  * @property array $middleware [List of defined web filters]
  *
  * @package Lion\Bundle\Helpers\Http
  */
 class Routes
 {
-    /**
-     * [List of defined web rules]
-     *
-     * @var array $rules
-     */
-    private static array $rules;
-
     /**
      * [List of defined web filters]
      *
      * @var array $middleware
      */
     private static array $middleware;
 
-    /**
-     * Returns the list of defined web rules
-     *
-     * @return array
-     */
-    public static function getRules(): array
-    {
-        return self::$rules;
-    }
-
-    /**
-     * Change the list of defined web rules
-     *
-     * @param array $rules [List of defined web rules]
-     *
-     * @return Routes
-     */
-    public static function setRules(array $rules): Routes
-    {
-        self::$rules = $rules;
-
-        return new static;
-    }
-
     /**
      * Returns the list of defined web filters
      *