Merge branch 'master' into markup

Conflicts: library/Zend/Markup/Parser/Textile.php library/Zend/Markup/Renderer/AbstractRenderer.php library/Zend/Markup/Renderer/Html.php
zendframework · Oct 30, 2010 · c0d814f · c0d814f
2 parents 92259d0 + 1845030
commit c0d814f
Show file tree

Hide file tree

Showing 48 changed files with 5 additions and 74 deletions.
diff --git a/src/Backend.php b/src/Backend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/AbstractBackend.php b/src/Backend/AbstractBackend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/Apc.php b/src/Backend/Apc.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/BlackHole.php b/src/Backend/BlackHole.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/ExtendedBackend.php b/src/Backend/ExtendedBackend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/File.php b/src/Backend/File.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/Memcached.php b/src/Backend/Memcached.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/Sqlite.php b/src/Backend/Sqlite.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/StaticBackend.php b/src/Backend/StaticBackend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/TestBackend.php b/src/Backend/TestBackend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/TwoLevels.php b/src/Backend/TwoLevels.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/Xcache.php b/src/Backend/Xcache.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/ZendPlatform.php b/src/Backend/ZendPlatform.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/ZendServer/AbstractZendServer.php b/src/Backend/ZendServer/AbstractZendServer.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/ZendServer/Disk.php b/src/Backend/ZendServer/Disk.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Backend/ZendServer/ShMem.php b/src/Backend/ZendServer/ShMem.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Backend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Cache.php b/src/Cache.php
@@ -16,7 +16,6 @@
  * @package    Zend_Cache
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -103,22 +102,21 @@ abstract class Cache
      * @param array  $backendOptions  associative array of options for the corresponding backend constructor
      * @param boolean $customFrontendNaming if true, the frontend argument is used as a complete class name ; if false, the frontend argument is used as the end of "Zend_Cache_Frontend_[...]" class name
      * @param boolean $customBackendNaming if true, the backend argument is used as a complete class name ; if false, the backend argument is used as the end of "Zend_Cache_Backend_[...]" class name
-     * @param boolean $autoload if true, there will no require_once for backend and frontend (useful only for custom backends/frontends)
      * @throws \Zend\Cache\Exception
      * @return Zend\Cache\Frontend
      */
-    public static function factory($frontend, $backend, $frontendOptions = array(), $backendOptions = array(), $customFrontendNaming = false, $customBackendNaming = false, $autoload = false)
+    public static function factory($frontend, $backend, $frontendOptions = array(), $backendOptions = array(), $customFrontendNaming = false, $customBackendNaming = false)
     {
         if (is_string($backend)) {
-            $backendObject = self::_makeBackend($backend, $backendOptions, $customBackendNaming, $autoload);
+            $backendObject = self::_makeBackend($backend, $backendOptions, $customBackendNaming);
         } else {
             if (!is_object($backend) || !in_array('Zend\\Cache\\Backend', class_implements($backend))) {
                 self::throwException('backend must be a backend name (string) or an object which implements Zend\\Cache\\Backend');
             }
             $backendObject = $backend;
         }
         if (is_string($frontend)) {
-            $frontendObject = self::_makeFrontend($frontend, $frontendOptions, $customFrontendNaming, $autoload);
+            $frontendObject = self::_makeFrontend($frontend, $frontendOptions, $customFrontendNaming);
         } else {
             if (!is_object($frontend) || !in_array('Zend\\Cache\\Frontend', class_implements($frontend))) {
                 self::throwException('frontend must be a frontend name (string) or an object');
@@ -135,19 +133,16 @@ public static function factory($frontend, $backend, $frontendOptions = array(),
      * @param string  $backend
      * @param array   $backendOptions
      * @param boolean $customBackendNaming
-     * @param boolean $autoload
      * @return \Zend\Cache\Backend
      */
-    public static function _makeBackend($backend, $backendOptions, $customBackendNaming = false, $autoload = false)
+    public static function _makeBackend($backend, $backendOptions, $customBackendNaming = false)
     {
         if (!$customBackendNaming) {
             $backend  = self::_normalizeName($backend);
         }
         if (in_array($backend, self::$standardBackends)) {
             // we use a standard backend
             $backendClass = 'Zend\Cache\Backend\\' . $backend;
-            // security controls are explicit
-            require_once str_replace('\\', DIRECTORY_SEPARATOR, $backendClass) . '.php';
         } else {
             // we use a custom backend
             if (!preg_match('~^[\w\\\\]+$~D', $backend)) {
@@ -159,13 +154,6 @@ public static function _makeBackend($backend, $backendOptions, $customBackendNam
             } else {
                 $backendClass = $backend;
             }
-            if (!$autoload) {
-                $file = str_replace('\\', DIRECTORY_SEPARATOR, $backendClass) . '.php';
-                if (!(self::_isReadable($file))) {
-                    self::throwException("file $file not found in include_path");
-                }
-                require_once $file;
-            }
         }
         $backend = new $backendClass($backendOptions);
         if (!$backend instanceof Backend) {
@@ -180,10 +168,9 @@ public static function _makeBackend($backend, $backendOptions, $customBackendNam
      * @param string  $frontend
      * @param array   $frontendOptions
      * @param boolean $customFrontendNaming
-     * @param boolean $autoload
      * @return Zend_Cache_Core|Zend_Cache_Frontend
      */
-    public static function _makeFrontend($frontend, $frontendOptions = array(), $customFrontendNaming = false, $autoload = false)
+    public static function _makeFrontend($frontend, $frontendOptions = array(), $customFrontendNaming = false)
     {
         if (!$customFrontendNaming) {
             $frontend = self::_normalizeName($frontend);
@@ -192,8 +179,6 @@ public static function _makeFrontend($frontend, $frontendOptions = array(), $cus
             // we use a standard frontend
             // For perfs reasons, with frontend == 'Core', we can interact with the Core itself
             $frontendClass = 'Zend\Cache\Frontend\\' . $frontend;
-            // security controls are explicit
-            require_once str_replace('\\', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
         } else {
             // we use a custom frontend
             if (!preg_match('~^[\w\\\\]+$~D', $frontend)) {
@@ -205,13 +190,6 @@ public static function _makeFrontend($frontend, $frontendOptions = array(), $cus
             } else {
                 $frontendClass = $frontend;
             }
-            if (!$autoload) {
-                $file = str_replace('\\', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
-                if (!(self::_isReadable($file))) {
-                    self::throwException("file $file not found in include_path");
-                }
-                require_once $file;
-            }
         }
         $frontend = new $frontendClass($frontendOptions);
         if (!$frontend instanceof Frontend) {

diff --git a/src/Exception.php b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Cache
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Frontend.php b/src/Frontend.php
@@ -16,7 +16,6 @@
  * @package    Zend_Cache
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Frontend/Capture.php b/src/Frontend/Capture.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Frontend/ClassFrontend.php b/src/Frontend/ClassFrontend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Frontend/Core.php b/src/Frontend/Core.php
@@ -16,7 +16,6 @@
  * @package    Zend_Cache
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Frontend/File.php b/src/Frontend/File.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Frontend/FunctionFrontend.php b/src/Frontend/FunctionFrontend.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Frontend/Output.php b/src/Frontend/Output.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Frontend/Page.php b/src/Frontend/Page.php
@@ -17,7 +17,6 @@
  * @subpackage Zend_Cache_Frontend
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/Manager.php b/src/Manager.php
@@ -16,7 +16,6 @@
  * @package    Zend_Cache
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/ApcBackendTest.php b/test/ApcBackendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;

diff --git a/test/ClassFrontendTest.php b/test/ClassFrontendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;

diff --git a/test/CoreTest.php b/test/CoreTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;

diff --git a/test/FactoryException.php b/test/FactoryException.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;

diff --git a/test/FileBackendTest.php b/test/FileBackendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;

diff --git a/test/FileFrontendTest.php b/test/FileFrontendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;

diff --git a/test/FunctionFrontendTest.php b/test/FunctionFrontendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;

diff --git a/test/ManagerTest.php b/test/ManagerTest.php
@@ -16,7 +16,6 @@
  * @package    UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;

diff --git a/test/MemcachedBackendTest.php b/test/MemcachedBackendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;

diff --git a/test/OutputFrontendTest.php b/test/OutputFrontendTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 namespace ZendTest\Cache;