Merge pull request #19 from joanrodas/dev

Fix serialize + Duplicate RouteProcessor instances

PluboRoutes/Endpoint/Endpoint.php

@@ -116,7 +116,10 @@ public function getPermissionCallback()
      */
     public function __serialize()
     {
-        return [$this->path, $this->method];
+        return [
+            'path' => $this->path,
+            'method' => $this->method
+        ];
     }
 
     /**

PluboRoutes/Route/RouteTrait.php

@@ -107,8 +107,10 @@ public function getExtraVars()
      */
     public function __serialize()
     {
-
-        return [$this->path, $this->getExtraVars()];
+        return [
+            'path' => $this->path,
+            'extra_vars' => $this->getExtraVars()
+        ];
     }
 
     /**
@@ -119,6 +121,6 @@ public function __serialize()
     public function __unserialize($data)
     {
         $this->path = $data['path'];
-        $this->args = $data['args'];
+        $this->config['extra_vars'] = $data['extra_vars'];
     }
 }

PluboRoutes/RoutesProcessor.php

@@ -36,6 +36,13 @@ class RoutesProcessor
      */
     private $router;
 
+     /**
+     * The router instance.
+     *
+     * @var Router
+     */
+    private static $instance = NULL;
+
     /**
      * Constructor.
      *
@@ -44,23 +51,34 @@ class RoutesProcessor
     public function __construct(Router $router)
     {
         $this->router = $router;
+        add_action('init', [$this, 'addRoutes']);
+        add_action('parse_request', [$this, 'matchRouteRequest']);
+        add_action('send_headers', [$this, 'basicAuth']);
+        add_action('rest_api_init', [$this, 'addEndpoints']);
+        add_action('template_redirect', [$this, 'doRouteActions']);
+        add_action('template_include', [$this, 'includeRouteTemplate']);
+        add_filter('body_class', [$this, 'addBodyClasses']);
+        add_filter('document_title_parts', [$this, 'modifyTitle']);
     }
 
+    /**
+     * Clone not allowed.
+     *
+     */
+	private function __clone()
+	{
+	}    
+
     /**
      * Initialize processor with WordPress.
      *
      */
     public static function init()
     {
-        $self = new self(new Router());
-        add_action('init', [$self, 'addRoutes']);
-        add_action('parse_request', [$self, 'matchRouteRequest']);
-        add_action('send_headers', [$self, 'basicAuth']);
-        add_action('rest_api_init', [$self, 'addEndpoints']);
-        add_action('template_redirect', [$self, 'doRouteActions']);
-        add_action('template_include', [$self, 'includeRouteTemplate']);
-        add_filter('body_class', [$self, 'addBodyClasses']);
-        add_filter('document_title_parts', [$self, 'modifyTitle']);
+        if (is_null(self::$instance)) {
+			self::$instance = new self(new Router());
+		}
+		return self::$instance;        
     }
 
     /**

composer.json

@@ -18,6 +18,6 @@
       }
     },
     "require": {
-      "php": ">=7.0"
+      "php": ">=7.4"
     }
 }

plubo-routes.php

@@ -23,23 +23,20 @@
 add_filter('plubo/routes', function ($routes) {
     $routes[] = new PluboRoutes\Route\Route(
         'clients/testing',
-        function () {
-            //Do some stuff...
+        function ($matches) {
             return locate_template('content');
         },
         array(
             // 'guest' => true,
             // 'logged_in' => false,
             'redirect' => 'https://sirvelia.com',
-            'permission_callback' => function($matches) {
-                return false;
-            },
+            'permission_callback' => [null, 'check_permission'],
             // 'extra_vars' => [
             //     'lss_page' => 'test-page'
             // ],
-            // 'basic_auth' => [
-            //     'user' => 'testing'
-            // ],
+            'basic_auth' => [
+                'user' => 'testing'
+            ],
         )
     );
     $routes[] = new PluboRoutes\Route\RedirectRoute(
@@ -80,3 +77,8 @@ function ($request) {
     );
     return $endpoints;
 });
+
+function check_permission($matches)
+{
+    return true;
+}