- Do not autoload if require does the trick

diff --git a/ext/spl/examples/dba_dump.php b/ext/spl/examples/dba_dump.php
index 7121babac6b010cb4c077a11353f66439993aeed..1f68622032feb7235a15cfab6b05b0bf9bf58e69 100755 (executable)
--- a/ext/spl/examples/dba_dump.php
+++ b/ext/spl/examples/dba_dump.php
@@ -26,8 +26,8 @@ EOF;
        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]);
 

diff --git a/ext/spl/examples/dbaarray.inc b/ext/spl/examples/dbaarray.inc
index 1064b581e889540e6921f9c5961ee3de5141a2ff..54f5ec844b02017491d8bf48b6ca6fb430df12cb 100755 (executable)
--- a/ext/spl/examples/dbaarray.inc
+++ b/ext/spl/examples/dbaarray.inc
@@ -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

diff --git a/ext/spl/examples/directorytree.php b/ext/spl/examples/directorytree.php
index ecaddbe33d780156b72c5203f9cf40d64252a17f..10047e7c0a6444179d40a1c66c260848db35adca 100755 (executable)
--- a/ext/spl/examples/directorytree.php
+++ b/ext/spl/examples/directorytree.php
@@ -24,7 +24,7 @@ EOF;
        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;
 

diff --git a/ext/spl/examples/findfile.inc b/ext/spl/examples/findfile.inc
index 56dba97b9286f056479cfd88c296f86894100bde..da51af81d462c84072be5a4153858b9a207c6e1b 100755 (executable)
--- a/ext/spl/examples/findfile.inc
+++ b/ext/spl/examples/findfile.inc
@@ -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

diff --git a/ext/spl/examples/findfile.php b/ext/spl/examples/findfile.php
index 03c06eaa46fa0191ddd07f04cd630f33a94035f2..0ed027c479ae6f71f5ca888e4677fe6c00ab2cdb 100755 (executable)
--- a/ext/spl/examples/findfile.php
+++ b/ext/spl/examples/findfile.php
@@ -27,7 +27,7 @@ EOF;
        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

diff --git a/ext/spl/examples/findregex.php b/ext/spl/examples/findregex.php
index 8a7dd8158d0c7a9ae3637fb211cec9ca353b2169..b43ee0cbbc169afc599ff1273049de290cef9530 100755 (executable)
--- a/ext/spl/examples/findregex.php
+++ b/ext/spl/examples/findregex.php
@@ -26,7 +26,7 @@ EOF;
        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)
 {

diff --git a/ext/spl/examples/ini_groups.php b/ext/spl/examples/ini_groups.php
index c418eb0cfb36ce352f84f1c255dc05f2b9f7de3c..11e913699287ac581c13a1ea90175a134d60e716 100755 (executable)
--- a/ext/spl/examples/ini_groups.php
+++ b/ext/spl/examples/ini_groups.php
@@ -26,8 +26,8 @@ EOF;
        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) {

diff --git a/ext/spl/examples/inigroups.inc b/ext/spl/examples/inigroups.inc
index 519c31631a8cbb327288341e1cdee103a5277ffe..abe7e2751bc514b96e0837ae4233fb6958dfc893 100755 (executable)
--- a/ext/spl/examples/inigroups.inc
+++ b/ext/spl/examples/inigroups.inc
@@ -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.

diff --git a/ext/spl/examples/tree.php b/ext/spl/examples/tree.php
index 96a6ccde2088c300a79adc4ad0eb0e6a699adb5b..a9f6d8beaf74c57c0897a286604a5e1b9ae75ecc 100755 (executable)
--- a/ext/spl/examples/tree.php
+++ b/ext/spl/examples/tree.php
@@ -28,7 +28,7 @@ EOF;
        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)