Merge pull request laruence#111 from zxcvdavid/dev

移除无用代码&对有些namespace ini没有指定的测试用例进行修复
zhangjingpu · Jul 18, 2014 · 4d91256 · 4d91256
2 parents 596dbd6 + 5dc92c5
commit 4d91256
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 2 deletions.
diff --git a/routes/yaf_route_rewrite.c b/routes/yaf_route_rewrite.c
@@ -456,7 +456,6 @@ YAF_STARTUP_FUNCTION(route_rewrite) {
 	zend_declare_property_null(yaf_route_rewrite_ce, ZEND_STRL(YAF_ROUTE_PROPETY_NAME_MATCH),  ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_null(yaf_route_rewrite_ce, ZEND_STRL(YAF_ROUTE_PROPETY_NAME_ROUTE),  ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_null(yaf_route_rewrite_ce, ZEND_STRL(YAF_ROUTE_PROPETY_NAME_VERIFY), ZEND_ACC_PROTECTED TSRMLS_CC);
-	zend_declare_property_null(yaf_route_rewrite_ce, ZEND_STRL(YAF_ROUTE_PROPETY_NAME_REVERSE), ZEND_ACC_PROTECTED TSRMLS_CC);
 
 	return SUCCESS;
 }

diff --git a/tests/013.phpt b/tests/013.phpt
@@ -130,7 +130,6 @@ Array
                     [action] => action
                 )
 
-            [_reverse:protected] => 
         )
 
 )
diff --git a/tests/070.phpt b/tests/070.phpt
@@ -3,6 +3,7 @@ Fixed misleading error message when providing a string in Yaf_Application constr
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
+yaf.use_namespace=0
 --FILE--
 <?php
 

diff --git a/tests/071.phpt b/tests/071.phpt
@@ -3,6 +3,7 @@ return type in Yaf_Simple_Config::valid() should be boolean
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
+yaf.use_namespace=0
 --FILE--
 <?php
 

diff --git a/tests/073.phpt b/tests/073.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Route_Rewrite::assemble
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php
 

diff --git a/tests/074.phpt b/tests/074.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Route_Simple::assemble
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php
 

diff --git a/tests/075.phpt b/tests/075.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Route_Regex::assemble
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php
 

diff --git a/tests/076.phpt b/tests/076.phpt
@@ -4,6 +4,7 @@ Check for Yaf_Route_Supervar::assemble
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
 --INI--
 yaf.throw_exception=1
+yaf.use_namespace=0
 --FILE--
 <?php
 

diff --git a/tests/077.phpt b/tests/077.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Route_Static::assemble
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php
 

diff --git a/tests/078.phpt b/tests/078.phpt
@@ -2,6 +2,8 @@
 Check for Yaf_Route_Map::assemble
 --SKIPIF--
 <?php if (!extension_loaded("yaf")) print "skip"; ?>
+--INI--
+yaf.use_namespace=0
 --FILE--
 <?php
-Original file line number
+Diff line change
@@ Expand Up / @@ -130,7 +130,6 @@ Array @@
                         [action] => action
                     )
-                [_reverse:protected] =>
             )
     )