From ff76d6848358fd991ed0ebfcb82fdbc7724e6b1a Mon Sep 17 00:00:00 2001
From: Ilya Sabelnikov <fruit.dev@gmail.com>
Date: Tue, 23 Apr 2013 18:27:09 +0300
Subject: [PATCH] Fixes all tests to pass on most machines

Everyone who runs the "make test" may have different default Yaf`s INI
settings.

* in case the yaf.use_namespace=1 almost all tests fails
* in case the yaf.environ=dev around 5 tests fails
* in case the yaf.use_spl_autoload=1 one test fails

This fix specifies necessary INI values to pass all the tests.
---
 tests/002.phpt      | 2 ++
 tests/003.phpt      | 1 +
 tests/004.phpt      | 2 ++
 tests/005.phpt      | 2 ++
 tests/006.phpt      | 2 ++
 tests/007.phpt      | 2 ++
 tests/008.phpt      | 2 ++
 tests/009.phpt      | 2 ++
 tests/010.phpt      | 2 ++
 tests/011.phpt      | 2 ++
 tests/012.phpt      | 2 ++
 tests/013.phpt      | 2 ++
 tests/014.phpt      | 3 ++-
 tests/015.phpt      | 2 ++
 tests/016.phpt      | 2 ++
 tests/017.phpt      | 2 ++
 tests/018.phpt      | 2 ++
 tests/019.phpt      | 2 ++
 tests/020.phpt      | 1 +
 tests/021.phpt      | 1 +
 tests/022.phpt      | 1 +
 tests/023.phpt      | 1 +
 tests/024.phpt      | 1 +
 tests/025.phpt      | 1 +
 tests/026.phpt      | 1 +
 tests/027.phpt      | 3 ++-
 tests/028.phpt      | 1 +
 tests/029.phpt      | 1 +
 tests/030.phpt      | 1 +
 tests/031.phpt      | 1 +
 tests/032.phpt      | 1 +
 tests/033.phpt      | 2 ++
 tests/034.phpt      | 2 ++
 tests/035.phpt      | 1 +
 tests/036.phpt      | 1 +
 tests/037.phpt      | 2 ++
 tests/038.phpt      | 1 +
 tests/039.phpt      | 1 +
 tests/040.phpt      | 1 +
 tests/041.phpt      | 2 ++
 tests/042.phpt      | 2 ++
 tests/043.phpt      | 2 ++
 tests/044.phpt      | 2 ++
 tests/045.phpt      | 2 ++
 tests/046.phpt      | 1 +
 tests/047.phpt      | 1 +
 tests/048.phpt      | 1 +
 tests/049.phpt      | 1 +
 tests/050.phpt      | 1 +
 tests/051.phpt      | 1 +
 tests/052.phpt      | 1 +
 tests/053.phpt      | 1 +
 tests/054.phpt      | 1 +
 tests/055.phpt      | 2 ++
 tests/056.phpt      | 2 ++
 tests/057.phpt      | 2 ++
 tests/058.phpt      | 2 ++
 tests/059.phpt      | 1 +
 tests/060.phpt      | 1 +
 tests/061.phpt      | 1 +
 tests/062.phpt      | 1 +
 tests/063.phpt      | 2 ++
 tests/064.phpt      | 2 ++
 tests/065.phpt      | 2 ++
 tests/066.phpt      | 2 ++
 tests/067.phpt      | 1 +
 tests/bug61493.phpt | 2 ++
 tests/bug62702.phpt | 2 ++
 tests/bug63381.phpt | 1 +
 tests/bug63438.phpt | 1 +
 tests/bug63900.phpt | 1 +
 71 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/tests/002.phpt b/tests/002.phpt
index 837ba814..9c9d4a04 100644
--- a/tests/002.phpt
+++ b/tests/002.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Request_Simple
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $request  = new Yaf_Request_Simple("CLI", "index", "dummy", NULL, array());
diff --git a/tests/003.phpt b/tests/003.phpt
index def4ed77..0e808ec5 100644
--- a/tests/003.phpt
+++ b/tests/003.phpt
@@ -5,6 +5,7 @@ Check for Yaf_Loader
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php 
 ini_set("ap.lowcase_path", FALSE);
diff --git a/tests/004.phpt b/tests/004.phpt
index 908cac5f..a7ca9a2b 100644
--- a/tests/004.phpt
+++ b/tests/004.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Registry
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $str = "Ageli Platform";
diff --git a/tests/005.phpt b/tests/005.phpt
index d2e02a76..d661c706 100644
--- a/tests/005.phpt
+++ b/tests/005.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Response
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $response = new Yaf_Response_Http();
diff --git a/tests/006.phpt b/tests/006.phpt
index f6b8e00a..88a218e9 100644
--- a/tests/006.phpt
+++ b/tests/006.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Route_Static
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $request_uri = "/prefix/controller/action/name/laruence/age/28";
diff --git a/tests/007.phpt b/tests/007.phpt
index 0e491434..8b70d95e 100644
--- a/tests/007.phpt
+++ b/tests/007.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Config_Simple
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/008.phpt b/tests/008.phpt
index f53a171b..fe3d2b09 100644
--- a/tests/008.phpt
+++ b/tests/008.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Router
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php
 
diff --git a/tests/009.phpt b/tests/009.phpt
index 6cd1576f..58bf38fb 100644
--- a/tests/009.phpt
+++ b/tests/009.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_View_Simple
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php
 $view = new Yaf_View_Simple(dirname(__FILE__));
diff --git a/tests/010.phpt b/tests/010.phpt
index 8db3afa3..9d137df9 100644
--- a/tests/010.phpt
+++ b/tests/010.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Config_Ini
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $file = dirname(__FILE__) . "/simple.ini";
diff --git a/tests/011.phpt b/tests/011.phpt
index 8a6c640a..bc7598be 100644
--- a/tests/011.phpt
+++ b/tests/011.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Route_Rewrite
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $request = new Yaf_Request_Http("/subdir/ap/1.2/name/value", "/subdir");
diff --git a/tests/012.phpt b/tests/012.phpt
index 8eb96393..f4217bda 100644
--- a/tests/012.phpt
+++ b/tests/012.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Route_Regex
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $request = new Yaf_Request_Http("/subdir/ap/1.2/name/value", "/subdir");
diff --git a/tests/013.phpt b/tests/013.phpt
index f8492094..d5a72532 100644
--- a/tests/013.phpt
+++ b/tests/013.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Router and Config Routes
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $file = dirname(__FILE__) . "/simple.ini";
diff --git a/tests/014.phpt b/tests/014.phpt
index 834b9410..c5201239 100644
--- a/tests/014.phpt
+++ b/tests/014.phpt
@@ -3,7 +3,8 @@ Check for Yaf_Application
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
-yaf.environ=product
+yaf.environ="product"
+yaf.use_namespace=0
 --FILE--
 <?php 
 define("APPLICATION_PATH", dirname(__FILE__));
diff --git a/tests/015.phpt b/tests/015.phpt
index 70d1a44f..3ef3aa3e 100644
--- a/tests/015.phpt
+++ b/tests/015.phpt
@@ -3,6 +3,8 @@ Check for Yaf_Exception
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 <?php if (version_compare(PHP_VERSION, "5.3.0", "lt")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $previous = new Yaf_Exception("Previous", 100);
diff --git a/tests/016.phpt b/tests/016.phpt
index f2e5a4f1..452f9fa5 100644
--- a/tests/016.phpt
+++ b/tests/016.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Session
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $session = Yaf_Session::getInstance();
diff --git a/tests/017.phpt b/tests/017.phpt
index 612f6d1d..c53f0ef9 100644
--- a/tests/017.phpt
+++ b/tests/017.phpt
@@ -2,6 +2,8 @@
 Bug (mem leak and crash in Yaf_Config_Ini)
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = new Yaf_Config_Ini;
diff --git a/tests/018.phpt b/tests/018.phpt
index 3508cfe2..529a7e36 100644
--- a/tests/018.phpt
+++ b/tests/018.phpt
@@ -2,6 +2,8 @@
 Bug Yaf_Config_Ini crash due to inaccurate refcount
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $file = dirname(__FILE__) . "/simple.ini";
diff --git a/tests/019.phpt b/tests/019.phpt
index 405e0a64..bfbde6dc 100644
--- a/tests/019.phpt
+++ b/tests/019.phpt
@@ -2,6 +2,8 @@
 Yaf_Router::getCurrent with number key
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $request = new Yaf_Request_Http("/subdir/ap/1.2/name/value", "/subdir");
diff --git a/tests/020.phpt b/tests/020.phpt
index 9a19e5bb..4fda65e0 100644
--- a/tests/020.phpt
+++ b/tests/020.phpt
@@ -3,6 +3,7 @@ Check for Yaf_Application
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/021.phpt b/tests/021.phpt
index fd09dc7d..558bf034 100644
--- a/tests/021.phpt
+++ b/tests/021.phpt
@@ -3,6 +3,7 @@ Check for Yaf_Application
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 define("APPLICATION_PATH", dirname(__FILE__));
diff --git a/tests/022.phpt b/tests/022.phpt
index ab8069b9..10da300d 100644
--- a/tests/022.phpt
+++ b/tests/022.phpt
@@ -3,6 +3,7 @@ Check for Yaf_Application
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/023.phpt b/tests/023.phpt
index ae03c303..367743f7 100644
--- a/tests/023.phpt
+++ b/tests/023.phpt
@@ -5,6 +5,7 @@ Check for Yaf_Loader::set/get(library_path)
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php 
 $loader = Yaf_Loader::getInstance('/foo', '/bar');
diff --git a/tests/024.phpt b/tests/024.phpt
index 5b911c22..6304f23d 100644
--- a/tests/024.phpt
+++ b/tests/024.phpt
@@ -4,6 +4,7 @@ Check for Yaf_Loader::getInstace() paramters
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.library="/php/global/dir"
+yaf.use_namespace=0
 --FILE--
 <?php 
 $loader = Yaf_Loader::getInstance('/foo', '/bar');
diff --git a/tests/025.phpt b/tests/025.phpt
index bd5a850a..88f19775 100644
--- a/tests/025.phpt
+++ b/tests/025.phpt
@@ -4,6 +4,7 @@ Check for Yaf_Loader with namespace configuration
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.library="/php/global/dir"
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/026.phpt b/tests/026.phpt
index 8d28e809..0b514fbe 100644
--- a/tests/026.phpt
+++ b/tests/026.phpt
@@ -4,6 +4,7 @@ Check for Yaf_Response::setBody/prependBody/appendBody
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.library="/php/global/dir"
+yaf.use_namespace=0
 --FILE--
 <?php 
 $response = new Yaf_Response_Http();
diff --git a/tests/027.phpt b/tests/027.phpt
index 4ed702a8..7d79b56e 100644
--- a/tests/027.phpt
+++ b/tests/027.phpt
@@ -5,7 +5,8 @@ Check for Yaf autoload controller
 --INI--
 yaf.use_spl_autoload=0
 yaf.library="/php/global/dir"
-yar.environ="product"
+yaf.environ="product"
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/028.phpt b/tests/028.phpt
index b526f76f..186cff77 100644
--- a/tests/028.phpt
+++ b/tests/028.phpt
@@ -4,6 +4,7 @@ Bug segfault while call exit in a view template
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.library="/php/global/dir"
+yaf.use_namespace=0
 --FILE--
 <?php
 require "build.inc";
diff --git a/tests/029.phpt b/tests/029.phpt
index 9df8caa9..705d7147 100644
--- a/tests/029.phpt
+++ b/tests/029.phpt
@@ -4,6 +4,7 @@ Check for Yaf_View_Simple::get and clear
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.library="/php/global/dir"
+yaf.use_namespace=0
 --FILE--
 <?php
 $view = new Yaf_View_Simple(dirname(__FILE__));
diff --git a/tests/030.phpt b/tests/030.phpt
index a0f1292f..9391db1f 100644
--- a/tests/030.phpt
+++ b/tests/030.phpt
@@ -4,6 +4,7 @@ Check for Yaf_Config_Ini::__construct with section
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.library="/php/global/dir"
+yaf.use_namespace=0
 --FILE--
 <?php
 $file = dirname(__FILE__) . "/simple.ini";
diff --git a/tests/031.phpt b/tests/031.phpt
index 1d1b4fb4..679b923d 100644
--- a/tests/031.phpt
+++ b/tests/031.phpt
@@ -4,6 +4,7 @@ Check for application.dispatcher.defaultRoute
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.library="/php/global/dir"
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/032.phpt b/tests/032.phpt
index 5f0ec406..d7e433c3 100644
--- a/tests/032.phpt
+++ b/tests/032.phpt
@@ -9,6 +9,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 ?>
 --INI--
 yaf.directory=/foo/bar
+yaf.use_namespace=0
 --FILE--
 <?php 
 putenv("FOO=bar");
diff --git a/tests/033.phpt b/tests/033.phpt
index 3b6ebb92..19265bbd 100644
--- a/tests/033.phpt
+++ b/tests/033.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_View_Simple with predefined template dir
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/034.phpt b/tests/034.phpt
index 996f46b9..490592d7 100644
--- a/tests/034.phpt
+++ b/tests/034.phpt
@@ -7,6 +7,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip windows has a different absolute path');
 }
 ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $view = new Yaf_View_Simple("/tmp");
diff --git a/tests/035.phpt b/tests/035.phpt
index 9284d4c2..fa98f365 100644
--- a/tests/035.phpt
+++ b/tests/035.phpt
@@ -9,6 +9,7 @@ if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
 ?>
 --INI--
 short_open_tag = 0
+yaf.use_namespace=0
 --FILE--
 <?php 
 $view = new Yaf_View_Simple(dirname(__FILE__));
diff --git a/tests/036.phpt b/tests/036.phpt
index b0bf8d70..ff90a2a1 100644
--- a/tests/036.phpt
+++ b/tests/036.phpt
@@ -3,6 +3,7 @@ Check for Yaf_Route_Static with arbitrary urls
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
+yaf.use_namespace=0
 --FILE--
 <?php
 $url = array(
diff --git a/tests/037.phpt b/tests/037.phpt
index 5ee07e08..5beac670 100644
--- a/tests/037.phpt
+++ b/tests/037.phpt
@@ -11,6 +11,8 @@ if (version_compare(PHP_VERSION, "5.3", "lt")) {
 ?>
 --INI--
 yaf.lowcase_path=0
+yaf.use_spl_autoload=0
+yaf.use_namespace=0
 --FILE--
 <?php
 $dir = __DIR__;
diff --git a/tests/038.phpt b/tests/038.phpt
index 41183a5a..da748a39 100644
--- a/tests/038.phpt
+++ b/tests/038.phpt
@@ -6,6 +6,7 @@ Check for Yaf_View_Simple error message outputing
 yaf.library="/php/global/dir"
 log_errors=0
 display_errors=1
+yaf.use_namespace=0
 --FILE--
 <?php
 require "build.inc";
diff --git a/tests/039.phpt b/tests/039.phpt
index ad9b309a..82cc44f0 100644
--- a/tests/039.phpt
+++ b/tests/039.phpt
@@ -6,6 +6,7 @@ Check for Yaf_View_Simple recursive render error message outputing
 yaf.library="/php/global/dir"
 log_errors=0
 display_errors=1
+yaf.use_namespace=0
 --FILE--
 <?php
 require "build.inc";
diff --git a/tests/040.phpt b/tests/040.phpt
index a3b4087e..b87711c1 100644
--- a/tests/040.phpt
+++ b/tests/040.phpt
@@ -4,6 +4,7 @@ Fixed bug that segv in Yaf_View_Simple::render if the tpl is not a string
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.library="/php/global/dir"
+yaf.use_namespace=0
 --FILE--
 <?php
 $view = new Yaf_View_Simple(dirname(__FILE__));
diff --git a/tests/041.phpt b/tests/041.phpt
index da643129..c1a220c1 100644
--- a/tests/041.phpt
+++ b/tests/041.phpt
@@ -2,6 +2,8 @@
 Check for controller return false preventing auto-renderring
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/042.phpt b/tests/042.phpt
index 73a0e5bc..c28740af 100644
--- a/tests/042.phpt
+++ b/tests/042.phpt
@@ -2,6 +2,8 @@
 Check for throw exception in Yaf_Controller::init
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/043.phpt b/tests/043.phpt
index 821c218c..52c5f94d 100644
--- a/tests/043.phpt
+++ b/tests/043.phpt
@@ -9,6 +9,8 @@ yaf.cache_config=0
 yaf.name_suffix=1
 yaf.name_separator=""
 yaf.lowcase_path=1
+yaf.environ="product"
+yaf.use_namespace=0
 --FILE--
 <?php
 define("APPLICATION_PATH", dirname(__FILE__));
diff --git a/tests/044.phpt b/tests/044.phpt
index 8a12c22c..7168fdf2 100644
--- a/tests/044.phpt
+++ b/tests/044.phpt
@@ -4,6 +4,8 @@ Memleaks in Yaf_Dispatcher::getInstance()
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.use_namespace=0
+yaf.environ="product"
+yaf.use_namespace=0
 --FILE--
 <?php
 define("APPLICATION_PATH", dirname(__FILE__));
diff --git a/tests/045.phpt b/tests/045.phpt
index a9931a56..c82621ae 100644
--- a/tests/045.phpt
+++ b/tests/045.phpt
@@ -5,6 +5,8 @@ Check for segfault while use closure as error handler
 if (!extension_loaded("yaf")) print "skip";
 if (!version_compare(PHP_VERSION, "5.3", "ge")) print "skip only for 5.3+";
 ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/046.phpt b/tests/046.phpt
index 38f8651b..f8453344 100644
--- a/tests/046.phpt
+++ b/tests/046.phpt
@@ -5,6 +5,7 @@ Check for Yaf_Loader with single class
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/047.phpt b/tests/047.phpt
index 997d0706..a4e5b787 100644
--- a/tests/047.phpt
+++ b/tests/047.phpt
@@ -5,6 +5,7 @@ Check for Yaf_Loader with spl_autoload
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php 
 $config = array(
diff --git a/tests/048.phpt b/tests/048.phpt
index 0a34513d..5af02d3f 100644
--- a/tests/048.phpt
+++ b/tests/048.phpt
@@ -5,6 +5,7 @@ Check for Sample application
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 
 --FILE--
 <?php
diff --git a/tests/049.phpt b/tests/049.phpt
index 63f74e48..024e6323 100644
--- a/tests/049.phpt
+++ b/tests/049.phpt
@@ -5,6 +5,7 @@ Check for Sample application with exception
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 
 --FILE--
 <?php 
diff --git a/tests/050.phpt b/tests/050.phpt
index c060037e..da0bb8f4 100644
--- a/tests/050.phpt
+++ b/tests/050.phpt
@@ -5,6 +5,7 @@ Check for Sample application with return response
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 
 --FILE--
 <?php 
diff --git a/tests/051.phpt b/tests/051.phpt
index ae5e12d7..ff04faa2 100644
--- a/tests/051.phpt
+++ b/tests/051.phpt
@@ -5,6 +5,7 @@ Fixed bug that segfault while a abnormal object set to Yaf_Route*::route
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php
 error_reporting(E_ALL & ~E_WARNING);
diff --git a/tests/052.phpt b/tests/052.phpt
index fadbcf4b..d3013c13 100644
--- a/tests/052.phpt
+++ b/tests/052.phpt
@@ -4,6 +4,7 @@ Check for Yaf_Request APis
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.use_spl_autoload=0
+yaf.use_namespace=0
 --FILE--
 <?php
 $request = new Yaf_Request_Http(new stdClass(), "xxxx", false);
diff --git a/tests/053.phpt b/tests/053.phpt
index dedd3ed2..775fc5c4 100644
--- a/tests/053.phpt
+++ b/tests/053.phpt
@@ -5,6 +5,7 @@ Check for Custom view engine
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php 
 require "build.inc";
diff --git a/tests/054.phpt b/tests/054.phpt
index 088d1f84..45450e84 100644
--- a/tests/054.phpt
+++ b/tests/054.phpt
@@ -5,6 +5,7 @@ check for Various segfault
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php
 try {
diff --git a/tests/055.phpt b/tests/055.phpt
index 351f529b..db696d73 100644
--- a/tests/055.phpt
+++ b/tests/055.phpt
@@ -5,6 +5,8 @@ check for Yaf_Dispatcher::autoRender
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.environ="product"
+yaf.use_namespace=0
 --FILE--
 <?php
 define("APPLICATION_PATH", dirname(__FILE__));
diff --git a/tests/056.phpt b/tests/056.phpt
index be298575..101a0f4b 100644
--- a/tests/056.phpt
+++ b/tests/056.phpt
@@ -5,6 +5,8 @@ check for Yaf_Dispatcher::throwException
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.environ="product"
+yaf.use_namespace=0
 --FILE--
 <?php
 define("APPLICATION_PATH", dirname(__FILE__));
diff --git a/tests/057.phpt b/tests/057.phpt
index 759c94e9..37b75251 100644
--- a/tests/057.phpt
+++ b/tests/057.phpt
@@ -5,6 +5,8 @@ check for Yaf_Dispatcher::catchException
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.environ="product"
+yaf.use_namespace=0
 --FILE--
 <?php
 define("APPLICATION_PATH", dirname(__FILE__));
diff --git a/tests/058.phpt b/tests/058.phpt
index 315ec151..62fdda8a 100644
--- a/tests/058.phpt
+++ b/tests/058.phpt
@@ -5,6 +5,8 @@ check for Yaf_Dispatcher::flushInstantly
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.environ="product"
+yaf.use_namespace=0
 --FILE--
 <?php
 define("APPLICATION_PATH", dirname(__FILE__));
diff --git a/tests/059.phpt b/tests/059.phpt
index 36295065..c738b45c 100644
--- a/tests/059.phpt
+++ b/tests/059.phpt
@@ -5,6 +5,7 @@ Check nesting view render
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php 
 require "build.inc";
diff --git a/tests/060.phpt b/tests/060.phpt
index e454d028..1c3f8807 100644
--- a/tests/060.phpt
+++ b/tests/060.phpt
@@ -5,6 +5,7 @@ Check for working with other autoloaders
 --INI--
 yaf.use_spl_autoload=1
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php 
 require "build.inc";
diff --git a/tests/061.phpt b/tests/061.phpt
index 567a2efb..458cf2d2 100644
--- a/tests/061.phpt
+++ b/tests/061.phpt
@@ -5,6 +5,7 @@ Bug empty template file interrupts forward chain
 --INI--
 yaf.use_spl_autoload=1
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php 
 require "build.inc";
diff --git a/tests/062.phpt b/tests/062.phpt
index ccbb2851..9d3e3b96 100644
--- a/tests/062.phpt
+++ b/tests/062.phpt
@@ -4,6 +4,7 @@ Check for Yaf_View_Simple and application's template directory
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.library="/php/global/dir"
+yaf.use_namespace=0
 --FILE--
 <?php
 $view = new Yaf_View_Simple(dirname(__FILE__));
diff --git a/tests/063.phpt b/tests/063.phpt
index 23fc1aea..4f8f30ed 100644
--- a/tests/063.phpt
+++ b/tests/063.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Route_Rewrite with dynamic mvc
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $request = new Yaf_Request_Http("/subdir/ctl/act/name/value");
diff --git a/tests/064.phpt b/tests/064.phpt
index 897ebac5..30d7a3c6 100644
--- a/tests/064.phpt
+++ b/tests/064.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Route_Regex with dynamic mvc
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $request = new Yaf_Request_Http("/subdir/ctl/act/name/value");
diff --git a/tests/065.phpt b/tests/065.phpt
index 87cf9676..e73def37 100644
--- a/tests/065.phpt
+++ b/tests/065.phpt
@@ -2,6 +2,8 @@
 Yaf_Route_Regex map is optional
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 
diff --git a/tests/066.phpt b/tests/066.phpt
index 8967d1c5..49dc0416 100644
--- a/tests/066.phpt
+++ b/tests/066.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Route_Regex with abnormal map
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php 
 $request = new Yaf_Request_Http("/subdir/ap/1.2/xxx/name/value", "/subdir");
diff --git a/tests/067.phpt b/tests/067.phpt
index bbdf51e4..89b09367 100644
--- a/tests/067.phpt
+++ b/tests/067.phpt
@@ -5,6 +5,7 @@ Check actions map with defined action class
 --INI--
 yaf.use_spl_autoload=0
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php 
 require "build.inc";
diff --git a/tests/bug61493.phpt b/tests/bug61493.phpt
index ced9a028..066ec5a2 100644
--- a/tests/bug61493.phpt
+++ b/tests/bug61493.phpt
@@ -4,6 +4,8 @@ Bug #61493 (Can't remove item when using unset() with a Yaf_Config_Simple instan
 littlemiaor at gmail dot com
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php
 
diff --git a/tests/bug62702.phpt b/tests/bug62702.phpt
index b21e10b6..330c7765 100644
--- a/tests/bug62702.phpt
+++ b/tests/bug62702.phpt
@@ -2,6 +2,8 @@
 FR #62702 (Make baseuri case-insensitive)
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php
 
diff --git a/tests/bug63381.phpt b/tests/bug63381.phpt
index af8f8f3c..6c9872bf 100644
--- a/tests/bug63381.phpt
+++ b/tests/bug63381.phpt
@@ -5,6 +5,7 @@ Bug #63381 ($_SERVER['SCRIPT_NAME'] changed by yaf)
 --INI--
 yaf.use_spl_autoload=1
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php 
 require "build.inc";
diff --git a/tests/bug63438.phpt b/tests/bug63438.phpt
index 04758d45..2046c553 100644
--- a/tests/bug63438.phpt
+++ b/tests/bug63438.phpt
@@ -5,6 +5,7 @@ Bug #63438 (Strange behavior with nested rendering)
 --INI--
 yaf.use_spl_autoload=1
 yaf.lowcase_path=0
+yaf.use_namespace=0
 --FILE--
 <?php
 
diff --git a/tests/bug63900.phpt b/tests/bug63900.phpt
index 9a0366f4..75430e8a 100644
--- a/tests/bug63900.phpt
+++ b/tests/bug63900.phpt
@@ -7,6 +7,7 @@ yaf.use_spl_autoload=1
 yaf.lowcase_path=0
 yaf.throw_exception=0
 yaf.catch_exception=1
+yaf.use_namespace=0
 --FILE--
 <?php 
 require "build.inc";