Test

josephspurrier · May 3, 2014 · f975ad1 · f975ad1
1 parent db1f657
commit f975ad1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/SurfStack/Templating/Template_Engine.php b/src/SurfStack/Templating/Template_Engine.php
@@ -769,10 +769,11 @@ protected function parsePlugins($content)
     {
         $this->post = false;
 
-        $this->plugrex = array_values($this->loadPlugins());
+        //$this->plugrex = array_values($this->loadPlugins());
+        $this->plugrex = $this->loadPlugins();
 
         // Load the plugin content and replace        
-        return preg_replace_callback($this->plugrex, function($matches) {
+        return preg_replace_callback(array_values($this->plugrex), function($matches) {
             $pluginName = $matches[1];
             $pluginData = $matches[2];
             // Block has content, Slice does not

diff --git a/tests/SurfStack/Templating/Template_Engine_Test.php b/tests/SurfStack/Templating/Template_Engine_Test.php
@@ -376,10 +376,10 @@ public function testPlugRex()
         $this->render();
 
         $this->assertSame($this->view->plugrex, array(
-            0 => '/\{\s*(Blank)\s*(.*?)\}/i',
-            1 => '/\{\s*(Bold)\s*(.*?)\}(.[^\}\{]*?)\{\/\s*Bold\s*\}/i',
-            2 => '/\{\s*(Passthru)\s*(.*?)\}(.[^\}\{]*?)\{\/\s*Passthru\s*\}/i',
-            3 => '/\{\s*(Time)\s*(.*?)\}/i',
+            'Blank' => '/\{\s*(Blank)\s*(.*?)\}/i',
+            'Bold' => '/\{\s*(Bold)\s*(.*?)\}(.[^\}\{]*?)\{\/\s*Bold\s*\}/i',
+            'Passthru' => '/\{\s*(Passthru)\s*(.*?)\}(.[^\}\{]*?)\{\/\s*Passthru\s*\}/i',
+            'Time' => '/\{\s*(Time)\s*(.*?)\}/i',
         ));
     }