forked from laruence/yaf
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed bug empty template file interrupts forwarding chain
- Loading branch information
Showing
3 changed files
with
67 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ | |
<email>[email protected]</email> | ||
<active>yes</active> | ||
</lead> | ||
<date>2012-10-08</date> | ||
<date>2012-?-?</date> | ||
<time>10:21:46</time> | ||
<version> | ||
<release>2.2.4</release> | ||
|
@@ -22,9 +22,7 @@ | |
</stability> | ||
<license uri="http://www.php.net/license">PHP</license> | ||
<notes> | ||
- Improving warning info while failed opening template script | ||
- Fixed bug that $this is not Yaf_View_Simple in render method which was introduced in 2.2.3 | ||
- Fixed memleak in Yaf_View_Simple::display() | ||
- Fixed bug empty template file interrupts forwarding chain | ||
</notes> | ||
<contents> | ||
<dir name="/"> | ||
|
@@ -69,6 +67,7 @@ | |
<file name="simple.c" role="src" /> | ||
</dir> | ||
<file name="config.w32" role="src" /> | ||
<file name="LICENSE" role="src" /> | ||
<file name="CREDITS" role="src" /> | ||
<file name="EXPERIMENTAL" role="src" /> | ||
<file name="php_yaf.h" role="src" /> | ||
|
@@ -154,6 +153,7 @@ | |
<file name="058.phpt" role="test" /> | ||
<file name="059.phpt" role="test" /> | ||
<file name="060.phpt" role="test" /> | ||
<file name="061.phpt" role="test" /> | ||
<file name="build.inc" role="test" /> | ||
<file name="bug61493.phpt" role="test" /> | ||
<file name="simple.ini" role="test" /> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
--TEST-- | ||
Bug empty template file interrupts forward chain | ||
--SKIPIF-- | ||
<?php if (!extension_loaded("yaf")) print "skip"; ?> | ||
--INI-- | ||
yaf.use_spl_autoload=1 | ||
yaf.lowcase_path=0 | ||
--FILE-- | ||
<?php | ||
require "build.inc"; | ||
startup(); | ||
|
||
$config = array( | ||
"application" => array( | ||
"directory" => APPLICATION_PATH, | ||
), | ||
); | ||
|
||
file_put_contents(APPLICATION_PATH . "/controllers/Index.php", <<<PHP | ||
<?php | ||
class IndexController extends Yaf_Controller_Abstract { | ||
public function indexAction() { | ||
\$this->forward("dummy"); | ||
} | ||
public function dummyAction() { | ||
} | ||
} | ||
PHP | ||
); | ||
|
||
file_put_contents(APPLICATION_PATH . "/controllers/Dummy.php", <<<PHP | ||
<?php | ||
class DummyController extends Yaf_Controller_Abstract { | ||
public function indexAction() { | ||
} | ||
} | ||
PHP | ||
); | ||
|
||
file_put_contents(APPLICATION_PATH . "/views/index/index.phtml", ""); | ||
file_put_contents(APPLICATION_PATH . "/views/index/dummy.phtml", "Dummy"); | ||
|
||
$app = new Yaf_Application($config); | ||
$response = $app->run(); | ||
?> | ||
--CLEAN-- | ||
<?php | ||
require "build.inc"; | ||
shutdown(); | ||
?> | ||
--EXPECTF-- | ||
Dummy |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters