helly Sun Oct 31 20:29:10 2004 EDT
Modified files:
/php-src/ext/spl/examples dba_dump.php dbaarray.inc
directorytree.php findfile.inc
findfile.php findregex.php ini_groups.php
inigroups.inc tree.php
Log:
- Do not autoload if require does the trick
http://cvs.php.net/diff.php/php-src/ext/spl/examples/dba_dump.php?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/spl/examples/dba_dump.php
diff -u php-src/ext/spl/examples/dba_dump.php:1.8
php-src/ext/spl/examples/dba_dump.php:1.9
--- php-src/ext/spl/examples/dba_dump.php:1.8 Mon May 10 13:26:03 2004
+++ php-src/ext/spl/examples/dba_dump.php Sun Oct 31 20:29:05 2004
@@ -26,8 +26,8 @@
exit(1);
}
-if (!class_exists("DbaReader")) require_once("dbareader.inc");
-if (!class_exists("KeyFilter")) require_once("keyfilter.inc");
+if (!class_exists("DbaReader", false)) require_once("dbareader.inc");
+if (!class_exists("KeyFilter", false)) require_once("keyfilter.inc");
$db = new DbaReader($argv[1], $argv[2]);
http://cvs.php.net/diff.php/php-src/ext/spl/examples/dbaarray.inc?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/spl/examples/dbaarray.inc
diff -u php-src/ext/spl/examples/dbaarray.inc:1.2
php-src/ext/spl/examples/dbaarray.inc:1.3
--- php-src/ext/spl/examples/dbaarray.inc:1.2 Mon May 10 13:26:03 2004
+++ php-src/ext/spl/examples/dbaarray.inc Sun Oct 31 20:29:05 2004
@@ -9,7 +9,7 @@
* SPL - Standard PHP Library
*/
-if (!class_exists("DbaReader")) require_once("dbareader.inc");
+if (!class_exists("DbaReader", false)) require_once("dbareader.inc");
/** @ingroup Examples
* @brief This implements a DBA Array
http://cvs.php.net/diff.php/php-src/ext/spl/examples/directorytree.php?r1=1.11&r2=1.12&ty=u
Index: php-src/ext/spl/examples/directorytree.php
diff -u php-src/ext/spl/examples/directorytree.php:1.11
php-src/ext/spl/examples/directorytree.php:1.12
--- php-src/ext/spl/examples/directorytree.php:1.11 Mon May 10 13:26:03 2004
+++ php-src/ext/spl/examples/directorytree.php Sun Oct 31 20:29:05 2004
@@ -24,7 +24,7 @@
exit(1);
}
-if (!class_exists("DirectoryTreeIterator")) require_once("directorytreeiterator.inc");
+if (!class_exists("DirectoryTreeIterator", false))
require_once("directorytreeiterator.inc");
$length = $argc > 3 ? $argv[3] : -1;
http://cvs.php.net/diff.php/php-src/ext/spl/examples/findfile.inc?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/spl/examples/findfile.inc
diff -u php-src/ext/spl/examples/findfile.inc:1.5
php-src/ext/spl/examples/findfile.inc:1.6
--- php-src/ext/spl/examples/findfile.inc:1.5 Mon May 10 13:26:03 2004
+++ php-src/ext/spl/examples/findfile.inc Sun Oct 31 20:29:06 2004
@@ -9,8 +9,8 @@
* SPL - Standard PHP Library
*/
-if (!class_exists("FindFile")) require_once("findfile.inc");
-if (!class_exists("AppendIterator")) require_once("appenditerator.inc");
+if (!class_exists("FindFile", false)) require_once("findfile.inc");
+if (!class_exists("AppendIterator", false)) require_once("appenditerator.inc");
/** @ingroup Examples
* @brief Base class to find files
http://cvs.php.net/diff.php/php-src/ext/spl/examples/findfile.php?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/spl/examples/findfile.php
diff -u php-src/ext/spl/examples/findfile.php:1.8
php-src/ext/spl/examples/findfile.php:1.9
--- php-src/ext/spl/examples/findfile.php:1.8 Mon May 10 13:26:03 2004
+++ php-src/ext/spl/examples/findfile.php Sun Oct 31 20:29:06 2004
@@ -27,7 +27,7 @@
exit(1);
}
-if (!class_exists("FindFile")) require_once("findfile.inc");
+if (!class_exists("FindFile", false)) require_once("findfile.inc");
foreach(new FindFile($argv[1], $argv[2]) as $file) echo $file->getPathname()."\n";
?>
\ No newline at end of file
http://cvs.php.net/diff.php/php-src/ext/spl/examples/findregex.php?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/spl/examples/findregex.php
diff -u php-src/ext/spl/examples/findregex.php:1.3
php-src/ext/spl/examples/findregex.php:1.4
--- php-src/ext/spl/examples/findregex.php:1.3 Mon May 10 13:26:03 2004
+++ php-src/ext/spl/examples/findregex.php Sun Oct 31 20:29:06 2004
@@ -26,7 +26,7 @@
exit(1);
}
-if (!class_exists("RegexFindFile")) require_once("regexfindfile.inc");
+if (!class_exists("RegexFindFile", false)) require_once("regexfindfile.inc");
foreach(new RegexFindFile($argv[1], $argv[2]) as $file)
{
http://cvs.php.net/diff.php/php-src/ext/spl/examples/ini_groups.php?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/spl/examples/ini_groups.php
diff -u php-src/ext/spl/examples/ini_groups.php:1.5
php-src/ext/spl/examples/ini_groups.php:1.6
--- php-src/ext/spl/examples/ini_groups.php:1.5 Mon May 10 13:26:03 2004
+++ php-src/ext/spl/examples/ini_groups.php Sun Oct 31 20:29:06 2004
@@ -26,8 +26,8 @@
exit(1);
}
-if (!class_exists("KeyFilter")) require_once("keyfilter.inc");
-if (!class_exists("IniGroups")) require_once("inigroups.inc");
+if (!class_exists("KeyFilter", false)) require_once("keyfilter.inc");
+if (!class_exists("IniGroups", false)) require_once("inigroups.inc");
$it = new IniGroups($argv[1]);
if ($argc>2) {
http://cvs.php.net/diff.php/php-src/ext/spl/examples/inigroups.inc?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/spl/examples/inigroups.inc
diff -u php-src/ext/spl/examples/inigroups.inc:1.2
php-src/ext/spl/examples/inigroups.inc:1.3
--- php-src/ext/spl/examples/inigroups.inc:1.2 Mon May 10 13:26:03 2004
+++ php-src/ext/spl/examples/inigroups.inc Sun Oct 31 20:29:06 2004
@@ -9,8 +9,8 @@
* SPL - Standard PHP Library
*/
-if (!class_exists("KeyFilter")) require_once("keyfilter.inc");
-if (!class_exists("DbaReader")) require_once("dbareader.inc");
+if (!class_exists("KeyFilter", false)) require_once("keyfilter.inc");
+if (!class_exists("DbaReader", false)) require_once("dbareader.inc");
/** @ingroup Examples
* @brief Class to iterate all groups within an ini file.
http://cvs.php.net/diff.php/php-src/ext/spl/examples/tree.php?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/spl/examples/tree.php
diff -u php-src/ext/spl/examples/tree.php:1.9 php-src/ext/spl/examples/tree.php:1.10
--- php-src/ext/spl/examples/tree.php:1.9 Mon May 10 13:26:03 2004
+++ php-src/ext/spl/examples/tree.php Sun Oct 31 20:29:06 2004
@@ -28,7 +28,7 @@
exit(1);
}
-if (!class_exists("DirectoryTreeIterator")) require_once("directorytreeiterator.inc");
+if (!class_exists("DirectoryTreeIterator", false))
require_once("directorytreeiterator.inc");
echo $argv[1]."\n";
foreach(new DirectoryTreeIterator($argv[1]) as $file)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
