Merge branch 'feature/3996' into develop

Close zendframework/zendframework#3996 Fixes zendframework/zendframework#2459
zendframework · Mar 12, 2013 · f44e0b5 · f44e0b5
2 parents 7d8f2d3 + 3709a3c
commit f44e0b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Resolver/TemplatePathStack.php b/src/Resolver/TemplatePathStack.php
@@ -105,6 +105,9 @@ public function setOptions($options)
                 case 'use_stream_wrapper':
                     $this->setUseStreamWrapper($value);
                     break;
+                case 'default_suffix':
+                    $this->setDefaultSuffix($value);
+                    break;
                 default:
                     break;
             }
@@ -296,7 +299,7 @@ public function resolve($name, Renderer $renderer = null)
 
         // Ensure we have the expected file extension
         $defaultSuffix = $this->getDefaultSuffix();
-        if (pathinfo($name, PATHINFO_EXTENSION) != $defaultSuffix) {;
+        if (pathinfo($name, PATHINFO_EXTENSION) == '') {
             $name .= '.' . $defaultSuffix;
         }
 

diff --git a/test/TemplatePathStackTest.php b/test/TemplatePathStackTest.php
@@ -186,6 +186,7 @@ public function validOptions()
         $options = array(
             'lfi_protection'     => false,
             'use_stream_wrapper' => true,
+            'default_suffix'     => 'php',
         );
         return array(
             array($options),
@@ -205,6 +206,8 @@ public function testAllowsSettingOptions($arg)
         $expected = (bool) ini_get('short_open_tag');
         $this->assertSame($expected, $this->stack->useStreamWrapper());
 
+        $this->assertSame($arg['default_suffix'], $this->stack->getDefaultSuffix());
+
         $this->assertEquals(array_reverse($this->paths), $this->stack->getPaths()->toArray());
     }