close tags

rouxyang · Sep 8, 2012 · 933af62 · 933af62
1 parent dd87b5d
commit 933af62
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 9 deletions.
diff --git a/tests/008.phpt b/tests/008.phpt
@@ -16,6 +16,7 @@ var_dump($router->getCurrentRoute());
 print_r($router->getRoutes());
 print_r($router->getRoute("simple"));
 var_dump($router->getRoute("noexists"));
+?>
 --EXPECTF--
 Yaf_Router Object
 (

diff --git a/tests/009.phpt b/tests/009.phpt
@@ -13,6 +13,7 @@ var_dump(strlen($view->render(dirname(__FILE__) . "/001.phpt")));
 var_dump($view->name);
 var_dump($view->noexists);
 print_r($view);
+?>
 --EXPECTF--
 Yaf_View_Simple Object
 (

diff --git a/tests/018.phpt b/tests/018.phpt
@@ -7,7 +7,7 @@ Bug Yaf_Config_Ini crash due to inaccurate refcount
 $file = dirname(__FILE__) . "/simple.ini";
 $config = new Yaf_Config_Ini($file, 'base');
 print_r($config);
-
+?>
 --EXPECTF--
 Yaf_Config_Ini Object
 (

diff --git a/tests/029.phpt b/tests/029.phpt
@@ -15,6 +15,7 @@ $view->clear("b");
 print_r($view->get());
 $view->clear();
 print_r($view->get());
+?>
 --EXPECTF--
 bArray
 (

diff --git a/tests/030.phpt b/tests/030.phpt
@@ -14,5 +14,6 @@ try {
   print_r($e->getMessage());
 }
 
+?>
 --EXPECTF--
 There is no section 'ex' in '%ssimple.ini'
diff --git a/tests/043.phpt b/tests/043.phpt
@@ -23,6 +23,7 @@ var_dump(ini_get("yaf.name_suffix") == "1");
 var_dump(ini_get("yaf.name_separator") == "__");
 
 new Plugin__ABC_EFG();
+?>
 --EXPECTF--
 bool(true)
 bool(true)

diff --git a/tests/044.phpt b/tests/044.phpt
@@ -14,5 +14,6 @@ unset($a);
 Yaf_Dispatcher::getInstance();
 $b = Yaf_Dispatcher::getInstance();
 var_dump(get_class($b));
+?>
 --EXPECTF--
 string(14) "Yaf_Dispatcher"
diff --git a/tests/046.phpt b/tests/046.phpt
@@ -24,6 +24,7 @@ $loader->clearLocalNamespace();
 $loader->registerLocalNamespace("Bar");
 var_dump($loader->isLocalName("Foo_Bar"));
 var_dump($loader->isLocalName("Bar"));
+?>
 --EXPECTF--
 bool(true)
 bool(true)

diff --git a/tests/047.phpt b/tests/047.phpt
@@ -35,6 +35,7 @@ spl_autoload_register("load");
 $a = new Foo();
 
 print_r($a);
+?>
 --EXPECTF--
 string(3) "Foo"
 

diff --git a/tests/048.phpt b/tests/048.phpt
@@ -95,6 +95,8 @@ file_put_contents(APPLICATION_PATH . "/application/views/index/index.phtml",
 
 $app = new Yaf_Application($config);
 $app->bootstrap()->run();
+
+?>
 --EXPECTF--
 string(13) "routerStartup"
 string(14) "routerShutdown"

diff --git a/tests/049.phpt b/tests/049.phpt
@@ -94,6 +94,7 @@ file_put_contents(APPLICATION_PATH . "/application/views/error/error.phtml",
 
 $app = new Yaf_Application($config);
 $app->bootstrap()->run();
+?>
 --EXPECTF--
 string(13) "routerStartup"
 string(14) "routerShutdown"

diff --git a/tests/050.phpt b/tests/050.phpt
@@ -42,6 +42,7 @@ $app = new Yaf_Application($config);
 $response = $app->bootstrap()->run();
 var_dump("-------");
 echo $response;
+?>
 --EXPECTF--
 string(7) "-------"
 view
diff --git a/yaf_application.c b/yaf_application.c
@@ -14,7 +14,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: yaf_application.c 327425 2012-09-02 03:58:49Z laruence $ */
+/* $Id: yaf_application.c 327541 2012-09-08 12:46:24Z laruence $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -301,14 +301,9 @@ static int yaf_application_parse_option(zval *options TSRMLS_DC) {
 			if (zend_hash_get_current_data(ht, (void **)&value) == FAILURE) {
 				continue;
 			}
-
-			len = snprintf(name, sizeof(name), "%s.%s", "yaf", key);
+			snprintf(name, sizeof(name), "%s.%s", "yaf", key);
 			convert_to_string(*value);
-
-			if (zend_alter_ini_entry(name, len + 1, Z_STRVAL_PP(value), Z_STRLEN_PP(value),
-						PHP_INI_USER, PHP_INI_STAGE_RUNTIME) == FAILURE) {
-				/* do nothing */
-			}
+			zend_alter_ini_entry(name, strlen(name) + 1, Z_STRVAL_PP(value), Z_STRLEN_PP(value), PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
 		}
 	}