Merge pull request #19 from dimitriBouteille/develop

Release 1.1.0

Author: dimitriBouteille

README.md

@@ -1,6 +1,6 @@
 # WordPress Rest API
 
-![GitHub Release](https://img.shields.io/github/v/release/dimitriBouteille/wp-module-rest-api) [![tests](https://img.shields.io/github/actions/workflow/status/dimitriBouteille/wp-orm/tests.yml?label=tests)](https://github.com/dimitriBouteille/wp-module-rest-api/actions/workflows/tests.yml)
+[![GitHub Release](https://img.shields.io/github/v/release/dimitriBouteille/wp-module-rest-api)](https://github.com/dimitriBouteille/wp-module-rest-api/releases) [![tests](https://img.shields.io/github/actions/workflow/status/dimitriBouteille/wp-orm/tests.yml?label=tests)](https://github.com/dimitriBouteille/wp-module-rest-api/actions/workflows/tests.yml) [![Packagist Downloads](https://img.shields.io/packagist/dt/dbout/wp-module-rest-api?color=yellow)](https://packagist.org/packages/dbout/wp-module-rest-api)
 
 WordPress module designed for developers that want to add routes to the [WordPress Rest API](https://developer.wordpress.org/rest-api/) in a few moments.
 
@@ -48,13 +48,17 @@ use Dbout\WpRestApi\RouteLoader;
 
 // One folder
 $loader = new RouteLoader(__DIR__ . '/src/Api/Routes');
-$loader->register();
 
 // Multiple folders
 $loader = new RouteLoader([
     __DIR__ . '/themes/my-theme/api'
     __DIR__ . '/src/Api/Routes',
 ]);
+
+// You can also use pattern
+$loader = new RouteLoader(__DIR__ . '/src/Modules/*/Api/Routes');
+
+$loader->register();
 ```
 
 > 💡 The module will automatically search for all classes that are in the folder and sub folder.

composer.json

@@ -34,14 +34,14 @@
     }
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^3.28",
+    "friendsofphp/php-cs-fixer": "^3.54",
     "phpstan/phpstan": "^1.10",
-    "rector/rector": "1.0.1",
+    "rector/rector": "^1.0",
     "phpunit/phpunit": "^10.5",
     "phpstan/phpstan-phpunit": "^1.3",
     "phpstan/extension-installer": "^1.3",
     "szepeviktor/phpstan-wordpress": "^1.3",
-    "roots/wordpress": "6.4"
+    "roots/wordpress": "^6.5"
   },
   "config": {
     "allow-plugins": {

src/Helpers/Parser.php

@@ -25,10 +25,29 @@ public static function findClassName(?string $fileContent): ?string
             throw new \InvalidArgumentException('The content does not contain PHP code.');
         }
 
-        if (preg_match('#^namespace\s+(.+?);.*class\s+(\w+).+;$#sm', $fileContent, $m)) {
-            return $m[1].'\\'.$m[2];
+        $class = null;
+        $i = 0;
+        $counter = count($tokens);
+        for (;$i < $counter;$i++) {
+            if ($tokens[$i][0] === T_CLASS) {
+                for ($j = $i + 1;$j < $counter;$j++) {
+                    if ($tokens[$j] === '{') {
+                        $class = $tokens[$i + 2][1];
+                    }
+                }
+            }
         }
 
-        return null;
+        if ($class === null || $class === '') {
+            return null;
+        }
+
+        $namespace =  null;
+        if (preg_match('#(^|\s)namespace(.*?)\s*;#sm', $fileContent, $m)) {
+            $namespace = $m[2] ?? null;
+            $namespace = $namespace !== null ? trim($namespace) : null;
+        }
+
+        return $namespace ? $namespace . "\\" . $class : $class;
     }
 }

src/Loaders/AnnotationDirectoryLoader.php

@@ -52,13 +52,13 @@ function (\SplFileInfo $current): bool {
 
         $routes = [];
         foreach ($files as $file) {
-            if (!$file->isFile() || !str_ends_with($file->getFilename(), '.php')) {
+            if (!$file->isFile() || $file->getExtension() !== 'php') {
                 continue;
             }
 
             /** @var class-string|null $class */
             $class = $this->findClass($file);
-            if ($class === null) {
+            if ($class === null || !class_exists($class)) {
                 continue;
             }
 

src/RouteLoader.php

@@ -60,9 +60,19 @@ protected function getRoutes(): array
      */
     protected function findRoutes(): array
     {
-        $directories = is_array($this->routeDirectory) ? $this->routeDirectory : [$this->routeDirectory];
+        $tmpDirectories = is_array($this->routeDirectory) ? $this->routeDirectory : [$this->routeDirectory];
         $routes = [];
 
+        $directories = [];
+        foreach ($tmpDirectories as $dir) {
+            $globalDirs = glob($dir);
+            if (!is_array($globalDirs)) {
+                continue;
+            }
+
+            $directories = array_merge($directories, $globalDirs);
+        }
+
         foreach ($directories as $directory) {
             $directory = new \SplFileInfo($directory);
             if (!$directory->isDir()) {

tests/Helpers/ParserTest.php

@@ -43,7 +43,7 @@ public static function providerFindClassName(): \Generator
             return $fileContent;
         };
 
-        yield 'Light php file' => [
+       yield 'Light php file' => [
             $load('source-1.php'),
             'App\Routes\MyRoute',
         ];
@@ -57,6 +57,11 @@ public static function providerFindClassName(): \Generator
             $load('source-3.php'),
             'App\Routes\MyRoute',
         ];
+
+        yield 'With phpdoc intro & multiple class/namespace label' => [
+            $load('source-4.php'),
+            'App\Routes\MyRoute',
+        ];
     }
 
     /**

tests/fixtures/route-classes/source-4.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (c) 2024 Dimitri BOUTEILLE (https://github.com/dimitriBouteille)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Dimitri BOUTEILLE <bonjour@dimitri-bouteille.fr>
+ */
+
+namespace App\Routes;
+
+use Dbout\WpRestApi\Attributes\Action;
+use Dbout\WpRestApi\Attributes\Route;
+use Dbout\WpRestApi\Enums\Method;
+
+#[Route(
+    namespace: 'app/v2',
+    route: 'document/(?P<documentId>\d+)'
+)]
+class MyRoute
+{
+    #[Action(Method::GET)]
+    public function get(): \WP_REST_Response
+    {
+        throw new \Exception('Invalid builder class type.');
+    }
+}