magento · vpelipenko · Feb 6, 2015 · Sep 16, 2014 · Jul 31, 2014 · Jul 31, 2014
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+/demos          export-ignore
+/tests          export-ignore
+/documentation  export-ignore
diff --git a/.travis.yml b/.travis.yml
@@ -11,17 +11,22 @@ php:
 env: TMPDIR=/tmp
 
 install:
- - sh ./tests/install_dependencies.sh
+ - if [[ "$TRAVIS_PHP_VERSION" == "5.2" ]]; then sh ./tests/php52_install_dependencies.sh; fi
  - phpenv rehash
 
 services:
   - memcached
 
 before_script:
+  - if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]]; then travis_retry composer self-update; fi
+  - if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]]; then travis_retry composer install --no-interaction --prefer-source --dev; fi
+
   - mysql -e 'create database zftest;'
   - psql -c 'create database zftest;' -U postgres
-  - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+
+  - if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-add tests/config.ini; fi
+  - if [[ "$TRAVIS_PHP_VERSION" == "5.2" ]]; then phpenv config-add tests/php52_config.ini; fi
+
   - cp ./tests/TestConfiguration.travis.php ./tests/TestConfiguration.php
 
 script:

diff --git a/DEVELOPMENT_README.md b/DEVELOPMENT_README.md
@@ -1,55 +1,63 @@
-Development using a virtual machine
-###################################
+# Development using a virtual machine
 
 You can set up a development virtual machine for ZF1 unit testing and library 
 development following these simple instructions.
 
-1. Install requirements for VM. (Note: these are not required by ZF1 itself)
-   - VirtualBox (https://www.virtualbox.org/)
-   - Ruby (http://www.ruby-lang.org/)
-   - Vagrant (http://vagrantup.com/)
+### 1. Install requirements for VM. (Note: these are not required by ZF1 itself)
 
-2. Checkout repository to any location
-   > git clone git://github.com:zendframework/zf1.git zf1-dev
-   > cd zf1-dev
-
-3. Start the process by running Vagrant.
-   > vagrant up
+- VirtualBox (https://www.virtualbox.org/)
+- Ruby (http://www.ruby-lang.org/)
+- Vagrant (http://vagrantup.com/)
+
+### 2. Checkout repository to any location
+
+    git clone git://github.com/zendframework/zf1.git zf1-dev
+    cd zf1-dev
+
+### 3. Start the process by running Vagrant.
+
+    vagrant up
+
+This will take a long while as it has to download a VM image and then 
+provision it. Once it has finished, it will exit and leave you back at the
+command prompt.
 
-   This will take a long while as it has to download a VM image and then 
-   provision it. Once it has finished, it will exit and leave you back at the
-   command prompt.
+### 4. SSH into the VM
 
-4. SSH into the VM
-   > vagrant ssh
+    vagrant ssh
 
-5. Build a version of PHP.
-   > php-build.sh 5.3.11
+### 5. Build a version of PHP.
 
-   This also takes a while as it compiles PHP for you!
+    php-build.sh 5.3.11
+
+This also takes a while as it compiles PHP for you!
 
-6. Select PHP to use:
-   > pe 5.3.11
+### 6. Select PHP to use:
+
+    pe 5.3.11
+
+### 7. Run tests
 
-7. Run tests
-   > cd /vagrant/tests
-   > phpunit --stderr -d memory_limit=-1 Zend/Acl/AclTest.php
-   > phpunit --stderr -d memory_limit=-1 Zend/Amf/AllTests.php
-   (etc...)
+    cd /vagrant/tests
+    phpunit --stderr -d memory_limit=-1 Zend/Acl/AclTest.php
+    phpunit --stderr -d memory_limit=-1 Zend/Amf/AllTests.php
+    (etc...)
 
 Note that you can repeat items 5 and 6 to create any version if PHP.
 
-   
-Notes:
+## Notes:
+
 - The VM will be running in the background as VBoxHeadless
 - HTTP and SSH ports on the VM are forwarded to localhost (22 -> 2222, 80 -> 8081)
 - The zf1-dev directory you checked out will be mounted inside the VM at /vagrant
 - You can develop by editing the files you cloned in the IDE of you choice.
-- To stop the VM do one of the following:
-  > vagrant suspend   # if you plan on running it later
-  > vagrant halt      # if you wish to turn off the VM, but keep it around
-  > vagrant destroy   # if you wish to delete the VM completely
-- Also, when any of of the Puppet manifests change (.pp files), it is a good idea to rerun them:
-  > vagrant provision
 
+To stop the VM do one of the following:
+
+    vagrant suspend   # if you plan on running it later
+    vagrant halt      # if you wish to turn off the VM, but keep it around
+    vagrant destroy   # if you wish to delete the VM completely
+
+Also, when any of of the Puppet manifests change (.pp files), it is a good idea to rerun them:
 
+    vagrant provision
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2014, Zend Technologies USA, Inc.
+Copyright (c) 2005-2015, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 INFORMATION
 ===================
 
-This is a fork from Zend Framework 1.12.9 Release.
+This is a fork from Zend Framework 1.12.10 Release.
 
 PURPOSE
 ---------------------------

diff --git a/bin/classmap_generator.php b/bin/classmap_generator.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Loader
  * @subpackage Exception
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/bin/zf.bat b/bin/zf.bat
@@ -12,7 +12,7 @@ REM obtain it through the world-wide-web, please send an email
 REM to license@zend.com so we can send you a copy immediately.
 REM
 REM Zend
-REM Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+REM Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 REM http://framework.zend.com/license/new-bsd     New BSD License
 
 

diff --git a/bin/zf.php b/bin/zf.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Tool
  * @subpackage Framework
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -26,7 +26,7 @@
  * @category   Zend
  * @package    Zend_Tool
  * @subpackage Framework
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ZF

diff --git a/bin/zf.sh b/bin/zf.sh
@@ -14,7 +14,7 @@
 # to license@zend.com so we can send you a copy immediately.
 #
 # Zend
-# Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+# Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 # http://framework.zend.com/license/new-bsd     New BSD License
 #############################################################################
 

diff --git a/demos/Zend/Cloud/cloudexp/application/Bootstrap.php b/demos/Zend/Cloud/cloudexp/application/Bootstrap.php
@@ -15,15 +15,15 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Bootstrap extends Zend_Application_Bootstrap_Bootstrap

diff --git a/demos/Zend/Cloud/cloudexp/application/controllers/DocumentController.php b/demos/Zend/Cloud/cloudexp/application/controllers/DocumentController.php
@@ -15,15 +15,15 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class DocumentController extends Zend_Controller_Action

diff --git a/demos/Zend/Cloud/cloudexp/application/controllers/ErrorController.php b/demos/Zend/Cloud/cloudexp/application/controllers/ErrorController.php
@@ -15,15 +15,15 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ErrorController extends Zend_Controller_Action

diff --git a/demos/Zend/Cloud/cloudexp/application/controllers/IndexController.php b/demos/Zend/Cloud/cloudexp/application/controllers/IndexController.php
@@ -15,15 +15,15 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class IndexController extends Zend_Controller_Action

diff --git a/demos/Zend/Cloud/cloudexp/application/controllers/QueueController.php b/demos/Zend/Cloud/cloudexp/application/controllers/QueueController.php
@@ -15,15 +15,15 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class QueueController extends Zend_Controller_Action

diff --git a/demos/Zend/Cloud/cloudexp/application/controllers/StorageController.php b/demos/Zend/Cloud/cloudexp/application/controllers/StorageController.php
@@ -15,15 +15,15 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class StorageController extends Zend_Controller_Action

diff --git a/demos/Zend/Cloud/cloudexp/library/CloudExplorer/ResourceInjector.php b/demos/Zend/Cloud/cloudexp/library/CloudExplorer/ResourceInjector.php
@@ -15,15 +15,15 @@
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
 /**
  * @category   Zend
  * @package    Zend_Cloud
  * @subpackage examples
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class CloudExplorer_ResourceInjector extends Zend_Controller_Action_Helper_Abstract

diff --git a/demos/Zend/Feeds/consume-feed.php b/demos/Zend/Feeds/consume-feed.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Feed
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/demos/Zend/Gdata/3LeggedOAuth/Gdata_OAuth_Helper.php b/demos/Zend/Gdata/3LeggedOAuth/Gdata_OAuth_Helper.php
@@ -10,7 +10,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/demos/Zend/Gdata/3LeggedOAuth/index.php b/demos/Zend/Gdata/3LeggedOAuth/index.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/demos/Zend/Gdata/Blogger.php b/demos/Zend/Gdata/Blogger.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -58,7 +58,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class SimpleCRUD

diff --git a/demos/Zend/Gdata/BooksBrowser/index.php b/demos/Zend/Gdata/BooksBrowser/index.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/demos/Zend/Gdata/BooksBrowser/interface.html b/demos/Zend/Gdata/BooksBrowser/interface.html
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  *
  */

diff --git a/demos/Zend/Gdata/Calendar.php b/demos/Zend/Gdata/Calendar.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/demos/Zend/Gdata/Docs.php b/demos/Zend/Gdata/Docs.php
@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Gdata
  * @subpackage Demos
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */