ZF-2533: use autoloading to check for classes before falling back to Zend_Loader

Also addresses: ZF-6016, ZF-6417, ZF-4167, ZF-6495, ZF-6611

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@15576 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Amf/Adobe/Introspector.php

@@ -91,6 +91,7 @@ class Zend_Amf_Adobe_Introspector
 
         // Introspect!
         if (!class_exists($serviceClass)) {
+            require_once 'Zend/Loader.php';
             Zend_Loader::loadClass($serviceClass, $this->_getServicePath());
         }
         

library/Zend/Amf/Server.php

@@ -178,12 +178,14 @@ class Zend_Amf_Server implements Zend_Server_Interface
                     $classPath[] = $dir . $uriclasspath;
                 }
 
-                require_once('Zend/Loader.php');
-                try {
-                    Zend_Loader::loadClass($className, $classPath);
-                } catch (Exception $e) {
-                    require_once 'Zend/Amf/Server/Exception.php';
-                    throw new Zend_Amf_Server_Exception('Class "' . $className . '" does not exist');
+                if (!class_exists($className)) {
+                    try {
+                        require_once 'Zend/Loader.php';
+                        Zend_Loader::loadClass($className, $classPath);
+                    } catch (Exception $e) {
+                        require_once 'Zend/Amf/Server/Exception.php';
+                        throw new Zend_Amf_Server_Exception('Class "' . $className . '" does not exist');
+                    }
                 }
                 // Add the new loaded class to the server.
                 $this->setClass($className, $source);
@@ -699,4 +701,4 @@ class Zend_Amf_Server implements Zend_Server_Interface
     {
         return array_keys($this->_table);
     }
-}
+}

library/Zend/Captcha/Word.php

@@ -220,7 +220,8 @@ abstract class Zend_Captcha_Word extends Zend_Captcha_Base
     {
         if (!isset($this->_session) || (null === $this->_session)) {
             $id = $this->getId();
-            if(!class_exists($this->_sessionClass, false)) {
+            if (!class_exists($this->_sessionClass)) {
+                require_once 'Zend/Loader.php';
                 Zend_Loader::loadClass($this->_sessionClass);
             }
             $this->_session = new $this->_sessionClass('Zend_Form_Captcha_' . $id);

library/Zend/Controller/Front.php

@@ -442,7 +442,10 @@ class Zend_Controller_Front
     public function setRequest($request)
     {
         if (is_string($request)) {
-            Zend_Loader::loadClass($request);
+            if (!class_exists($request)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($request);
+            }
             $request = new $request();
         }
         if (!$request instanceof Zend_Controller_Request_Abstract) {
@@ -481,7 +484,10 @@ class Zend_Controller_Front
     public function setRouter($router)
     {
         if (is_string($router)) {
-            Zend_Loader::loadClass($router);
+            if (!class_exists($router)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($router);
+            }
             $router = new $router();
         }
 
@@ -610,7 +616,10 @@ class Zend_Controller_Front
     public function setResponse($response)
     {
         if (is_string($response)) {
-            Zend_Loader::loadClass($response);
+            if (!class_exists($response)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($response);
+            }
             $response = new $response();
         }
         if (!$response instanceof Zend_Controller_Response_Abstract) {

library/Zend/Controller/Router/Rewrite.php

@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/** Zend_Loader */
-require_once 'Zend/Loader.php';
-
 /** Zend_Controller_Router_Abstract */
 require_once 'Zend/Controller/Router/Abstract.php';
 
@@ -197,7 +194,10 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
     protected function _getRouteFromConfig(Zend_Config $info)
     {
         $class = (isset($info->type)) ? $info->type : 'Zend_Controller_Router_Route';
-        Zend_Loader::loadClass($class);
+        if (!class_exists($class)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($class);
+        }
               
         $route = call_user_func(array($class, 'getInstance'), $info);
         
@@ -452,4 +452,4 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
     
         return $this;
     }
-}
+}

library/Zend/Db.php

@@ -22,12 +22,6 @@
 
 
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-
-/**
  * Class for connecting to SQL databases and performing common operations.
  *
  * @category   Zend
@@ -254,7 +248,10 @@ class Zend_Db
          * Load the adapter class.  This throws an exception
          * if the specified class cannot be loaded.
          */
-        Zend_Loader::loadClass($adapterName);
+        if (!class_exists($adapterName)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($adapterName);
+        }
 
         /*
          * Create an instance of the adapter class.

library/Zend/Db/Adapter/Abstract.php

@@ -32,12 +32,6 @@ require_once 'Zend/Db.php';
 require_once 'Zend/Db/Select.php';
 
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-
-/**
  * Class for connecting to SQL databases and performing common operations.
  *
  * @category   Zend
@@ -381,7 +375,10 @@ abstract class Zend_Db_Adapter_Abstract
         }
 
         if ($profilerInstance === null) {
-            Zend_Loader::loadClass($profilerClass);
+            if (!class_exists($profilerClass)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($profilerClass);
+            }
             $profilerInstance = new $profilerClass();
         }
 

library/Zend/Db/Adapter/Db2.php

@@ -30,11 +30,6 @@ require_once 'Zend/Db.php';
 require_once 'Zend/Db/Adapter/Abstract.php';
 
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
  * @see Zend_Db_Statement_Db2
  */
 require_once 'Zend/Db/Statement/Db2.php';
@@ -226,7 +221,10 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract
     {
         $this->_connect();
         $stmtClass = $this->_defaultStmtClass;
-        Zend_Loader::loadClass($stmtClass);
+        if (!class_exists($stmtClass)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($stmtClass);
+        }
         $stmt = new $stmtClass($this, $sql);
         $stmt->setFetchMode($this->_fetchMode);
         return $stmt;

library/Zend/Db/Adapter/Mysqli.php

@@ -22,11 +22,6 @@
 
 
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
  * @see Zend_Db_Adapter_Abstract
  */
 require_once 'Zend/Db/Adapter/Abstract.php';
@@ -377,7 +372,10 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract
             $this->_stmt->close();
         }
         $stmtClass = $this->_defaultStmtClass;
-        Zend_Loader::loadClass($stmtClass);
+        if (!class_exists($stmtClass)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($stmtClass);
+        }
         $stmt = new $stmtClass($this, $sql);
         if ($stmt === false) {
             return false;

library/Zend/Db/Adapter/Oracle.php

@@ -20,11 +20,6 @@
  */
 
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
  * @see Zend_Db_Adapter_Abstract
  */
 require_once 'Zend/Db/Adapter/Abstract.php';
@@ -203,7 +198,10 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract
     {
         $this->_connect();
         $stmtClass = $this->_defaultStmtClass;
-        Zend_Loader::loadClass($stmtClass);
+        if (!class_exists($stmtClass)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($stmtClass);
+        }
         $stmt = new $stmtClass($this, $sql);
         if ($stmt instanceof Zend_Db_Statement_Oracle) {
             $stmt->setLobAsString($this->getLobAsString());

library/Zend/Db/Adapter/Pdo/Abstract.php

@@ -28,12 +28,6 @@ require_once 'Zend/Db/Adapter/Abstract.php';
 
 
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-
-/**
  * @see Zend_Db_Statement_Pdo
  */
 require_once 'Zend/Db/Statement/Pdo.php';
@@ -177,7 +171,10 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract
     {
         $this->_connect();
         $stmtClass = $this->_defaultStmtClass;
-        Zend_Loader::loadClass($stmtClass);
+        if (!class_exists($stmtClass)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($stmtClass);
+        }
         $stmt = new $stmtClass($this, $sql);
         $stmt->setFetchMode($this->_fetchMode);
         return $stmt;

library/Zend/Db/Table/Abstract.php

@@ -1219,7 +1219,10 @@ abstract class Zend_Db_Table_Abstract
             'stored'   => true
         );
 
-        Zend_Loader::loadClass($this->_rowsetClass);
+        if (!class_exists($this->_rowsetClass)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($this->_rowsetClass);
+        }
         return new $this->_rowsetClass($data);
     }
 
@@ -1264,7 +1267,10 @@ abstract class Zend_Db_Table_Abstract
             'stored'  => true
         );
 
-        Zend_Loader::loadClass($this->_rowClass);
+        if (!class_exists($this->_rowClass)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($this->_rowClass);
+        }
         return new $this->_rowClass($data);
     }
 
@@ -1323,7 +1329,10 @@ abstract class Zend_Db_Table_Abstract
             'stored'   => false
         );
 
-        Zend_Loader::loadClass($this->_rowClass);
+        if (!class_exists($this->_rowClass)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($this->_rowClass);
+        }
         $row = new $this->_rowClass($config);
         $row->setFromArray($data);
         return $row;

library/Zend/Db/Table/Row/Abstract.php

@@ -26,11 +26,6 @@
 require_once 'Zend/Db.php';
 
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
  * @category   Zend
  * @package    Zend_Db
  * @subpackage Table
@@ -122,7 +117,10 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
             $this->_table = $config['table'];
             $this->_tableClass = get_class($this->_table);
         } else if ($this->_tableClass !== null) {
-            Zend_Loader::loadClass($this->_tableClass);
+            if (!class_exists($this->_tableClass)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($this->_tableClass);
+            }
             $this->_table = new $this->_tableClass();
         }
 
@@ -551,11 +549,14 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
                 $pkNew = $this->_getPrimaryKey(true);
                 $pkOld = $this->_getPrimaryKey(false);
                 foreach ($depTables as $tableClass) {
-                    try {
-                        Zend_Loader::loadClass($tableClass);
-                    } catch (Zend_Exception $e) {
-                        require_once 'Zend/Db/Table/Row/Exception.php';
-                        throw new Zend_Db_Table_Row_Exception($e->getMessage());
+                    if (!class_exists($tableClass)) {
+                        try {
+                            require_once 'Zend/Loader.php';
+                            Zend_Loader::loadClass($tableClass);
+                        } catch (Zend_Exception $e) {
+                            require_once 'Zend/Db/Table/Row/Exception.php';
+                            throw new Zend_Db_Table_Row_Exception($e->getMessage());
+                        }
                     }
                     $t = new $tableClass(array('db' => $db));
                     $t->_cascadeUpdate($this->getTableClass(), $pkOld, $pkNew);
@@ -629,11 +630,14 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
             $db = $this->_getTable()->getAdapter();
             $pk = $this->_getPrimaryKey();
             foreach ($depTables as $tableClass) {
-                try {
-                    Zend_Loader::loadClass($tableClass);
-                } catch (Zend_Exception $e) {
-                    require_once 'Zend/Db/Table/Row/Exception.php';
-                    throw new Zend_Db_Table_Row_Exception($e->getMessage());
+                if (!class_exists($tableClass)) {
+                    try {
+                        require_once 'Zend/Loader.php';
+                        Zend_Loader::loadClass($tableClass);
+                    } catch (Zend_Exception $e) {
+                        require_once 'Zend/Db/Table/Row/Exception.php';
+                        throw new Zend_Db_Table_Row_Exception($e->getMessage());
+                    }
                 }
                 $t = new $tableClass(array('db' => $db));
                 $t->_cascadeDelete($this->getTableClass(), $pk);
@@ -882,11 +886,14 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
         $db = $this->_getTable()->getAdapter();
 
         if (is_string($dependentTable)) {
-            try {;
-                Zend_Loader::loadClass($dependentTable);
-            } catch (Zend_Exception $e) {
-                require_once 'Zend/Db/Table/Row/Exception.php';
-                throw new Zend_Db_Table_Row_Exception($e->getMessage());
+            if (!class_exists($dependentTable)) {
+                try {
+                    require_once 'Zend/Loader.php';
+                    Zend_Loader::loadClass($dependentTable);
+                } catch (Zend_Exception $e) {
+                    require_once 'Zend/Db/Table/Row/Exception.php';
+                    throw new Zend_Db_Table_Row_Exception($e->getMessage());
+                }
             }
             $dependentTable = new $dependentTable(array('db' => $db));
         }
@@ -936,11 +943,14 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
         $db = $this->_getTable()->getAdapter();
 
         if (is_string($parentTable)) {
-            try {
-                Zend_Loader::loadClass($parentTable);
-            } catch (Zend_Exception $e) {
-                require_once 'Zend/Db/Table/Row/Exception.php';
-                throw new Zend_Db_Table_Row_Exception($e->getMessage());
+            if (!class_exists($parentTable)) {
+                try {
+                    require_once 'Zend/Loader.php';
+                    Zend_Loader::loadClass($parentTable);
+                } catch (Zend_Exception $e) {
+                    require_once 'Zend/Db/Table/Row/Exception.php';
+                    throw new Zend_Db_Table_Row_Exception($e->getMessage());
+                }
             }
             $parentTable = new $parentTable(array('db' => $db));
         }
@@ -991,11 +1001,14 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
         $db = $this->_getTable()->getAdapter();
 
         if (is_string($intersectionTable)) {
-            try {
-                Zend_Loader::loadClass($intersectionTable);
-            } catch (Zend_Exception $e) {
-                require_once 'Zend/Db/Table/Row/Exception.php';
-                throw new Zend_Db_Table_Row_Exception($e->getMessage());
+            if (!class_exists($intersectionTable)) {
+                try {
+                    require_once 'Zend/Loader.php';
+                    Zend_Loader::loadClass($intersectionTable);
+                } catch (Zend_Exception $e) {
+                    require_once 'Zend/Db/Table/Row/Exception.php';
+                    throw new Zend_Db_Table_Row_Exception($e->getMessage());
+                }
             }
             $intersectionTable = new $intersectionTable(array('db' => $db));
         }
@@ -1009,11 +1022,14 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
         }
 
         if (is_string($matchTable)) {
-            try {
-                Zend_Loader::loadClass($matchTable);
-            } catch (Zend_Exception $e) {
-                require_once 'Zend/Db/Table/Row/Exception.php';
-                throw new Zend_Db_Table_Row_Exception($e->getMessage());
+            if (!class_exists($matchTable)) {
+                try {
+                    require_once 'Zend/Loader.php';
+                    Zend_Loader::loadClass($matchTable);
+                } catch (Zend_Exception $e) {
+                    require_once 'Zend/Db/Table/Row/Exception.php';
+                    throw new Zend_Db_Table_Row_Exception($e->getMessage());
+                }
             }
             $matchTable = new $matchTable(array('db' => $db));
         }
@@ -1077,11 +1093,14 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
         );
 
         $rowsetClass = $matchTable->getRowsetClass();
-        try {
-            Zend_Loader::loadClass($rowsetClass);
-        } catch (Zend_Exception $e) {
-            require_once 'Zend/Db/Table/Row/Exception.php';
-            throw new Zend_Db_Table_Row_Exception($e->getMessage());
+        if (!class_exists($rowsetClass)) {
+            try {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($rowsetClass);
+            } catch (Zend_Exception $e) {
+                require_once 'Zend/Db/Table/Row/Exception.php';
+                throw new Zend_Db_Table_Row_Exception($e->getMessage());
+            }
         }
         $rowset = new $rowsetClass($config);
         return $rowset;

library/Zend/Db/Table/Rowset/Abstract.php

@@ -21,11 +21,6 @@
  */
 
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
  * @category   Zend
  * @package    Zend_Db
  * @subpackage Table
@@ -116,7 +111,10 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta
         if (isset($config['rowClass'])) {
             $this->_rowClass   = $config['rowClass'];
         }
-        Zend_Loader::loadClass($this->_rowClass);
+        if (!class_exists($this->_rowClass)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($this->_rowClass);
+        }
         if (isset($config['data'])) {
             $this->_data       = $config['data'];
         }

library/Zend/Feed.php

@@ -373,11 +373,11 @@ class Zend_Feed
     public static function importArray(array $data, $format = 'atom')
     {
         $obj = 'Zend_Feed_' . ucfirst(strtolower($format));
-        /**
-         * @see Zend_Loader
-         */
-        require_once 'Zend/Loader.php';
-        Zend_Loader::loadClass($obj);
+        if (!class_exists($obj)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($obj);
+        }
+
         /**
          * @see Zend_Feed_Builder
          */
@@ -395,12 +395,10 @@ class Zend_Feed
     public static function importBuilder(Zend_Feed_Builder_Interface $builder, $format = 'atom')
     {
         $obj = 'Zend_Feed_' . ucfirst(strtolower($format));
-        /**
-         * @see Zend_Loader
-         */
-        require_once 'Zend/Loader.php';
-        Zend_Loader::loadClass($obj);
-
+        if (!class_exists($obj)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($obj);
+        }
         return new $obj(null, null, $builder);
     }
 }

library/Zend/File/Transfer.php

@@ -45,7 +45,11 @@ class Zend_File_Transfer
                 break;
         }
         
-        Zend_Loader::loadClass($adapter);
+        if (!class_exists($adapter)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($adapter);
+        }
+
         $this->_adapter = new $adapter();
         if (!$this->_adapter instanceof Zend_File_Transfer_Adapter) {
             require_once 'Zend/File/Transfer/Exception.php';

library/Zend/Filter.php

@@ -91,10 +91,13 @@ class Zend_Filter implements Zend_Filter_Interface
         $namespaces = array_merge((array) $namespaces, array('Zend_Filter'));
         foreach ($namespaces as $namespace) {
             $className = $namespace . '_' . ucfirst($classBaseName);
-            try {
-                Zend_Loader::loadClass($className);
-            } catch (Zend_Exception $ze) {
-                continue;
+            if (!class_exists($className)) {
+                try {
+                    require_once 'Zend/Loader.php';
+                    Zend_Loader::loadClass($className);
+                } catch (Zend_Exception $ze) {
+                    continue;
+                }
             }
             $class = new ReflectionClass($className);
             if ($class->implementsInterface('Zend_Filter_Interface')) {

library/Zend/Filter/Encrypt.php

@@ -89,7 +89,10 @@ class Zend_Filter_Encrypt implements Zend_Filter_Interface
             $adapter = 'Zend_Filter_Encrypt_' . ucfirst($adapter);
         }
 
-        Zend_Loader::loadClass($adapter);
+        if (!class_exists($adapter)) {
+            Zend_Loader::loadClass($adapter);
+        }
+
         $this->_adapter = new $adapter($options);
         if (!$this->_adapter instanceof Zend_Filter_Encrypt_Interface) {
             require_once 'Zend/Filter/Exception.php';

library/Zend/Gdata/App.php

@@ -1020,8 +1020,11 @@ class Zend_Gdata_App
             $foundClassName = null;
             foreach ($this->_registeredPackages as $name) {
                  try {
-                     @Zend_Loader::loadClass("${name}_${class}");
-                     $foundClassName = "${name}_${class}";
+                     if (!class_exists($name . '_' . $class)) {
+                        require_once 'Zend/Loader.php';
+                        @Zend_Loader::loadClass($name . '_' . $class);
+                     }
+                     $foundClassName = $name . '_' . $class;
                      break;
                  } catch (Zend_Exception $e) {
                      // package wasn't here- continue searching

library/Zend/Gdata/Gapps.php

@@ -624,9 +624,11 @@ class Zend_Gdata_Gapps extends Zend_Gdata
             $foundClassName = null;
             foreach ($this->_registeredPackages as $name) {
                  try {
-                     require_once 'Zend/Loader.php';
-                     @Zend_Loader::loadClass("${name}_${class}");
-                     $foundClassName = "${name}_${class}";
+                     if (!class_exists($name . '_' . $class)) {
+                        require_once 'Zend/Loader.php';
+                        @Zend_Loader::loadClass($name . '_' . $class);
+                     }
+                     $foundClassName = $name . '_' . $class;
                      break;
                  } catch (Zend_Exception $e) {
                      // package wasn't here- continue searching

library/Zend/Http/Client.php

@@ -792,12 +792,15 @@ class Zend_Http_Client
     public function setAdapter($adapter)
     {
         if (is_string($adapter)) {
-            try {
-                Zend_Loader::loadClass($adapter);
-            } catch (Zend_Exception $e) {
-                /** @see Zend_Http_Client_Exception */
-                require_once 'Zend/Http/Client/Exception.php';
-                throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}");
+            if (!class_exists($adapter)) {
+                try {
+                    require_once 'Zend/Loader.php';
+                    Zend_Loader::loadClass($adapter);
+                } catch (Zend_Exception $e) {
+                    /** @see Zend_Http_Client_Exception */
+                    require_once 'Zend/Http/Client/Exception.php';
+                    throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}");
+                }
             }
 
             $adapter = new $adapter;

library/Zend/InfoCard/Xml/Element.php

@@ -26,11 +26,6 @@
 require_once 'Zend/InfoCard/Xml/Element/Interface.php';
 
 /**
- * Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
  * An abstract class representing a an XML data block
  *
  * @category   Zend
@@ -85,8 +80,10 @@ abstract class Zend_InfoCard_Xml_Element
      */
     static public function convertToObject(DOMElement $e, $classname)
     {
-
-        Zend_Loader::loadClass($classname);
+        if (!class_exists($classname)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($classname);
+        }
 
         $reflection = new ReflectionClass($classname);
 

library/Zend/InfoCard/Xml/Security/Transform.php

@@ -21,11 +21,6 @@
  */
 
 /**
- * Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
  * A class to create a transform rule set based on XML URIs and then apply those rules
  * in the correct order to a given XML input
  *
@@ -98,7 +93,10 @@ class Zend_InfoCard_Xml_Security_Transform
     public function applyTransforms($strXmlDocument)
     {
         foreach($this->_transformList as $transform) {
-            Zend_Loader::loadClass($transform['class']);
+            if (!class_exists($transform['class'])) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($transform['class']);
+            }
 
             $transformer = new $transform['class'];
 

library/Zend/Layout.php

@@ -264,8 +264,10 @@ class Zend_Layout
         require_once 'Zend/Controller/Front.php';
         $front = Zend_Controller_Front::getInstance();
         if (!$front->hasPlugin($pluginClass)) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($pluginClass);
+            if (!class_exists($pluginClass)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($pluginClass);
+            }
             $front->registerPlugin(
                 // register to run last | BUT before the ErrorHandler (if its available)
                 new $pluginClass($this), 
@@ -284,8 +286,10 @@ class Zend_Layout
         $helperClass = $this->getHelperClass();
         require_once 'Zend/Controller/Action/HelperBroker.php';
         if (!Zend_Controller_Action_HelperBroker::hasHelper('layout')) {
-            require_once 'Zend/Loader.php';
-            Zend_Loader::loadClass($helperClass);
+            if (!class_exists($helperClass)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($helperClass);
+            }
             Zend_Controller_Action_HelperBroker::getStack()->offsetSet(-90, new $helperClass($this));
         }
     }

library/Zend/Mail/Transport/Smtp.php

@@ -22,11 +22,6 @@
 
 
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
  * @see Zend_Mime
  */
 require_once 'Zend/Mime.php';
@@ -192,7 +187,10 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract
             if ($this->_auth) {
                 $connectionClass .= '_Auth_' . ucwords($this->_auth);
             }
-            Zend_Loader::loadClass($connectionClass);
+            if (!class_exists($connectionClass)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($connectionClass);
+            }
             $this->setConnection(new $connectionClass($this->_host, $this->_port, $this->_config));
             $this->_connection->connect();
             $this->_connection->helo($this->_name);

library/Zend/Navigation/Page.php

@@ -190,8 +190,10 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container
                         break;
                 }
 
-                require_once 'Zend/Loader.php';
-                @Zend_Loader::loadClass($type);
+                if (!class_exists($type)) {
+                    require_once 'Zend/Loader.php';
+                    @Zend_Loader::loadClass($type);
+                }
 
                 $page = new $type($options);
                 if (!$page instanceof Zend_Navigation_Page) {
@@ -1113,4 +1115,4 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container
      * @return string  the page's href
      */
     abstract public function getHref();
-}
+}

library/Zend/Reflection/Docblock/Tag.php

@@ -19,9 +19,6 @@
  * @version    $Id$
  */
 
-/** Zend_Loader */
-require_once 'Zend/Loader.php';
-
 /**
  * @category   Zend
  * @package    Zend_Reflection
@@ -67,6 +64,7 @@ class Zend_Reflection_Docblock_Tag implements Reflector
         if (array_key_exists($tagName, self::$_tagClasses)) {
             $tagClass = self::$_tagClasses[$tagName];
             if (!class_exists($tagClass)) {
+                require_once 'Zend/Loader.php';
                 Zend_Loader::loadClass($tagClass);
             }
             return new $tagClass($tagDocblockLine);

library/Zend/Registry.php

@@ -109,8 +109,10 @@ class Zend_Registry extends ArrayObject
         /**
          * @see Zend_Loader
          */
-        require_once 'Zend/Loader.php';
-        Zend_Loader::loadClass($registryClassName);
+        if (!class_exists($registryClassName)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($registryClassName);
+        }
 
         self::$_registryClassName = $registryClassName;
     }

library/Zend/Service/Amazon/Ec2.php

@@ -20,8 +20,6 @@
  * @version    $Id$
  */
 
-require_once 'Zend/Loader.php';
-
 /**
  * Amazon Ec2 Interface to allow easy creation of the Ec2 Components
  *
@@ -79,7 +77,10 @@ class Zend_Service_Amazon_Ec2
                 break;
         }
 
-        Zend_Loader::loadClass($class);
+        if (!class_exists($class)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($class);
+        }
         return new $class($key, $secret_key);
     }
 }

library/Zend/Service/Nirvanix.php

@@ -20,11 +20,6 @@
  */
  
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
  * @see Zend_Http_Client
  */
 require_once 'Zend/Http/Client.php';
@@ -91,7 +86,10 @@ class Zend_Service_Nirvanix
         $options['namespace'] = ucfirst($namespace);
         $options = array_merge($this->_options, $options);
 
-        Zend_Loader::loadClass($class);
+        if (!class_exists($class)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($class);
+        }
         return new $class($options);
     }
     

library/Zend/Service/StrikeIron.php

@@ -22,12 +22,6 @@
 
 
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-
-/**
  * This class allows StrikeIron authentication credentials to be specified
  * in one place and provides a factory for returning instances of different
  * StrikeIron service classes.
@@ -74,7 +68,10 @@ class Zend_Service_StrikeIron
         }
 
         try {
-            @Zend_Loader::loadClass($class);
+            if (!class_exists($class)) {
+                require_once 'Zend/Loader.php';
+                @Zend_Loader::loadClass($class);
+            }
             if (!class_exists($class, false)) {
                 throw new Exception('Class file not found');
             }

library/Zend/Session.php

@@ -721,15 +721,11 @@ class Zend_Session extends Zend_Session_Abstract
      */
     private static function _processValidators()
     {
-        if (count($_SESSION['__ZF']['VALID']) > 0) {
-            /**
-             * @see Zend_Loader
-             */
-            require_once 'Zend/Loader.php';
-        }
-
         foreach ($_SESSION['__ZF']['VALID'] as $validator_name => $valid_data) {
-            Zend_Loader::loadClass($validator_name);
+            if (!class_exists($validator_name)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($validator_name);
+            }
             $validator = new $validator_name;
             if ($validator->validate() === false) {
                 /** @see Zend_Session_Exception */

library/Zend/TimeSync.php

@@ -21,11 +21,6 @@
  */
 
 /**
- * Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
  * Zend_Date
  */
 require_once 'Zend/Date.php';
@@ -298,8 +293,10 @@ class Zend_TimeSync implements IteratorAggregate
         }
 
         $className = 'Zend_TimeSync_' . $protocol;
-
-        Zend_Loader::loadClass($className);
+        if (!class_exists($className)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($className);
+        }
         $timeServerObj = new $className($adress, $port);
 
         $this->_timeservers[$alias] = $timeServerObj;

library/Zend/Tool/Framework/Client/Console.php

@@ -108,8 +108,12 @@ class Zend_Tool_Framework_Client_Console
         }
         
         // support setting the loader from the environment
-        if (isset($_ENV['ZEND_TOOL_FRAMEWORK_LOADER_CLASS']) && Zend_Loader::loadClass($_ENV['ZEND_TOOL_FRAMEWORK_LOADER_CLASS'])) {
-            $this->_registry->setLoader(new $_ENV['ZEND_TOOL_FRAMEWORK_LOADER_CLASS']);
+        if (isset($_ENV['ZEND_TOOL_FRAMEWORK_LOADER_CLASS'])) {
+            if (class_exists($_ENV['ZEND_TOOL_FRAMEWORK_LOADER_CLASS'])
+                || Zend_Loader::loadClass($_ENV['ZEND_TOOL_FRAMEWORK_LOADER_CLASS'])
+            ) {
+                $this->_registry->setLoader(new $_ENV['ZEND_TOOL_FRAMEWORK_LOADER_CLASS']);
+            }
         }
 
         return;

library/Zend/Tool/Project/Context/Repository.php

@@ -1,6 +1,5 @@
 <?php
 
-require_once 'Zend/Loader.php';
 require_once 'Zend/Tool/Project/Context/System/Interface.php';
 require_once 'Zend/Tool/Project/Context/System/TopLevelRestrictable.php';
 require_once 'Zend/Tool/Project/Context/System/NotOverwritable.php';
@@ -59,7 +58,10 @@ class Zend_Tool_Project_Context_Repository implements Countable
     
     public function addContextClass($contextClass)
     {
-        Zend_Loader::loadClass($contextClass);
+        if (!class_exists($contextClass)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($contextClass);
+        }
         $context = new $contextClass();
         return $this->addContext($context);
     }
@@ -155,4 +157,4 @@ class Zend_Tool_Project_Context_Repository implements Countable
         return strtolower($name);
     }
     
-}
+}

library/Zend/Translate.php

@@ -86,7 +86,10 @@ class Zend_Translate {
             $adapter = 'Zend_Translate_Adapter_' . ucfirst($adapter);
         }
 
-        Zend_Loader::loadClass($adapter);
+        if (!class_exists($adapter)) {
+            Zend_Loader::loadClass($adapter);
+        }
+
         if (self::$_cache !== null) {
             call_user_func(array($adapter, 'setCache'), self::$_cache);
         }

library/Zend/Uri.php

@@ -20,11 +20,6 @@
  */
 
 /**
- * @see Zend_Loader
- */
-require_once 'Zend/Loader.php';
-
-/**
  * Abstract class for all Zend_Uri handlers
  *
  * @category  Zend
@@ -128,7 +123,10 @@ abstract class Zend_Uri
                 break;
         }
 
-        Zend_Loader::loadClass($className);
+        if (!class_exists($className)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($className);
+        }
         $schemeHandler = new $className($scheme, $schemeSpecific);
 
         return $schemeHandler;

library/Zend/Validate.php

@@ -141,18 +141,18 @@ class Zend_Validate implements Zend_Validate_Interface
         foreach ($namespaces as $namespace) {
             $className = $namespace . '_' . ucfirst($classBaseName);
             try {
-                require_once 'Zend/Loader.php';
-                Zend_Loader::loadClass($className);
-                if (class_exists($className, false)) {
-                    $class = new ReflectionClass($className);
-                    if ($class->implementsInterface('Zend_Validate_Interface')) {
-                        if ($class->hasMethod('__construct')) {
-                            $object = $class->newInstanceArgs($args);
-                        } else {
-                            $object = $class->newInstance();
-                        }
-                        return $object->isValid($value);
+                if (!class_exists($className)) {
+                    require_once 'Zend/Loader.php';
+                    Zend_Loader::loadClass($className);
+                }
+                $class = new ReflectionClass($className);
+                if ($class->implementsInterface('Zend_Validate_Interface')) {
+                    if ($class->hasMethod('__construct')) {
+                        $object = $class->newInstanceArgs($args);
+                    } else {
+                        $object = $class->newInstance();
                     }
+                    return $object->isValid($value);
                 }
             } catch (Zend_Validate_Exception $ze) {
                 // if there is an exception while validating throw it

library/Zend/View/Helper/Placeholder/Registry.php

@@ -158,8 +158,10 @@ class Zend_View_Helper_Placeholder_Registry
      */
     public function setContainerClass($name)
     {
-        require_once 'Zend/Loader.php';
-        Zend_Loader::loadClass($name);
+        if (!class_exists($name)) {
+            require_once 'Zend/Loader.php';
+            Zend_Loader::loadClass($name);
+        }
 
         $reflection = new ReflectionClass($name);
         if (!$reflection->isSubclassOf(new ReflectionClass('Zend_View_Helper_Placeholder_Container_Abstract'))) {

library/Zend/Wildfire/Channel/HttpHeaders.php

@@ -81,24 +81,30 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract
      */
     public static function init($class = null)
     {
-        if (self::$_instance!==null) {
+        if (self::$_instance !== null) {
             require_once 'Zend/Wildfire/Exception.php';
             throw new Zend_Wildfire_Exception('Singleton instance of Zend_Wildfire_Channel_HttpHeaders already exists!');
         }
-        if ($class!==null) {
+        if ($class !== null) {
             if (!is_string($class)) {
                 require_once 'Zend/Wildfire/Exception.php';
                 throw new Zend_Wildfire_Exception('Third argument is not a class string');
             }
-            Zend_Loader::loadClass($class);
+
+            if (!class_exists($class)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($class);
+            }
+
             self::$_instance = new $class();
+
             if (!self::$_instance instanceof Zend_Wildfire_Channel_HttpHeaders) {
                 self::$_instance = null;
                 require_once 'Zend/Wildfire/Exception.php';
                 throw new Zend_Wildfire_Exception('Invalid class to third argument. Must be subclass of Zend_Wildfire_Channel_HttpHeaders.');
             }
         } else {
-          self::$_instance = new self();
+            self::$_instance = new self();
         }
 
         return self::$_instance;

library/Zend/Wildfire/Plugin/FirePhp.php

@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/** Zend_Loader */
-require_once 'Zend/Loader.php';
-
 /** Zend_Controller_Request_Abstract */
 require_once('Zend/Controller/Request/Abstract.php');
 
@@ -176,16 +173,20 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface
      */
     public static function init($class = null)
     {
-        if (self::$_instance!==null) {
+        if (self::$_instance !== null) {
             require_once 'Zend/Wildfire/Exception.php';
             throw new Zend_Wildfire_Exception('Singleton instance of Zend_Wildfire_Plugin_FirePhp already exists!');
         }
-        if ($class!==null) {
+        if ($class !== null) {
             if (!is_string($class)) {
                 require_once 'Zend/Wildfire/Exception.php';
                 throw new Zend_Wildfire_Exception('Third argument is not a class string');
             }
-            Zend_Loader::loadClass($class);
+
+            if (!$class_exists($class)) {
+                require_once 'Zend/Loader.php';
+                Zend_Loader::loadClass($class);
+            }
             self::$_instance = new $class();
             if (!self::$_instance instanceof Zend_Wildfire_Plugin_FirePhp) {
                 self::$_instance = null;