MAGETWO-65715: Upgrade zend Framework 1 to 1.12.20

  - Merge tag '1.12.16-patch3' into MAGETWO-65715-1.12.20

Author: igrybkov

README.md

@@ -1,174 +1,14 @@
-![Logo](http://framework.zend.com/images/logos/ZendFramework-logo.png)
-
-Welcome to the Zend Framework 1.12 Release! 
-
-Master: [![Build Status](https://api.travis-ci.org/zendframework/zf1.png?branch=master)](https://travis-ci.org/zendframework/zf1)
-
-RELEASE INFORMATION
+INFORMATION
 ===================
 
-Zend Framework 1.12.17dev Release.
-Released on MMM DD, YYYY.
+This is a fork from Zend Framework 1.12.16 Release.
 
-IMPORTANT FIXES FOR 1.12.17
+PURPOSE
 ---------------------------
-
-See http://framework.zend.com/changelog for full details.
-
-NEW FEATURES
-============
-
-Zend_Loader changes
--------------------
-
-A number of autoloaders and autoloader facilities were back ported from
-ZF2 to provide performant alternatives to those already available in the
-1.X releases.  These include: Zend_Loader_StandardAutoloader, which
-improves on Zend_Loader_Autoloader by allowing the ability to specify a
-specific path to associate with a vendor prefix or namespace;
-Zend_Loader_ClassMapAutoloader, which provides the ability to use lookup
-tables for autoloading (which are typically the fastest possible way to
-autoload); and Zend_Loader_AutoloaderFactory, which can both create and
-update autoloaders for you, as well as register them with
-spl_autoload_register().
-
-The Zend_Loader changes were back ported from ZF2 by Matthew Weier
-O’Phinney
-
-Zend_EventManager
------------------
-
-Zend_EventManager is a component that allows you to attach and detach
-listeners to named events, both on a per-instance basis as well as via
-shared collections; trigger events; and interrupt execution of
-listeners.
-
-Zend_EventManager was back ported from ZF2 by Matthew Weier O’Phinney
-
-Zend_Http_UserAgent_Features_Adapter_Browscap
----------------------------------------------
-
-This class provides a features adapter that calls get_browser() in order
-to discover mobile device capabilities to inject into UserAgent device
-instances.
-
-Browscap (http://browsers.garykeith.com/) is an open project dedicated
-to collecting an disseminating a “database” of browser capabilities. PHP
-has built-in support for using these files via the get_browser()
-function. This function requires that your php.ini provides a browscap
-entry pointing to the PHP-specific php_browscap.ini file which is
-available at http://browsers.garykeith.com/stream.asp?PHP_BrowsCapINI.
-
-Zend_Http_UserAgent_Features_Adapter_Browscap was created by Matthew
-Weier O’Phinney
-
-Zend_Mobile_Push
-----------------
-
-Zend_Mobile_Push is a component for implementing push notifications for
-the 3 major push notification platforms (Apple (Apns), Google (C2dm) and
-Microsoft (Mpns).
-
-Zend_Mobile_Push was contributed by Mike Willbanks.
-
-Zend_Gdata_Analytics
---------------------
-
-Zend_Gdata_Analytics is an extension to Zend_Gdata to allow interaction
-with Google’s Analytics Data Export API. This extension does not
-encompass any major changes in the overall operation of Zend_Gdata
-components.
-
-Zend_Gdata_Analytics was contributed by Daniel Hartmann.
-
-Removed features
-================
-
-Zend_Http_UserAgent_Features_Adapter_WurflApi
----------------------------------------------
-
-Due to the changes in licensing of WURFL, we have removed the WurflApi
-adapter. We will be providing the WurflApi adapter to ScientiaMobile so
-that users of WURFL will still have that option.
-
-Bug Fixes
-=========
-
-In addition,  over 200 reported issues in the tracker have been fixed.
-We’d like to particularly thank Adam Lundrigan, Frank Brückner and
-Martin Hujer for their efforts in making this happen. Thanks also to the
-many people who ran the ZF1 unit tests and reported their results!
-
-For a complete list of closed issues beginning with 1.12.3, visit:
-
- * https://github.com/zendframework/zf1/issues?labels=&milestone=&page=1&state=closed
- * http://framework.zend.com/changelog/
-
-MIGRATION NOTES
-===============
-
-A detailed list of migration notes may be found at:
-
-http://framework.zend.com/manual/en/migration.html
-
-SYSTEM REQUIREMENTS
-===================
-
-Zend Framework requires PHP 5.2.11 or later. Please see our reference
-guide for more detailed system requirements:
-
-http://framework.zend.com/manual/en/requirements.html
-
-INSTALLATION
-============
-
-Please see [INSTALL.md](INSTALL.md).
-
-REPOSITORY HISTORY
-==================
-
-This repository was created based on the release-1.12 branch of a Subversion
-repository, http://framework.zend.com/svn/framework/standard/. It contains a
-subset of the project history, dating from between the 1.5.0 and 1.6.0 releases,
-and only contains the tags for the 1.12 series. If you would like an older
-version, you may access the subversion repository linked above, or download an
-older version from http://framework.zend.com/downloads/archives.
-
-CONTRIBUTING
-============
-
-Please see [README-GIT.md](README-GIT.md) and
-[DEVELOPMENT_README.md](DEVELOPMENT_README.md).
-
-QUESTIONS AND FEEDBACK
-======================
-
-Online documentation can be found at http://framework.zend.com/manual.
-Questions that are not addressed in the manual should be directed to the
-appropriate mailing list:
-
-- http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists
-
-If you find code in this release behaving in an unexpected manner or
-contrary to its documented behavior, please create an issue in the Zend
-Framework issue tracker at:
-
-- https://github.com/zendframework/zf1/issues
-
-If you would like to be notified of new releases, you can subscribe to
-the fw-announce mailing list by sending a blank message to:
-
-- [email protected].
+Contains Zend Framework 1 plus performance improvements and bug fixes.
 
 LICENSE
 =======
 
 The files in this archive are released under the Zend Framework license.
 You can find a copy of this license in [LICENSE.txt](LICENSE.txt).
-
-ACKNOWLEDGEMENTS
-================
-
-The Zend Framework team would like to thank all the contributors to the Zend
-Framework project, our corporate sponsor, and you, the Zend Framework user.
-Please visit us sometime soon at http://framework.zend.com.

composer.json

@@ -1,6 +1,6 @@
 {
-    "name": "zendframework/zendframework1",
-    "description": "Zend Framework 1",
+    "name": "magento/zendframework1",
+    "description": "Magento Zend Framework 1",
     "type": "library",
     "keywords": [
         "framework",

library/Zend/Acl.php

@@ -23,31 +23,31 @@
 /**
  * @see Zend_Acl_Resource_Interface
  */
-require_once 'Zend/Acl/Resource/Interface.php';
+#require_once 'Zend/Acl/Resource/Interface.php';
 
 
 /**
  * @see Zend_Acl_Role_Registry
  */
-require_once 'Zend/Acl/Role/Registry.php';
+#require_once 'Zend/Acl/Role/Registry.php';
 
 
 /**
  * @see Zend_Acl_Assert_Interface
  */
-require_once 'Zend/Acl/Assert/Interface.php';
+#require_once 'Zend/Acl/Assert/Interface.php';
 
 
 /**
  * @see Zend_Acl_Role
  */
-require_once 'Zend/Acl/Role.php';
+#require_once 'Zend/Acl/Role.php';
 
 
 /**
  * @see Zend_Acl_Resource
  */
-require_once 'Zend/Acl/Resource.php';
+#require_once 'Zend/Acl/Resource.php';
 
 
 /**
@@ -152,7 +152,7 @@ public function addRole($role, $parents = null)
         }
 
         if (!$role instanceof Zend_Acl_Role_Interface) {
-            require_once 'Zend/Acl/Exception.php';
+            #require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception('addRole() expects $role to be of type Zend_Acl_Role_Interface');
         }
 
@@ -287,14 +287,14 @@ public function addResource($resource, $parent = null)
         }
 
         if (!$resource instanceof Zend_Acl_Resource_Interface) {
-            require_once 'Zend/Acl/Exception.php';
+            #require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception('addResource() expects $resource to be of type Zend_Acl_Resource_Interface');
         }
 
         $resourceId = $resource->getResourceId();
 
         if ($this->has($resourceId)) {
-            require_once 'Zend/Acl/Exception.php';
+            #require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception("Resource id '$resourceId' already exists in the ACL");
         }
 
@@ -309,7 +309,7 @@ public function addResource($resource, $parent = null)
                 }
                 $resourceParent = $this->get($resourceParentId);
             } catch (Zend_Acl_Exception $e) {
-                require_once 'Zend/Acl/Exception.php';
+                #require_once 'Zend/Acl/Exception.php';
                 throw new Zend_Acl_Exception("Parent Resource id '$resourceParentId' does not exist", 0, $e);
             }
             $this->_resources[$resourceParentId]['children'][$resourceId] = $resource;
@@ -361,7 +361,7 @@ public function get($resource)
         }
 
         if (!$this->has($resource)) {
-            require_once 'Zend/Acl/Exception.php';
+            #require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception("Resource '$resourceId' not found");
         }
 
@@ -408,7 +408,7 @@ public function inherits($resource, $inherit, $onlyParent = false)
             $resourceId     = $this->get($resource)->getResourceId();
             $inheritId = $this->get($inherit)->getResourceId();
         } catch (Zend_Acl_Exception $e) {
-            require_once 'Zend/Acl/Exception.php';
+            #require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e);
         }
 
@@ -447,7 +447,7 @@ public function remove($resource)
         try {
             $resourceId = $this->get($resource)->getResourceId();
         } catch (Zend_Acl_Exception $e) {
-            require_once 'Zend/Acl/Exception.php';
+            #require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e);
         }
 
@@ -609,7 +609,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
         // ensure that the rule type is valid; normalize input to uppercase
         $type = strtoupper($type);
         if (self::TYPE_ALLOW !== $type && self::TYPE_DENY !== $type) {
-            require_once 'Zend/Acl/Exception.php';
+            #require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception("Unsupported rule type; must be either '" . self::TYPE_ALLOW . "' or '"
                                        . self::TYPE_DENY . "'");
         }
@@ -788,7 +788,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
                 break;
 
             default:
-                require_once 'Zend/Acl/Exception.php';
+                #require_once 'Zend/Acl/Exception.php';
                 throw new Zend_Acl_Exception("Unsupported operation; must be either '" . self::OP_ADD . "' or '"
                                            . self::OP_REMOVE . "'");
         }
@@ -966,7 +966,7 @@ protected function _roleDFSVisitAllPrivileges(Zend_Acl_Role_Interface $role, Zen
             /**
              * @see Zend_Acl_Exception
              */
-            require_once 'Zend/Acl/Exception.php';
+            #require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception('$dfs parameter may not be null');
         }
 
@@ -1009,7 +1009,7 @@ protected function _roleDFSOnePrivilege(Zend_Acl_Role_Interface $role, Zend_Acl_
             /**
              * @see Zend_Acl_Exception
              */
-            require_once 'Zend/Acl/Exception.php';
+            #require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception('$privilege parameter may not be null');
         }
 
@@ -1055,15 +1055,15 @@ protected function _roleDFSVisitOnePrivilege(Zend_Acl_Role_Interface $role, Zend
             /**
              * @see Zend_Acl_Exception
              */
-            require_once 'Zend/Acl/Exception.php';
+            #require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception('$privilege parameter may not be null');
         }
 
         if (null === $dfs) {
             /**
              * @see Zend_Acl_Exception
              */
-            require_once 'Zend/Acl/Exception.php';
+            #require_once 'Zend/Acl/Exception.php';
             throw new Zend_Acl_Exception('$dfs parameter may not be null');
         }
 

library/Zend/Acl/Assert/Interface.php

@@ -23,19 +23,19 @@
 /**
  * @see Zend_Acl
  */
-require_once 'Zend/Acl.php';
+#require_once 'Zend/Acl.php';
 
 
 /**
  * @see Zend_Acl_Role_Interface
  */
-require_once 'Zend/Acl/Role/Interface.php';
+#require_once 'Zend/Acl/Role/Interface.php';
 
 
 /**
  * @see Zend_Acl_Resource_Interface
  */
-require_once 'Zend/Acl/Resource/Interface.php';
+#require_once 'Zend/Acl/Resource/Interface.php';
 
 
 /**

library/Zend/Acl/Exception.php

@@ -23,7 +23,7 @@
 /**
  * @see Zend_Exception
  */
-require_once 'Zend/Exception.php';
+#require_once 'Zend/Exception.php';
 
 
 /**

library/Zend/Acl/Resource.php

@@ -23,7 +23,7 @@
 /**
  * @see Zend_Acl_Resource_Interface
  */
-require_once 'Zend/Acl/Resource/Interface.php';
+#require_once 'Zend/Acl/Resource/Interface.php';
 
 
 /**

library/Zend/Acl/Role.php

@@ -23,7 +23,7 @@
 /**
  * @see Zend_Acl_Role_Interface
  */
-require_once 'Zend/Acl/Role/Interface.php';
+#require_once 'Zend/Acl/Role/Interface.php';
 
 
 /**