Correction on relative paths

Author: bajb

src/Dispatch.php

@@ -1,6 +1,7 @@
 <?php
 namespace Packaged\Dispatch;
 
+use Packaged\Dispatch\Resources\AbstractDispatchableResource;
 use Packaged\Dispatch\Resources\AbstractResource;
 use Packaged\Dispatch\Resources\DispatchableResource;
 use Packaged\Dispatch\Resources\ResourceFactory;
@@ -115,7 +116,8 @@ public function handle(Request $request): Response
     //Remove the hash from the URL
     $compareHash = array_shift($pathParts);
 
-    $fullPath = $manager->getFilePath(Path::custom('/', $pathParts));
+    $requestPath = Path::custom('/', $pathParts);
+    $fullPath = $manager->getFilePath($requestPath);
     if($compareHash !== $manager->getFileHash($fullPath))
     {
       return Response::create("File Not Found", 404);
@@ -126,6 +128,10 @@ public function handle(Request $request): Response
     {
       $resource->setManager($manager);
     }
+    if($resource instanceof AbstractDispatchableResource)
+    {
+      $resource->setProcessingPath($requestPath);
+    }
     if($resource instanceof AbstractResource)
     {
       $resource->setFilePath($fullPath);

src/Resources/AbstractDispatchableResource.php

@@ -125,12 +125,13 @@ protected function makeFullPath($relativePath, $workingDirectory)
     {
       $relativePath = str_replace('../', '', $relativePath);
       $workingDirectoryParts = explode('/', $workingDirectory);
-      if($levelUps > count($workingDirectoryParts))
+      $moves = count($workingDirectoryParts) - $levelUps;
+      if($moves < 0)
       {
         //Relative to this directory is not allowed
         return null;
       }
-      return implode('/', array_slice($workingDirectoryParts, $levelUps)) . $relativePath;
+      return Path::custom('/', array_merge(array_slice($workingDirectoryParts, 0, $moves), [$relativePath]));
     }
     return $relativePath;
   }