Merge pull request #541 from skipperbent/v4-development

Version 4.3.2.3

src/Pecee/Controllers/IResourceController.php

@@ -6,43 +6,43 @@ interface IResourceController
 {
 
     /**
-     * @return string|null
+     * @return mixed
      */
-    public function index(): ?string;
+    public function index();
 
     /**
      * @param mixed $id
-     * @return string|null
+     * @return mixed
      */
-    public function show($id): ?string;
+    public function show($id);
 
     /**
-     * @return string|null
+     * @return mixed
      */
-    public function store(): ?string;
+    public function store();
 
     /**
-     * @return string|null
+     * @return mixed
      */
-    public function create(): ?string;
+    public function create();
 
     /**
      * View
      * @param mixed $id
-     * @return string|null
+     * @return mixed
      */
-    public function edit($id): ?string;
+    public function edit($id);
 
     /**
      * @param mixed $id
-     * @return string|null
+     * @return mixed
      */
-    public function update($id): ?string;
+    public function update($id);
 
     /**
      * @param mixed $id
-     * @return string|null
+     * @return mixed
      */
-    public function destroy($id): ?string;
+    public function destroy($id);
 
 }

src/Pecee/Http/Input/InputFile.php

@@ -165,7 +165,7 @@ class InputFile implements IInputItem
      * @param string $name
      * @return static
      */
-    public function setFilename($name): IInputItem
+    public function setFilename(string $name): IInputItem
     {
         $this->filename = $name;
 
@@ -188,7 +188,7 @@ class InputFile implements IInputItem
      * @param string $destination
      * @return bool
      */
-    public function move($destination): bool
+    public function move(string $destination): bool
     {
         return move_uploaded_file($this->tmpName, $destination);
     }
@@ -226,10 +226,10 @@ class InputFile implements IInputItem
     /**
      * Set error
      *
-     * @param int $error
+     * @param int|null $error
      * @return static
      */
-    public function setError($error): IInputItem
+    public function setError(?int $error): IInputItem
     {
         $this->errors = (int)$error;
 
@@ -249,7 +249,7 @@ class InputFile implements IInputItem
      * @param string $name
      * @return static
      */
-    public function setTmpName($name): IInputItem
+    public function setTmpName(string $name): IInputItem
     {
         $this->tmpName = $name;
 
@@ -261,7 +261,7 @@ class InputFile implements IInputItem
         return $this->getTmpName();
     }
 
-    public function getValue()
+    public function getValue(): string
     {
         return $this->getFilename();
     }

src/Pecee/Http/Input/InputHandler.php

@@ -147,7 +147,7 @@ class InputHandler
      * @param array|null $original
      * @return array
      */
-    protected function rearrangeFile(array $values, &$index, $original): array
+    protected function rearrangeFile(array $values, array &$index, ?array $original): array
     {
         $originalIndex = $index[0];
         array_shift($index);

src/Pecee/Http/Middleware/BaseCsrfVerifier.php

@@ -50,12 +50,12 @@ class BaseCsrfVerifier implements IMiddleware
                 $url = rtrim($url, '*');
                 $skip = $request->getUrl()->contains($url);
             } else {
-                $skip = ($url === $request->getUrl()->getOriginalUrl());
+                $skip = ($url === rtrim($request->getUrl()->getRelativeUrl(false), '/'));
             }
 
             if ($skip === true) {
 
-                if($this->include !== null && count($this->include) > 0) {
+                if(is_array($this->include) === true && count($this->include) > 0) {
                     foreach($this->include as $includeUrl) {
                         $includeUrl = rtrim($includeUrl, '/');
                         if ($includeUrl[strlen($includeUrl) - 1] === '*') {
@@ -64,7 +64,7 @@ class BaseCsrfVerifier implements IMiddleware
                             break;
                         }
 
-                        $skip = !($includeUrl === $request->getUrl()->getOriginalUrl());
+                        $skip = !($includeUrl === rtrim($request->getUrl()->getRelativeUrl(false), '/'));
                     }
                 }
 

src/Pecee/Http/Middleware/IpRestrictAccess.php

@@ -34,6 +34,10 @@ abstract class IpRestrictAccess implements IMiddleware
         return true;
     }
 
+    /**
+     * @param Request $request
+     * @throws HttpException
+     */
     public function handle(Request $request): void
     {
         if($this->validate((string)$request->getIp()) === false) {

src/Pecee/Http/Url.php

@@ -427,14 +427,18 @@ class Url implements JsonSerializable
     /**
      * Returns the relative url
      *
+     * @param bool $includeParams
      * @return string
      */
-    public function getRelativeUrl(): string
+    public function getRelativeUrl($includeParams = true): string
     {
-        $params = $this->getQueryString();
+        $path = $this->path ?? '/';
 
-        $path = $this->path ?? '';
-        $query = $params !== '' ? '?' . $params : '';
+        if($includeParams === false) {
+            return $path;
+        }
+
+        $query = $this->getQueryString() !== '' ? '?' . $this->getQueryString() : '';
         $fragment = $this->fragment !== null ? '#' . $this->fragment : '';
 
         return $path . $query . $fragment;
@@ -443,9 +447,10 @@ class Url implements JsonSerializable
     /**
      * Returns the absolute url
      *
+     * @param bool $includeParams
      * @return string
      */
-    public function getAbsoluteUrl(): string
+    public function getAbsoluteUrl($includeParams = true): string
     {
         $scheme = $this->scheme !== null ? $this->scheme . '://' : '';
         $host = $this->host ?? '';
@@ -454,7 +459,7 @@ class Url implements JsonSerializable
         $pass = $this->password !== null ? ':' . $this->password : '';
         $pass = ($user || $pass) ? $pass . '@' : '';
 
-        return $scheme . $user . $pass . $host . $port . $this->getRelativeUrl();
+        return $scheme . $user . $pass . $host . $port . $this->getRelativeUrl($includeParams);
     }
 
     /**

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -55,7 +55,6 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     public function matchRegex(Request $request, $url): ?bool
     {
         /* Match on custom defined regular expression */
-
         if ($this->regex === null) {
             return null;
         }

src/Pecee/SimpleRouter/Route/Route.php

@@ -76,6 +76,11 @@ abstract class Route implements IRoute
         if (is_callable($callback) === true) {
             $router->debug('Executing callback');
 
+            /* Load class from type hinting */
+            if (is_array($callback) === true && isset($callback[0], $callback[1]) === true) {
+                $callback[0] = $router->getClassLoader()->loadClass($callback[0]);
+            }
+
             /* When the callback is a function */
             return $router->getClassLoader()->loadClosure($callback, $parameters);
         }
@@ -160,7 +165,7 @@ abstract class Route implements IRoute
             foreach ((array)$parameters[1] as $name) {
 
                 // Ignore parent parameters
-                if(isset($groupParameters[$name]) === true) {
+                if (isset($groupParameters[$name]) === true) {
                     $lastParams[$name] = $matches[$name];
                     continue;
                 }
@@ -244,6 +249,7 @@ abstract class Route implements IRoute
         $this->group = $group;
 
         /* Add/merge parent settings with child */
+
         return $this->setSettings($group->toArray(), true);
     }
 
@@ -576,6 +582,7 @@ abstract class Route implements IRoute
     public function setFilterEmptyParams(bool $enabled): IRoute
     {
         $this->filterEmptyParams = $enabled;
+
         return $this;
     }
 

src/Pecee/SimpleRouter/Route/RouteGroup.php

@@ -183,7 +183,6 @@ class RouteGroup extends Route implements IGroupRoute
      */
     public function setSettings(array $settings, bool $merge = false): IRoute
     {
-
         if (isset($settings['prefix']) === true) {
             $this->setPrefix($settings['prefix'] . $this->prefix);
         }

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -4,8 +4,8 @@
  * Router helper class
  * ---------------------------
  *
- * This class is added so calls can be made statically like Router::get() making the code look pretty.
- * It also adds some extra functionality like default-namespace.
+ * This class is added so calls can be made statically like SimpleRouter::get() making the code look pretty.
+ * It also adds some extra functionality like default-namespace etc.
  */
 
 namespace Pecee\SimpleRouter;