Merge pull request #94 from codingmusica/bug/cascorder0

Changed the order of arguments in array_merge_recursive() to prioritize ...
liip · Apr 15, 2014 · 76ceada · 76ceada
2 parents 20bd342 + 3783969
commit 76ceada
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/Locator/FileLocator.php b/Locator/FileLocator.php
@@ -72,7 +72,7 @@ public function __construct(KernelInterface $kernel, ActiveTheme $activeTheme, $
             ),
         );
 
-        $this->pathPatterns = array_merge_recursive($defaultPathPatterns, array_filter($pathPatterns));
+        $this->pathPatterns = array_merge_recursive(array_filter($pathPatterns), $defaultPathPatterns);
 
         $this->setCurrentTheme($this->activeTheme->getName());
     }

diff --git a/Tests/Fixtures/Resources/views/themes/fallback/template b/Tests/Fixtures/Resources/views/themes/fallback/template
diff --git a/Tests/Fixtures/Resources/views/themes/foo/template b/Tests/Fixtures/Resources/views/themes/foo/template
diff --git a/Tests/Locator/FileLocatorTest.php b/Tests/Locator/FileLocatorTest.php
@@ -103,32 +103,39 @@ public function testConstructorFallbackPathMerge()
             array(),
             array(
                 'app_resource' => array(
-                    '%app_path%/themes/fallback/%template%'
+                    '%app_path%/views/themes/%current_theme%/%template',
+                    '%app_path%/views/themes/fallback/%template%',
                 ),
                 'bundle_resource' => array(
-                    '%bundle_path%/Resources/themes/fallback/%template%'
+                    '%bundle_path%/Resources/views/themes/%current_theme%/%template%',
+                    '%bundle_path%/Resources/views/themes/fallback/%template%',
+
                 ),
                 'bundle_resource_dir' => array(
-                    '%dir%/themes/fallback/%bundle_name%/%template%'
+                    '%dir%/views/themes/%current_theme%/%bundle_name%/%template%',
+                    '%dir%/views/themes/fallback/%bundle_name%/%template%',
                 )
             )
         );
 
         $this->assertEquals(
             array(
                 'app_resource' => array(
+                    '%app_path%/views/themes/%current_theme%/%template',
+                    '%app_path%/views/themes/fallback/%template%',
                     '%app_path%/themes/%current_theme%/%template%',
                     '%app_path%/views/%template%',
-                    '%app_path%/themes/fallback/%template%'
                 ),
                 'bundle_resource' => array(
+                    '%bundle_path%/Resources/views/themes/%current_theme%/%template%',
+                    '%bundle_path%/Resources/views/themes/fallback/%template%',
                     '%bundle_path%/Resources/themes/%current_theme%/%template%',
-                    '%bundle_path%/Resources/themes/fallback/%template%'
                 ),
                 'bundle_resource_dir' => array(
+                    '%dir%/views/themes/%current_theme%/%bundle_name%/%template%',
+                    '%dir%/views/themes/fallback/%bundle_name%/%template%',
                     '%dir%/themes/%current_theme%/%bundle_name%/%template%',
                     '%dir%/%bundle_name%/%override_path%',
-                    '%dir%/themes/fallback/%bundle_name%/%template%'
                 ),
             ),
             $property->getValue($fileLocator)
@@ -153,21 +160,29 @@ public function testLocate()
      * @covers Liip\ThemeBundle\Locator\FileLocator::locate
      * @covers Liip\ThemeBundle\Locator\FileLocator::locateBundleResource
      */
-    public function testLocateWithOverridenPathPattern()
+    public function testLocateWithOverriddenPathPattern()
     {
         $kernel =  $this->getKernelMock();
         $activeTheme = new ActiveTheme('foo', array('foo', 'bar', 'foobar'));
 
         $pathPatterns = array(
             'bundle_resource' => array(
-                '%bundle_path%/Resources/themes2/%current_theme%/%template%',
+                '%bundle_path%/Resources/views/themes/%current_theme%/%template%',
+                '%bundle_path%/Resources/views/themes/fallback/%template%',
             )
         );
+        $fileLocator = new FileLocator($kernel, $activeTheme, $this->getFixturePath() . '/rootdir/Resources', array(), $pathPatterns);
+
+        $file = $fileLocator->locate('@ThemeBundle/Resources/views/template', $this->getFixturePath(), true);
+        $this->assertEquals($this->getFixturePath().'/Resources/views/themes/foo/template', $file);
+
+        // Fall through user-configured cascade order - /Resources/views/themes/bar will not be found.
+        $activeTheme = new ActiveTheme('bar', array('foo', 'bar', 'foobar'));
 
         $fileLocator = new FileLocator($kernel, $activeTheme, $this->getFixturePath() . '/rootdir/Resources', array(), $pathPatterns);
 
         $file = $fileLocator->locate('@ThemeBundle/Resources/views/template', $this->getFixturePath(), true);
-        $this->assertEquals($this->getFixturePath().'/Resources/themes/foo/template', $file);
+        $this->assertEquals($this->getFixturePath().'/Resources/views/themes/fallback/template', $file);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
                 ),
             );
-            $this->pathPatterns = array_merge_recursive($defaultPathPatterns, array_filter($pathPatterns));
+            $this->pathPatterns = array_merge_recursive(array_filter($pathPatterns), $defaultPathPatterns);
             $this->setCurrentTheme($this->activeTheme->getName());
         }
@@ Expand Down @@