Merge branch 'PHP-5.3' into PHP-5.4

php · Oct 10, 2012 · 69a4301 · 69a4301
2 parents 45e938e + 1b9e0de
commit 69a4301
Show file tree

Hide file tree

Showing 65 changed files with 0 additions and 0 deletions.
diff --git a/Zend/tests/bug40236.inc b/Zend/tests/bug40236.inc
diff --git a/Zend/tests/ns_022.inc b/Zend/tests/ns_022.inc
diff --git a/Zend/tests/ns_027.inc b/Zend/tests/ns_027.inc
diff --git a/Zend/tests/ns_028.inc b/Zend/tests/ns_028.inc
diff --git a/Zend/tests/ns_065.inc b/Zend/tests/ns_065.inc
diff --git a/ext/interbase/tests/interbase.inc b/ext/interbase/tests/interbase.inc
diff --git a/ext/interbase/tests/skipif.inc b/ext/interbase/tests/skipif.inc
diff --git a/ext/mysql/tests/connect.inc b/ext/mysql/tests/connect.inc
diff --git a/ext/mysql/tests/skipif.inc b/ext/mysql/tests/skipif.inc
diff --git a/ext/mysql/tests/skipifconnectfailure.inc b/ext/mysql/tests/skipifconnectfailure.inc
diff --git a/ext/mysqli/tests/skipifconnectfailure.inc b/ext/mysqli/tests/skipifconnectfailure.inc
diff --git a/ext/pdo/tests/pdo.inc b/ext/pdo/tests/pdo.inc
diff --git a/ext/pdo_mysql/tests/skipif.inc b/ext/pdo_mysql/tests/skipif.inc
diff --git a/ext/phar/phar/clicommand.inc b/ext/phar/phar/clicommand.inc
diff --git a/ext/phar/phar/directorygraphiterator.inc b/ext/phar/phar/directorygraphiterator.inc
diff --git a/ext/phar/phar/directorytreeiterator.inc b/ext/phar/phar/directorytreeiterator.inc
diff --git a/ext/phar/phar/invertedregexiterator.inc b/ext/phar/phar/invertedregexiterator.inc
diff --git a/ext/phar/phar/phar.inc b/ext/phar/phar/phar.inc
diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
diff --git a/ext/session/tests/save_handler_closures.inc b/ext/session/tests/save_handler_closures.inc
diff --git a/ext/spl/examples/autoload.inc b/ext/spl/examples/autoload.inc
diff --git a/ext/spl/examples/callbackfilteriterator.inc b/ext/spl/examples/callbackfilteriterator.inc
diff --git a/ext/spl/examples/dbaarray.inc b/ext/spl/examples/dbaarray.inc
diff --git a/ext/spl/examples/dbareader.inc b/ext/spl/examples/dbareader.inc
diff --git a/ext/spl/examples/directoryfilterdots.inc b/ext/spl/examples/directoryfilterdots.inc
diff --git a/ext/spl/examples/directorytree.inc b/ext/spl/examples/directorytree.inc
diff --git a/ext/spl/examples/dualiterator.inc b/ext/spl/examples/dualiterator.inc
diff --git a/ext/spl/examples/findfile.inc b/ext/spl/examples/findfile.inc
diff --git a/ext/spl/examples/inigroups.inc b/ext/spl/examples/inigroups.inc
diff --git a/ext/spl/examples/keyfilter.inc b/ext/spl/examples/keyfilter.inc
diff --git a/ext/spl/examples/recursivecomparedualiterator.inc b/ext/spl/examples/recursivecomparedualiterator.inc
diff --git a/ext/spl/examples/recursivedualiterator.inc b/ext/spl/examples/recursivedualiterator.inc
diff --git a/ext/spl/examples/regexfindfile.inc b/ext/spl/examples/regexfindfile.inc
diff --git a/ext/spl/examples/searchiterator.inc b/ext/spl/examples/searchiterator.inc
diff --git a/ext/spl/examples/tests/examples.inc b/ext/spl/examples/tests/examples.inc
diff --git a/ext/spl/internal/appenditerator.inc b/ext/spl/internal/appenditerator.inc
diff --git a/ext/spl/internal/cachingiterator.inc b/ext/spl/internal/cachingiterator.inc
diff --git a/ext/spl/internal/emptyiterator.inc b/ext/spl/internal/emptyiterator.inc
diff --git a/ext/spl/internal/filteriterator.inc b/ext/spl/internal/filteriterator.inc
diff --git a/ext/spl/internal/infiniteiterator.inc b/ext/spl/internal/infiniteiterator.inc
diff --git a/ext/spl/internal/iteratoriterator.inc b/ext/spl/internal/iteratoriterator.inc
diff --git a/ext/spl/internal/limititerator.inc b/ext/spl/internal/limititerator.inc
diff --git a/ext/spl/internal/multipleiterator.inc b/ext/spl/internal/multipleiterator.inc
diff --git a/ext/spl/internal/norewinditerator.inc b/ext/spl/internal/norewinditerator.inc
diff --git a/ext/spl/internal/outeriterator.inc b/ext/spl/internal/outeriterator.inc
diff --git a/ext/spl/internal/parentiterator.inc b/ext/spl/internal/parentiterator.inc
diff --git a/ext/spl/internal/recursivearrayiterator.inc b/ext/spl/internal/recursivearrayiterator.inc
diff --git a/ext/spl/internal/recursivecachingiterator.inc b/ext/spl/internal/recursivecachingiterator.inc
diff --git a/ext/spl/internal/recursivefilteriterator.inc b/ext/spl/internal/recursivefilteriterator.inc
diff --git a/ext/spl/internal/recursiveiterator.inc b/ext/spl/internal/recursiveiterator.inc
diff --git a/ext/spl/internal/recursiveiteratoriterator.inc b/ext/spl/internal/recursiveiteratoriterator.inc
diff --git a/ext/spl/internal/recursiveregexiterator.inc b/ext/spl/internal/recursiveregexiterator.inc
diff --git a/ext/spl/internal/recursivetreeiterator.inc b/ext/spl/internal/recursivetreeiterator.inc
diff --git a/ext/spl/internal/regexiterator.inc b/ext/spl/internal/regexiterator.inc
diff --git a/ext/spl/internal/seekableiterator.inc b/ext/spl/internal/seekableiterator.inc
diff --git a/ext/spl/internal/splfileobject.inc b/ext/spl/internal/splfileobject.inc
diff --git a/ext/spl/internal/splobjectstorage.inc b/ext/spl/internal/splobjectstorage.inc
diff --git a/ext/spl/tests/testclass.class.inc b/ext/spl/tests/testclass.class.inc
diff --git a/ext/spl/tests/testclass.inc b/ext/spl/tests/testclass.inc
diff --git a/ext/spl/tests/testclass.php.inc b/ext/spl/tests/testclass.php.inc
diff --git a/tests/lang/015.inc b/tests/lang/015.inc
diff --git a/tests/lang/016.inc b/tests/lang/016.inc
diff --git a/tests/lang/023-1.inc b/tests/lang/023-1.inc
diff --git a/tests/lang/023-2.inc b/tests/lang/023-2.inc
diff --git a/tests/lang/bug38579.inc b/tests/lang/bug38579.inc