leave paths with no matching file as original

Author: TomK

src/Resources/AbstractDispatchableResource.php

@@ -70,40 +70,6 @@ protected function _minify() { }
 
   protected function _dispatch() { }
 
-  /**
-   * Dispatch a nested URL
-   *
-   * @param $uri
-   *
-   * @return string
-   * @throws \Exception
-   */
-  protected function _dispatchNestedUrl($uri)
-  {
-    $quote = $uri[1];
-    $path = $uri[2];
-
-    list($path, $append) = Strings::explode('?', $path, [$path, null], 2);
-
-    if(!$this->_manager->isExternalUrl($path))
-    {
-      $path = Path::system($this->_makeFullPath(dirname($path), dirname($this->_path)), basename($path));
-    }
-
-    $url = $this->_manager->getResourceUri($path);
-
-    if(empty($url))
-    {
-      return $quote . ($path ?? $uri[0]) . $quote;
-    }
-
-    if(!empty($append))
-    {
-      return $quote . "$url?$append" . $quote;
-    }
-    return $quote . "$url" . $quote;
-  }
-
   /**
    * Make the relative path
    *
@@ -134,6 +100,33 @@ protected function _makeFullPath($relativePath, $workingDirectory)
     return $workingDirectory[0] !== '.' ? Path::url($workingDirectory, $relativePath) : $relativePath;
   }
 
+  /**
+   * @param $path
+   *
+   * @return string
+   * @throws \Exception
+   */
+  protected function _getDispatchUrl($path): string
+  {
+    list($newPath, $append) = Strings::explode('?', $path, [$path, null], 2);
+
+    if(!$this->_manager->isExternalUrl($newPath))
+    {
+      $newPath = Path::system($this->_makeFullPath(dirname($newPath), dirname($this->_path)), basename($newPath));
+    }
+
+    $url = $this->_manager->getResourceUri($newPath);
+    if(empty($url))
+    {
+      return $path;
+    }
+    if(!empty($append))
+    {
+      $url .= '?' . $append;
+    }
+    return $url;
+  }
+
   /**
    * Get the content for this resource
    *

src/Resources/CssResource.php

@@ -1,6 +1,8 @@
 <?php
 namespace Packaged\Dispatch\Resources;
 
+use Packaged\Helpers\Strings;
+
 class CssResource extends AbstractDispatchableResource
 {
   protected $_options = [
@@ -20,9 +22,25 @@ public function getContentType()
 
   protected function _dispatch()
   {
-    $regex = '~(?<=url\()\s*(["\']?)(.*?)\1\s*(?=\))~';
     //Find all URL(.*) and dispatch their values
-    $this->_content = preg_replace_callback($regex, [$this, "_dispatchNestedUrl"], $this->_content);
+    $this->_content = preg_replace_callback(
+      '~(?<=url\()\s*(["\']?)(.*?)\1\s*(?=\))~',
+      [$this, "_dispatchUrlPaths"],
+      $this->_content
+    );
+  }
+
+  /**
+   * Dispatch a nested URL
+   *
+   * @param $uri
+   *
+   * @return string
+   * @throws \Exception
+   */
+  protected function _dispatchUrlPaths($uri)
+  {
+    return Strings::wrap($this->_getDispatchUrl($uri[2]), $uri[1], true);
   }
 
   protected function _minify()

tests/Resources/AbstractDispatchableResourceTest.php

@@ -26,7 +26,8 @@ public function testProcessesContent()
     $this->assertContains('url(\'r/d41d8cd9/css/css.jpg\')', $content);
     $this->assertContains('url("r/d41d8cd9/css/sub/subimg.jpg")', $content);
     $this->assertContains('url(\'http://www.example.com/background.jpg\')', $content);
-    $this->assertContains('url(img/missing-file.jpg)', $content);
+    $this->assertContains('url(../img/missing-file.jpg)', $content);
+    $this->assertContains('url(../../../img/missing-file.jpg)', $content);
 
     $resource->setProcessingPath('css/do-not-modify.css');
     $resource->setContent(file_get_contents(Path::system($root, Dispatch::RESOURCES_DIR, 'css', 'do-not-modify.css')));