diff --git a/library/TorrentPier/.keep b/library/TorrentPier/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/library/Zend/Authentication/Adapter/AbstractAdapter.php b/library/Zend/Authentication/Adapter/AbstractAdapter.php
old mode 100755
new mode 100644
index 2f394f9e9..5ca7457af
--- a/library/Zend/Authentication/Adapter/AbstractAdapter.php
+++ b/library/Zend/Authentication/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/AdapterInterface.php b/library/Zend/Authentication/Adapter/AdapterInterface.php
old mode 100755
new mode 100644
index d23d07936..a741dd610
--- a/library/Zend/Authentication/Adapter/AdapterInterface.php
+++ b/library/Zend/Authentication/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/DbTable.php b/library/Zend/Authentication/Adapter/DbTable.php
old mode 100755
new mode 100644
index 917fa3fd4..0edfbf2b2
--- a/library/Zend/Authentication/Adapter/DbTable.php
+++ b/library/Zend/Authentication/Adapter/DbTable.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php b/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php
old mode 100755
new mode 100644
index 612c0fecb..11a07ef9b
--- a/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php
+++ b/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php b/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php
old mode 100755
new mode 100644
index d585e353e..48b9ebd7b
--- a/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php
+++ b/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php b/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php
old mode 100755
new mode 100644
index b31cc5f74..a3da99722
--- a/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php
+++ b/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php b/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 5365808fc..913784aea
--- a/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php
+++ b/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php b/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index dfda938ec..bcba56444
--- a/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php
+++ b/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php b/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php
old mode 100755
new mode 100644
index bf4cc273b..54e902416
--- a/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php
+++ b/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Digest.php b/library/Zend/Authentication/Adapter/Digest.php
old mode 100755
new mode 100644
index 0ddb901e8..a1a0414e5
--- a/library/Zend/Authentication/Adapter/Digest.php
+++ b/library/Zend/Authentication/Adapter/Digest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php b/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 4c9b9d4be..e64b410c8
--- a/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Exception/InvalidArgumentException.php b/library/Zend/Authentication/Adapter/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 6c315aed7..2d0452d43
--- a/library/Zend/Authentication/Adapter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Authentication/Adapter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Exception/RuntimeException.php b/library/Zend/Authentication/Adapter/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 79109367a..8cf08495c
--- a/library/Zend/Authentication/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/Authentication/Adapter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php b/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index 962403dab..1f2a5227d
--- a/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php
+++ b/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Http.php b/library/Zend/Authentication/Adapter/Http.php
old mode 100755
new mode 100644
index bc1451976..7f8517fe7
--- a/library/Zend/Authentication/Adapter/Http.php
+++ b/library/Zend/Authentication/Adapter/Http.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Http/ApacheResolver.php b/library/Zend/Authentication/Adapter/Http/ApacheResolver.php
old mode 100755
new mode 100644
index a7b8b3d6d..cd916e7d5
--- a/library/Zend/Authentication/Adapter/Http/ApacheResolver.php
+++ b/library/Zend/Authentication/Adapter/Http/ApacheResolver.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php b/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 4ec6a3f7c..cd849a07d
--- a/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php
+++ b/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php b/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 5e8fe751f..80bad62b3
--- a/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php
+++ b/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php b/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 94a9f9e14..f3ced1dd9
--- a/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php
+++ b/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Http/FileResolver.php b/library/Zend/Authentication/Adapter/Http/FileResolver.php
old mode 100755
new mode 100644
index 947027ab1..bdcfb99b3
--- a/library/Zend/Authentication/Adapter/Http/FileResolver.php
+++ b/library/Zend/Authentication/Adapter/Http/FileResolver.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Http/ResolverInterface.php b/library/Zend/Authentication/Adapter/Http/ResolverInterface.php
old mode 100755
new mode 100644
index b236f8458..f36c1941e
--- a/library/Zend/Authentication/Adapter/Http/ResolverInterface.php
+++ b/library/Zend/Authentication/Adapter/Http/ResolverInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/Ldap.php b/library/Zend/Authentication/Adapter/Ldap.php
old mode 100755
new mode 100644
index d9384c59b..a4c8e3315
--- a/library/Zend/Authentication/Adapter/Ldap.php
+++ b/library/Zend/Authentication/Adapter/Ldap.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Adapter/ValidatableAdapterInterface.php b/library/Zend/Authentication/Adapter/ValidatableAdapterInterface.php
old mode 100755
new mode 100644
index 3c4f01b2c..9c711d2e8
--- a/library/Zend/Authentication/Adapter/ValidatableAdapterInterface.php
+++ b/library/Zend/Authentication/Adapter/ValidatableAdapterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/AuthenticationService.php b/library/Zend/Authentication/AuthenticationService.php
old mode 100755
new mode 100644
index 76a26d3ad..d95fc366d
--- a/library/Zend/Authentication/AuthenticationService.php
+++ b/library/Zend/Authentication/AuthenticationService.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/AuthenticationServiceInterface.php b/library/Zend/Authentication/AuthenticationServiceInterface.php
old mode 100755
new mode 100644
index fcf74ea17..d3e347b6f
--- a/library/Zend/Authentication/AuthenticationServiceInterface.php
+++ b/library/Zend/Authentication/AuthenticationServiceInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/CONTRIBUTING.md b/library/Zend/Authentication/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Authentication/Exception/ExceptionInterface.php b/library/Zend/Authentication/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index ed122ba78..87b39c4d4
--- a/library/Zend/Authentication/Exception/ExceptionInterface.php
+++ b/library/Zend/Authentication/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Exception/InvalidArgumentException.php b/library/Zend/Authentication/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 851fb73c0..e837be449
--- a/library/Zend/Authentication/Exception/InvalidArgumentException.php
+++ b/library/Zend/Authentication/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Exception/RuntimeException.php b/library/Zend/Authentication/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 78bc67308..cf8fc4b86
--- a/library/Zend/Authentication/Exception/RuntimeException.php
+++ b/library/Zend/Authentication/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Exception/UnexpectedValueException.php b/library/Zend/Authentication/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index e12692908..0b04b8e96
--- a/library/Zend/Authentication/Exception/UnexpectedValueException.php
+++ b/library/Zend/Authentication/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/README.md b/library/Zend/Authentication/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Authentication/Result.php b/library/Zend/Authentication/Result.php
old mode 100755
new mode 100644
index 00f23f6cc..68cb49f58
--- a/library/Zend/Authentication/Result.php
+++ b/library/Zend/Authentication/Result.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Storage/Chain.php b/library/Zend/Authentication/Storage/Chain.php
old mode 100755
new mode 100644
index 8d995a2c0..f32916e38
--- a/library/Zend/Authentication/Storage/Chain.php
+++ b/library/Zend/Authentication/Storage/Chain.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Storage/NonPersistent.php b/library/Zend/Authentication/Storage/NonPersistent.php
old mode 100755
new mode 100644
index 8d1204939..13aa78681
--- a/library/Zend/Authentication/Storage/NonPersistent.php
+++ b/library/Zend/Authentication/Storage/NonPersistent.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Storage/Session.php b/library/Zend/Authentication/Storage/Session.php
old mode 100755
new mode 100644
index 6c66bec8f..a91d8f22c
--- a/library/Zend/Authentication/Storage/Session.php
+++ b/library/Zend/Authentication/Storage/Session.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Storage/StorageInterface.php b/library/Zend/Authentication/Storage/StorageInterface.php
old mode 100755
new mode 100644
index 4a9d41b9e..f97520861
--- a/library/Zend/Authentication/Storage/StorageInterface.php
+++ b/library/Zend/Authentication/Storage/StorageInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/Validator/Authentication.php b/library/Zend/Authentication/Validator/Authentication.php
old mode 100755
new mode 100644
index d8bb0a84d..5c834e5df
--- a/library/Zend/Authentication/Validator/Authentication.php
+++ b/library/Zend/Authentication/Validator/Authentication.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link       http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Authentication/composer.json b/library/Zend/Authentication/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Barcode/Barcode.php b/library/Zend/Barcode/Barcode.php
old mode 100755
new mode 100644
index b2176b478..ecd7df6eb
--- a/library/Zend/Barcode/Barcode.php
+++ b/library/Zend/Barcode/Barcode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -146,7 +146,7 @@ abstract class Barcode
      * @param mixed $barcode        String name of barcode class, or Traversable object, or barcode object.
      * @param mixed $barcodeConfig  OPTIONAL; an array or Traversable object with barcode parameters.
      * @throws Exception\InvalidArgumentException
-     * @return Object
+     * @return Object\ObjectInterface
      */
     public static function makeBarcode($barcode, $barcodeConfig = array())
     {
diff --git a/library/Zend/Barcode/CONTRIBUTING.md b/library/Zend/Barcode/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Barcode/Exception/ExceptionInterface.php b/library/Zend/Barcode/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index f421ceb94..4325f0f1b
--- a/library/Zend/Barcode/Exception/ExceptionInterface.php
+++ b/library/Zend/Barcode/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Exception/InvalidArgumentException.php b/library/Zend/Barcode/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 5f66af8eb..1b2639140
--- a/library/Zend/Barcode/Exception/InvalidArgumentException.php
+++ b/library/Zend/Barcode/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Exception/OutOfRangeException.php b/library/Zend/Barcode/Exception/OutOfRangeException.php
old mode 100755
new mode 100644
index 0227ed6c9..4a78781df
--- a/library/Zend/Barcode/Exception/OutOfRangeException.php
+++ b/library/Zend/Barcode/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Exception/RendererCreationException.php b/library/Zend/Barcode/Exception/RendererCreationException.php
old mode 100755
new mode 100644
index d66442e93..b9d06e7df
--- a/library/Zend/Barcode/Exception/RendererCreationException.php
+++ b/library/Zend/Barcode/Exception/RendererCreationException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Exception/RuntimeException.php b/library/Zend/Barcode/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 36ac0148f..f09d1aa4e
--- a/library/Zend/Barcode/Exception/RuntimeException.php
+++ b/library/Zend/Barcode/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Exception/UnexpectedValueException.php b/library/Zend/Barcode/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index c5ecd3521..32b8523f3
--- a/library/Zend/Barcode/Exception/UnexpectedValueException.php
+++ b/library/Zend/Barcode/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/AbstractObject.php b/library/Zend/Barcode/Object/AbstractObject.php
old mode 100755
new mode 100644
index 7fac057c6..a74c1dc77
--- a/library/Zend/Barcode/Object/AbstractObject.php
+++ b/library/Zend/Barcode/Object/AbstractObject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -21,48 +21,56 @@ abstract class AbstractObject implements ObjectInterface
 {
     /**
      * Namespace of the barcode for autoloading
+     *
      * @var string
      */
     protected $barcodeNamespace = 'Zend\Barcode\Object';
 
     /**
      * Set of drawing instructions
+     *
      * @var array
      */
     protected $instructions = array();
 
     /**
      * Barcode type
+     *
      * @var string
      */
     protected $type = null;
 
     /**
      * Height of the object
+     *
      * @var int
      */
     protected $height = null;
 
     /**
      * Width of the object
+     *
      * @var int
      */
     protected $width = null;
 
     /**
      * Height of the bar
+     *
      * @var int
      */
     protected $barHeight = 50;
 
     /**
      * Width of a thin bar
+     *
      * @var int
      */
     protected $barThinWidth = 1;
 
     /**
      * Width of a thick bar
+     *
      * @var int
      */
     protected $barThickWidth = 3;
@@ -70,42 +78,49 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Factor to multiply bar and font measure
      * (barHeight, barThinWidth, barThickWidth & fontSize)
+     *
      * @var int
      */
     protected $factor = 1;
 
     /**
      * Font and bars color of the object
+     *
      * @var int
      */
     protected $foreColor = 0x000000;
 
     /**
      * Background color of the object
+     *
      * @var int
      */
     protected $backgroundColor = 0xFFFFFF;
 
     /**
      * Activate/deactivate border of the object
+     *
      * @var bool
      */
     protected $withBorder = false;
 
     /**
      * Activate/deactivate drawing of quiet zones
+     *
      * @var bool
      */
     protected $withQuietZones = true;
 
     /**
      * Force quiet zones even if
+     *
      * @var bool
      */
     protected $mandatoryQuietZones = false;
 
     /**
      * Orientation of the barcode in degrees
+     *
      * @var float
      */
     protected $orientation = 0;
@@ -113,6 +128,7 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Offset from the top the object
      * (calculated from the orientation)
+     *
      * @var int
      */
     protected $offsetTop = null;
@@ -120,24 +136,28 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Offset from the left the object
      * (calculated from the orientation)
+     *
      * @var int
      */
     protected $offsetLeft = null;
 
     /**
      * Text to display
+     *
      * @var string
      */
     protected $text = null;
 
     /**
      * Display (or not) human readable text
+     *
      * @var bool
      */
     protected $drawText = true;
 
     /**
      * Adjust (or not) position of human readable characters with barcode
+     *
      * @var bool
      */
     protected $stretchText = false;
@@ -146,30 +166,35 @@ abstract class AbstractObject implements ObjectInterface
      * Font resource
      *  - integer (1 to 5): corresponds to GD included fonts
      *  - string: corresponds to path of a TTF font
+     *
      * @var int|string
      */
     protected $font = null;
 
     /**
      * Font size
+     *
      * @var float
      */
     protected $fontSize = 10;
 
     /**
      * Drawing of checksum
+     *
      * @var bool
      */
     protected $withChecksum = false;
 
     /**
      * Drawing of checksum inside text
+     *
      * @var bool
      */
     protected $withChecksumInText = false;
 
     /**
      * Fix barcode length (numeric or string like 'even')
+     *
      * @var int | string
      */
     protected $barcodeLength = null;
@@ -177,6 +202,7 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Activate automatic addition of leading zeros
      * if barcode length is fixed
+     *
      * @var bool
      */
     protected $addLeadingZeros = true;
@@ -184,18 +210,21 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Activation of mandatory checksum
      * to deactivate unauthorized modification
+     *
      * @var bool
      */
     protected $mandatoryChecksum = false;
 
     /**
      * Character used to substitute checksum character for validation
+     *
      * @var mixed
      */
     protected $substituteChecksumCharacter = 0;
 
     /**
      * Constructor
+     *
      * @param array|Traversable $options
      */
     public function __construct($options = null)
@@ -217,7 +246,6 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Set default options for particular object
-     * @return void
      */
     protected function getDefaultOptions()
     {
@@ -225,6 +253,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Set barcode state from options array
+     *
      * @param  array $options
      * @return \Zend\Barcode\Object\ObjectInterface
      */
@@ -263,6 +292,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve type of barcode
+     *
      * @return string
      */
     public function getType()
@@ -272,6 +302,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Set height of the barcode bar
+     *
      * @param int $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -289,6 +320,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Get height of the barcode bar
+     *
      * @return int
      */
     public function getBarHeight()
@@ -298,6 +330,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Set thickness of thin bar
+     *
      * @param int $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -315,6 +348,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Get thickness of thin bar
+     *
      * @return int
      */
     public function getBarThinWidth()
@@ -324,6 +358,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Set thickness of thick bar
+     *
      * @param int $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -341,6 +376,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Get thickness of thick bar
+     *
      * @return int
      */
     public function getBarThickWidth()
@@ -351,7 +387,8 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Set factor applying to
      * thinBarWidth - thickBarWidth - barHeight - fontSize
-     * @param float $value
+     *
+     * @param int|float|string|bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
      */
@@ -369,6 +406,7 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Get factor applying to
      * thinBarWidth - thickBarWidth - barHeight - fontSize
+     *
      * @return int
      */
     public function getFactor()
@@ -378,6 +416,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Set color of the barcode and text
+     *
      * @param string $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -398,6 +437,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve color of the barcode and text
+     *
      * @return int
      */
     public function getForeColor()
@@ -407,6 +447,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Set the color of the background
+     *
      * @param int $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -427,6 +468,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve background color of the image
+     *
      * @return int
      */
     public function getBackgroundColor()
@@ -436,6 +478,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Activate/deactivate drawing of the bar
+     *
      * @param  bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      */
@@ -447,6 +490,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve if border are draw or not
+     *
      * @return bool
      */
     public function getWithBorder()
@@ -456,6 +500,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Activate/deactivate drawing of the quiet zones
+     *
      * @param  bool $value
      * @return AbstractObject
      */
@@ -467,6 +512,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve if quiet zones are draw or not
+     *
      * @return bool
      */
     public function getWithQuietZones()
@@ -476,6 +522,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Allow fast inversion of font/bars color and background color
+     *
      * @return \Zend\Barcode\Object\ObjectInterface
      */
     public function setReverseColor()
@@ -488,7 +535,8 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Set orientation of barcode and text
-     * @param float $value
+     *
+     * @param int|float|string|bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
      */
@@ -500,6 +548,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve orientation of barcode and text
+     *
      * @return float
      */
     public function getOrientation()
@@ -509,6 +558,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Set text to encode
+     *
      * @param string $value
      * @return \Zend\Barcode\Object\ObjectInterface
      */
@@ -520,6 +570,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve text to encode
+     *
      * @return string
      */
     public function getText()
@@ -533,8 +584,9 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Automatically add leading zeros if barcode length is fixed
-     * @param string $text
-     * @param  bool $withoutChecksum
+     *
+     * @param  string $text
+     * @param  bool   $withoutChecksum
      * @return string
      */
     protected function addLeadingZeros($text, $withoutChecksum = false)
@@ -557,6 +609,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve text to encode
+     *
      * @return string
      */
     public function getRawText()
@@ -566,6 +619,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve text to display
+     *
      * @return string
      */
     public function getTextToDisplay()
@@ -579,6 +633,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Activate/deactivate drawing of text to encode
+     *
      * @param  bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      */
@@ -590,6 +645,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve if drawing of text to encode is enabled
+     *
      * @return bool
      */
     public function getDrawText()
@@ -600,6 +656,7 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Activate/deactivate the adjustment of the position
      * of the characters to the position of the bars
+     *
      * @param  bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -613,6 +670,7 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Retrieve if the adjustment of the position of the characters
      * to the position of the bars is enabled
+     *
      * @return bool
      */
     public function getStretchText()
@@ -624,6 +682,7 @@ abstract class AbstractObject implements ObjectInterface
      * Activate/deactivate the automatic generation
      * of the checksum character
      * added to the barcode text
+     *
      * @param  bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      */
@@ -638,6 +697,7 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Retrieve if the checksum character is automatically
      * added to the barcode text
+     *
      * @return bool
      */
     public function getWithChecksum()
@@ -649,6 +709,7 @@ abstract class AbstractObject implements ObjectInterface
      * Activate/deactivate the automatic generation
      * of the checksum character
      * added to the barcode text
+     *
      * @param  bool $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -664,6 +725,7 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Retrieve if the checksum character is automatically
      * added to the barcode text
+     *
      * @return bool
      */
     public function getWithChecksumInText()
@@ -675,6 +737,7 @@ abstract class AbstractObject implements ObjectInterface
      * Set the font:
      *  - if integer between 1 and 5, use gd built-in fonts
      *  - if string, $value is assumed to be the path to a TTF font
+     *
      * @param int|string $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -706,6 +769,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve the font
+     *
      * @return int|string
      */
     public function getFont()
@@ -715,6 +779,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Set the size of the font in case of TTF
+     *
      * @param float $value
      * @return \Zend\Barcode\Object\ObjectInterface
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -748,6 +813,7 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Quiet zone before first bar
      * and after the last bar
+     *
      * @return int
      */
     public function getQuietZone()
@@ -761,6 +827,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Add an instruction in the array of instructions
+     *
      * @param array $instruction
      */
     protected function addInstruction(array $instruction)
@@ -770,6 +837,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Retrieve the set of drawing instructions
+     *
      * @return array
      */
     public function getInstructions()
@@ -779,9 +847,10 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Add a polygon drawing instruction in the set of instructions
+     *
      * @param array $points
-     * @param int $color
-     * @param  bool $filled
+     * @param int   $color
+     * @param bool  $filled
      */
     protected function addPolygon(array $points, $color = null, $filled = true)
     {
@@ -798,13 +867,14 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Add a text drawing instruction in the set of instructions
+     *
      * @param string $text
-     * @param float $size
-     * @param int[] $position
+     * @param float  $size
+     * @param int[]  $position
      * @param string $font
-     * @param int $color
+     * @param int    $color
      * @param string $alignment
-     * @param float $orientation
+     * @param float  $orientation
      */
     protected function addText(
         $text,
@@ -832,6 +902,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Checking of parameters after all settings
+     *
      * @return bool
      */
     public function checkParams()
@@ -844,8 +915,8 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Check if a text is really provided to barcode
+     *
      * @param string|null $value
-     * @return void
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
      */
     protected function checkText($value = null)
@@ -863,9 +934,9 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Check the ratio between the thick and the thin bar
+     *
      * @param int $min
      * @param int $max
-     * @return void
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
      */
     protected function checkRatio($min = 2, $max = 3)
@@ -883,7 +954,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Drawing with an angle is just allow TTF font
-     * @return void
+     *
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
      */
     protected function checkFontAndOrientation()
@@ -898,6 +969,7 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Width of the result image
      * (before any rotation)
+     *
      * @return int
      */
     protected function calculateWidth()
@@ -909,12 +981,14 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Calculate the width of the barcode
+     *
      * @return int
      */
     abstract protected function calculateBarcodeWidth();
 
     /**
      * Height of the result object
+     *
      * @return int
      */
     protected function calculateHeight()
@@ -926,6 +1000,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Height of the barcode
+     *
      * @return int
      */
     protected function calculateBarcodeHeight()
@@ -941,6 +1016,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Get height of the result object
+     *
      * @param bool $recalculate
      * @return int
      */
@@ -956,6 +1032,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Get width of the result object
+     *
      * @param bool $recalculate
      * @return int
      */
@@ -972,6 +1049,7 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Calculate the offset from the left of the object
      * if an orientation is activated
+     *
      * @param  bool $recalculate
      * @return float
      */
@@ -993,6 +1071,7 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Calculate the offset from the top of the object
      * if an orientation is activated
+     *
      * @param  bool $recalculate
      * @return float
      */
@@ -1013,9 +1092,10 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Apply rotation on a point in X/Y dimensions
-     * @param float $x1     x-position before rotation
-     * @param float $y1     y-position before rotation
-     * @return int[]    Array of two elements corresponding to the new XY point
+     *
+     * @param  float $x1 x-position before rotation
+     * @param  float $y1 y-position before rotation
+     * @return array Array of two elements corresponding to the new XY point
      */
     protected function rotate($x1, $y1)
     {
@@ -1030,6 +1110,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Complete drawing of the barcode
+     *
      * @return array Table of instructions
      */
     public function draw()
@@ -1043,7 +1124,6 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Draw the barcode
-     * @return void
      */
     protected function drawBarcode()
     {
@@ -1100,7 +1180,6 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Partial function to draw border
-     * @return void
      */
     protected function drawBorder()
     {
@@ -1124,7 +1203,6 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Partial function to draw text
-     * @return void
      */
     protected function drawText()
     {
@@ -1167,8 +1245,8 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Check for invalid characters
-     * @param   string $value    Text to be checked
-     * @return void
+     *
+     * @param string $value Text to be checked
      */
     public function validateText($value)
     {
@@ -1177,6 +1255,7 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Standard validation for most of barcode objects
+     *
      * @param string $value
      * @param array  $options
      */
@@ -1222,15 +1301,11 @@ abstract class AbstractObject implements ObjectInterface
 
     /**
      * Checking of parameters after all settings
-     *
-     * @return void
      */
     abstract protected function checkSpecificParams();
 
     /**
      * Allow each child to draw something else
-     *
-     * @return void
      */
     protected function preDrawBarcode()
     {
@@ -1239,8 +1314,6 @@ abstract class AbstractObject implements ObjectInterface
     /**
      * Allow each child to draw something else
      * (ex: bearer bars in interleaved 2 of 5 code)
-     *
-     * @return void
      */
     protected function postDrawBarcode()
     {
diff --git a/library/Zend/Barcode/Object/Codabar.php b/library/Zend/Barcode/Object/Codabar.php
old mode 100755
new mode 100644
index 71120c601..e97667883
--- a/library/Zend/Barcode/Object/Codabar.php
+++ b/library/Zend/Barcode/Object/Codabar.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Code128.php b/library/Zend/Barcode/Object/Code128.php
old mode 100755
new mode 100644
index 3bb0cc0c7..c4e8916f8
--- a/library/Zend/Barcode/Object/Code128.php
+++ b/library/Zend/Barcode/Object/Code128.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Code25.php b/library/Zend/Barcode/Object/Code25.php
old mode 100755
new mode 100644
index 2f32ca7af..8d0af026e
--- a/library/Zend/Barcode/Object/Code25.php
+++ b/library/Zend/Barcode/Object/Code25.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Code25interleaved.php b/library/Zend/Barcode/Object/Code25interleaved.php
old mode 100755
new mode 100644
index 0fb3ec33a..766a8433e
--- a/library/Zend/Barcode/Object/Code25interleaved.php
+++ b/library/Zend/Barcode/Object/Code25interleaved.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Code39.php b/library/Zend/Barcode/Object/Code39.php
old mode 100755
new mode 100644
index c70e289eb..54b855349
--- a/library/Zend/Barcode/Object/Code39.php
+++ b/library/Zend/Barcode/Object/Code39.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Ean13.php b/library/Zend/Barcode/Object/Ean13.php
old mode 100755
new mode 100644
index 602668d97..25bcc892c
--- a/library/Zend/Barcode/Object/Ean13.php
+++ b/library/Zend/Barcode/Object/Ean13.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Ean2.php b/library/Zend/Barcode/Object/Ean2.php
old mode 100755
new mode 100644
index b260a62d6..94db63f44
--- a/library/Zend/Barcode/Object/Ean2.php
+++ b/library/Zend/Barcode/Object/Ean2.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Ean5.php b/library/Zend/Barcode/Object/Ean5.php
old mode 100755
new mode 100644
index c04708bdc..7ec26c046
--- a/library/Zend/Barcode/Object/Ean5.php
+++ b/library/Zend/Barcode/Object/Ean5.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Ean8.php b/library/Zend/Barcode/Object/Ean8.php
old mode 100755
new mode 100644
index b36ec3e4c..d3d7c9fe1
--- a/library/Zend/Barcode/Object/Ean8.php
+++ b/library/Zend/Barcode/Object/Ean8.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Error.php b/library/Zend/Barcode/Object/Error.php
old mode 100755
new mode 100644
index 15c36bcab..2f5ddefde
--- a/library/Zend/Barcode/Object/Error.php
+++ b/library/Zend/Barcode/Object/Error.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php b/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
old mode 100755
new mode 100644
index 64f3ea56e..d0071d16d
--- a/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
+++ b/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Exception/ExceptionInterface.php b/library/Zend/Barcode/Object/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index d0488d799..872608221
--- a/library/Zend/Barcode/Object/Exception/ExceptionInterface.php
+++ b/library/Zend/Barcode/Object/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php b/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
old mode 100755
new mode 100644
index 340b724ea..a219a49f2
--- a/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php b/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index be38887c7..e5f31ddc9
--- a/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
+++ b/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Exception/OutOfRangeException.php b/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
old mode 100755
new mode 100644
index f56edfedf..95f952c7c
--- a/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
+++ b/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Exception/RuntimeException.php b/library/Zend/Barcode/Object/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 735c7d56c..2909f082e
--- a/library/Zend/Barcode/Object/Exception/RuntimeException.php
+++ b/library/Zend/Barcode/Object/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Identcode.php b/library/Zend/Barcode/Object/Identcode.php
old mode 100755
new mode 100644
index b05053823..f85123025
--- a/library/Zend/Barcode/Object/Identcode.php
+++ b/library/Zend/Barcode/Object/Identcode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Itf14.php b/library/Zend/Barcode/Object/Itf14.php
old mode 100755
new mode 100644
index 361f9bd56..226f17a9a
--- a/library/Zend/Barcode/Object/Itf14.php
+++ b/library/Zend/Barcode/Object/Itf14.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Leitcode.php b/library/Zend/Barcode/Object/Leitcode.php
old mode 100755
new mode 100644
index f82f3a5c0..06f6d202b
--- a/library/Zend/Barcode/Object/Leitcode.php
+++ b/library/Zend/Barcode/Object/Leitcode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/ObjectInterface.php b/library/Zend/Barcode/Object/ObjectInterface.php
old mode 100755
new mode 100644
index 836e0138e..c1844c1e1
--- a/library/Zend/Barcode/Object/ObjectInterface.php
+++ b/library/Zend/Barcode/Object/ObjectInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Planet.php b/library/Zend/Barcode/Object/Planet.php
old mode 100755
new mode 100644
index e06e6109d..7da86f16e
--- a/library/Zend/Barcode/Object/Planet.php
+++ b/library/Zend/Barcode/Object/Planet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Postnet.php b/library/Zend/Barcode/Object/Postnet.php
old mode 100755
new mode 100644
index 07b1d3c2d..fc55fb7a0
--- a/library/Zend/Barcode/Object/Postnet.php
+++ b/library/Zend/Barcode/Object/Postnet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Royalmail.php b/library/Zend/Barcode/Object/Royalmail.php
old mode 100755
new mode 100644
index 23d8a709a..7828dad92
--- a/library/Zend/Barcode/Object/Royalmail.php
+++ b/library/Zend/Barcode/Object/Royalmail.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Upca.php b/library/Zend/Barcode/Object/Upca.php
old mode 100755
new mode 100644
index 1add66c78..6b9e50e80
--- a/library/Zend/Barcode/Object/Upca.php
+++ b/library/Zend/Barcode/Object/Upca.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Object/Upce.php b/library/Zend/Barcode/Object/Upce.php
old mode 100755
new mode 100644
index 2114b11e3..696fc7f2b
--- a/library/Zend/Barcode/Object/Upce.php
+++ b/library/Zend/Barcode/Object/Upce.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/ObjectPluginManager.php b/library/Zend/Barcode/ObjectPluginManager.php
old mode 100755
new mode 100644
index 40345f83b..80af078b7
--- a/library/Zend/Barcode/ObjectPluginManager.php
+++ b/library/Zend/Barcode/ObjectPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/README.md b/library/Zend/Barcode/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Barcode/Renderer/AbstractRenderer.php b/library/Zend/Barcode/Renderer/AbstractRenderer.php
old mode 100755
new mode 100644
index 8a625e853..3dfc1a85e
--- a/library/Zend/Barcode/Renderer/AbstractRenderer.php
+++ b/library/Zend/Barcode/Renderer/AbstractRenderer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php b/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index f7f4d4454..5ae1e5b15
--- a/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php
+++ b/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php b/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index bbdb502b1..b58c2e674
--- a/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
+++ b/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php b/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
old mode 100755
new mode 100644
index 2d3d7ce8d..3a218d39a
--- a/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
+++ b/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Renderer/Exception/RuntimeException.php b/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 2eb1c3459..5873436f7
--- a/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
+++ b/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php b/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index 8fa8d64fd..ea86988fd
--- a/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
+++ b/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Renderer/Image.php b/library/Zend/Barcode/Renderer/Image.php
old mode 100755
new mode 100644
index e8fae09bb..182c81bcb
--- a/library/Zend/Barcode/Renderer/Image.php
+++ b/library/Zend/Barcode/Renderer/Image.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Renderer/Pdf.php b/library/Zend/Barcode/Renderer/Pdf.php
old mode 100755
new mode 100644
index e4e084d49..5e83dc254
--- a/library/Zend/Barcode/Renderer/Pdf.php
+++ b/library/Zend/Barcode/Renderer/Pdf.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Renderer/RendererInterface.php b/library/Zend/Barcode/Renderer/RendererInterface.php
old mode 100755
new mode 100644
index 795654f30..0d77ce7bb
--- a/library/Zend/Barcode/Renderer/RendererInterface.php
+++ b/library/Zend/Barcode/Renderer/RendererInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/Renderer/Svg.php b/library/Zend/Barcode/Renderer/Svg.php
old mode 100755
new mode 100644
index 45cc08221..3906d4259
--- a/library/Zend/Barcode/Renderer/Svg.php
+++ b/library/Zend/Barcode/Renderer/Svg.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/RendererPluginManager.php b/library/Zend/Barcode/RendererPluginManager.php
old mode 100755
new mode 100644
index 0c8c2f8ae..d81b84d2d
--- a/library/Zend/Barcode/RendererPluginManager.php
+++ b/library/Zend/Barcode/RendererPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Barcode/composer.json b/library/Zend/Barcode/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Cache/CONTRIBUTING.md b/library/Zend/Cache/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Cache/Exception/BadMethodCallException.php b/library/Zend/Cache/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index dc8af1fc5..c851fc8b4
--- a/library/Zend/Cache/Exception/BadMethodCallException.php
+++ b/library/Zend/Cache/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Exception/ExceptionInterface.php b/library/Zend/Cache/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 1457349d5..4119228df
--- a/library/Zend/Cache/Exception/ExceptionInterface.php
+++ b/library/Zend/Cache/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Exception/ExtensionNotLoadedException.php b/library/Zend/Cache/Exception/ExtensionNotLoadedException.php
old mode 100755
new mode 100644
index 17621c5ae..94ec19dbd
--- a/library/Zend/Cache/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Cache/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Exception/InvalidArgumentException.php b/library/Zend/Cache/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index b3b8eeb33..57a726308
--- a/library/Zend/Cache/Exception/InvalidArgumentException.php
+++ b/library/Zend/Cache/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Exception/LogicException.php b/library/Zend/Cache/Exception/LogicException.php
old mode 100755
new mode 100644
index f0fbf67b2..0832f41c3
--- a/library/Zend/Cache/Exception/LogicException.php
+++ b/library/Zend/Cache/Exception/LogicException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Exception/MissingDependencyException.php b/library/Zend/Cache/Exception/MissingDependencyException.php
old mode 100755
new mode 100644
index 94f6ec0f9..4ce85ff81
--- a/library/Zend/Cache/Exception/MissingDependencyException.php
+++ b/library/Zend/Cache/Exception/MissingDependencyException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Exception/MissingKeyException.php b/library/Zend/Cache/Exception/MissingKeyException.php
old mode 100755
new mode 100644
index 24564ef67..8ddf128ff
--- a/library/Zend/Cache/Exception/MissingKeyException.php
+++ b/library/Zend/Cache/Exception/MissingKeyException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Exception/OutOfSpaceException.php b/library/Zend/Cache/Exception/OutOfSpaceException.php
old mode 100755
new mode 100644
index a8a3c198f..7cbbe18bd
--- a/library/Zend/Cache/Exception/OutOfSpaceException.php
+++ b/library/Zend/Cache/Exception/OutOfSpaceException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Exception/RuntimeException.php b/library/Zend/Cache/Exception/RuntimeException.php
old mode 100755
new mode 100644
index a72f50685..dd6aec3e6
--- a/library/Zend/Cache/Exception/RuntimeException.php
+++ b/library/Zend/Cache/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Exception/UnexpectedValueException.php b/library/Zend/Cache/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index 9b168bee2..af3c5bf99
--- a/library/Zend/Cache/Exception/UnexpectedValueException.php
+++ b/library/Zend/Cache/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Exception/UnsupportedMethodCallException.php b/library/Zend/Cache/Exception/UnsupportedMethodCallException.php
old mode 100755
new mode 100644
index 92855748f..28af6a540
--- a/library/Zend/Cache/Exception/UnsupportedMethodCallException.php
+++ b/library/Zend/Cache/Exception/UnsupportedMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Pattern/AbstractPattern.php b/library/Zend/Cache/Pattern/AbstractPattern.php
old mode 100755
new mode 100644
index eef7ef9e2..2818c41ef
--- a/library/Zend/Cache/Pattern/AbstractPattern.php
+++ b/library/Zend/Cache/Pattern/AbstractPattern.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Pattern/CallbackCache.php b/library/Zend/Cache/Pattern/CallbackCache.php
old mode 100755
new mode 100644
index a26a00746..4359924b6
--- a/library/Zend/Cache/Pattern/CallbackCache.php
+++ b/library/Zend/Cache/Pattern/CallbackCache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Pattern/CaptureCache.php b/library/Zend/Cache/Pattern/CaptureCache.php
old mode 100755
new mode 100644
index 7d5cec698..f74b21619
--- a/library/Zend/Cache/Pattern/CaptureCache.php
+++ b/library/Zend/Cache/Pattern/CaptureCache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Pattern/ClassCache.php b/library/Zend/Cache/Pattern/ClassCache.php
old mode 100755
new mode 100644
index 238feed5e..d6c9335b3
--- a/library/Zend/Cache/Pattern/ClassCache.php
+++ b/library/Zend/Cache/Pattern/ClassCache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Pattern/ObjectCache.php b/library/Zend/Cache/Pattern/ObjectCache.php
old mode 100755
new mode 100644
index 9ef2a2414..6ca6a15be
--- a/library/Zend/Cache/Pattern/ObjectCache.php
+++ b/library/Zend/Cache/Pattern/ObjectCache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Pattern/OutputCache.php b/library/Zend/Cache/Pattern/OutputCache.php
old mode 100755
new mode 100644
index 549e17122..9aa2e7e36
--- a/library/Zend/Cache/Pattern/OutputCache.php
+++ b/library/Zend/Cache/Pattern/OutputCache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Pattern/PatternInterface.php b/library/Zend/Cache/Pattern/PatternInterface.php
old mode 100755
new mode 100644
index a79bf5188..53505706a
--- a/library/Zend/Cache/Pattern/PatternInterface.php
+++ b/library/Zend/Cache/Pattern/PatternInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Pattern/PatternOptions.php b/library/Zend/Cache/Pattern/PatternOptions.php
old mode 100755
new mode 100644
index 224578a3c..33f243fe9
--- a/library/Zend/Cache/Pattern/PatternOptions.php
+++ b/library/Zend/Cache/Pattern/PatternOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/PatternFactory.php b/library/Zend/Cache/PatternFactory.php
old mode 100755
new mode 100644
index dceed0032..0f6db5727
--- a/library/Zend/Cache/PatternFactory.php
+++ b/library/Zend/Cache/PatternFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/PatternPluginManager.php b/library/Zend/Cache/PatternPluginManager.php
old mode 100755
new mode 100644
index 7d5d0e1a6..5a77b7c8f
--- a/library/Zend/Cache/PatternPluginManager.php
+++ b/library/Zend/Cache/PatternPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/README.md b/library/Zend/Cache/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php b/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php
old mode 100755
new mode 100644
index 66eb6505e..36e7d789a
--- a/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php
+++ b/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Service/StorageCacheFactory.php b/library/Zend/Cache/Service/StorageCacheFactory.php
old mode 100755
new mode 100644
index f2c204993..faae59608
--- a/library/Zend/Cache/Service/StorageCacheFactory.php
+++ b/library/Zend/Cache/Service/StorageCacheFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php b/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
old mode 100755
new mode 100644
index 71edf763e..5b7a177bd
--- a/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
+++ b/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php b/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
old mode 100755
new mode 100644
index 22933beb0..5caeb9675
--- a/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
+++ b/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/AdapterOptions.php b/library/Zend/Cache/Storage/Adapter/AdapterOptions.php
old mode 100755
new mode 100644
index b3669ffa4..b49e69578
--- a/library/Zend/Cache/Storage/Adapter/AdapterOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/AdapterOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -25,7 +25,7 @@ class AdapterOptions extends AbstractOptions
     /**
      * The adapter using these options
      *
-     * @var null|Filesystem
+     * @var null|StorageInterface
      */
     protected $adapter;
 
diff --git a/library/Zend/Cache/Storage/Adapter/Apc.php b/library/Zend/Cache/Storage/Adapter/Apc.php
old mode 100755
new mode 100644
index c2336e96a..eb442cef4
--- a/library/Zend/Cache/Storage/Adapter/Apc.php
+++ b/library/Zend/Cache/Storage/Adapter/Apc.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -717,20 +717,16 @@ class Apc extends AbstractAdapter implements
      */
     protected function normalizeMetadata(array & $metadata)
     {
-        $metadata['internal_key'] = $metadata['key'];
-        $metadata['ctime']        = $metadata['creation_time'];
-        $metadata['atime']        = $metadata['access_time'];
-        $metadata['rtime']        = $metadata['deletion_time'];
-        $metadata['size']         = $metadata['mem_size'];
-        $metadata['hits']         = $metadata['num_hits'];
-
-        unset(
-            $metadata['key'],
-            $metadata['creation_time'],
-            $metadata['access_time'],
-            $metadata['deletion_time'],
-            $metadata['mem_size'],
-            $metadata['num_hits']
+        $apcMetadata = $metadata;
+        $metadata = array(
+            'internal_key' => isset($metadata['key']) ? $metadata['key'] : $metadata['info'],
+            'atime'        => isset($metadata['access_time']) ? $metadata['access_time'] : $metadata['atime'],
+            'ctime'        => isset($metadata['creation_time']) ? $metadata['creation_time'] : $metadata['ctime'],
+            'mtime'        => isset($metadata['modified_time']) ? $metadata['modified_time'] : $metadata['mtime'],
+            'rtime'        => isset($metadata['deletion_time']) ? $metadata['deletion_time'] : $metadata['dtime'],
+            'size'         => $metadata['mem_size'],
+            'hits'         => isset($metadata['nhits']) ? $metadata['nhits'] : $metadata['num_hits'],
+            'ttl'          => $metadata['ttl'],
         );
     }
 
@@ -746,6 +742,10 @@ class Apc extends AbstractAdapter implements
      */
     protected function internalCheckAndSetItem(& $token, & $normalizedKey, & $value)
     {
-        return apc_cas($normalizedKey, $token, $value);
+        if (is_int($token) && is_int($value)) {
+            return apc_cas($normalizedKey, $token, $value);
+        }
+
+        return parent::internalCheckAndSetItem($token, $normalizedKey, $value);
     }
 }
diff --git a/library/Zend/Cache/Storage/Adapter/ApcIterator.php b/library/Zend/Cache/Storage/Adapter/ApcIterator.php
old mode 100755
new mode 100644
index 3cdcbf1c5..41ff83363
--- a/library/Zend/Cache/Storage/Adapter/ApcIterator.php
+++ b/library/Zend/Cache/Storage/Adapter/ApcIterator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/ApcOptions.php b/library/Zend/Cache/Storage/Adapter/ApcOptions.php
old mode 100755
new mode 100644
index 0299d9446..969bbfbcf
--- a/library/Zend/Cache/Storage/Adapter/ApcOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/ApcOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/BlackHole.php b/library/Zend/Cache/Storage/Adapter/BlackHole.php
old mode 100755
new mode 100644
index 2938cfdee..1b860a06d
--- a/library/Zend/Cache/Storage/Adapter/BlackHole.php
+++ b/library/Zend/Cache/Storage/Adapter/BlackHole.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/Dba.php b/library/Zend/Cache/Storage/Adapter/Dba.php
old mode 100755
new mode 100644
index bb2860d7c..128410d0c
--- a/library/Zend/Cache/Storage/Adapter/Dba.php
+++ b/library/Zend/Cache/Storage/Adapter/Dba.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -225,7 +225,8 @@ class Dba extends AbstractAdapter implements
 
         $this->_open();
 
-        do { // Workaround for PHP-Bug #62491 & #62492
+        do {
+            // Workaround for PHP-Bug #62491 & #62492
             $recheck     = false;
             $internalKey = dba_firstkey($this->handle);
             while ($internalKey !== false && $internalKey !== null) {
diff --git a/library/Zend/Cache/Storage/Adapter/DbaIterator.php b/library/Zend/Cache/Storage/Adapter/DbaIterator.php
old mode 100755
new mode 100644
index a895ce545..a4d46e2a0
--- a/library/Zend/Cache/Storage/Adapter/DbaIterator.php
+++ b/library/Zend/Cache/Storage/Adapter/DbaIterator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -17,7 +17,7 @@ class DbaIterator implements IteratorInterface
     /**
      * The apc storage instance
      *
-     * @var Apc
+     * @var Dba
      */
     protected $storage;
 
diff --git a/library/Zend/Cache/Storage/Adapter/DbaOptions.php b/library/Zend/Cache/Storage/Adapter/DbaOptions.php
old mode 100755
new mode 100644
index 13172b749..588141d87
--- a/library/Zend/Cache/Storage/Adapter/DbaOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/DbaOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/Filesystem.php b/library/Zend/Cache/Storage/Adapter/Filesystem.php
old mode 100755
new mode 100644
index ef1c2a7de..8f0f17e12
--- a/library/Zend/Cache/Storage/Adapter/Filesystem.php
+++ b/library/Zend/Cache/Storage/Adapter/Filesystem.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php b/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php
old mode 100755
new mode 100644
index 447cfb3db..b615104fc
--- a/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php
+++ b/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php b/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
old mode 100755
new mode 100644
index 5eabbdf3f..7034d4d30
--- a/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/KeyListIterator.php b/library/Zend/Cache/Storage/Adapter/KeyListIterator.php
old mode 100755
new mode 100644
index 86bcbe160..d67c7035e
--- a/library/Zend/Cache/Storage/Adapter/KeyListIterator.php
+++ b/library/Zend/Cache/Storage/Adapter/KeyListIterator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/Memcache.php b/library/Zend/Cache/Storage/Adapter/Memcache.php
old mode 100755
new mode 100644
index 953e52cda..d9722a669
--- a/library/Zend/Cache/Storage/Adapter/Memcache.php
+++ b/library/Zend/Cache/Storage/Adapter/Memcache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/MemcacheOptions.php b/library/Zend/Cache/Storage/Adapter/MemcacheOptions.php
old mode 100755
new mode 100644
index 5fcdc3427..b12730cca
--- a/library/Zend/Cache/Storage/Adapter/MemcacheOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/MemcacheOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/MemcacheResourceManager.php b/library/Zend/Cache/Storage/Adapter/MemcacheResourceManager.php
old mode 100755
new mode 100644
index 1fbff1828..81670a30b
--- a/library/Zend/Cache/Storage/Adapter/MemcacheResourceManager.php
+++ b/library/Zend/Cache/Storage/Adapter/MemcacheResourceManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/Memcached.php b/library/Zend/Cache/Storage/Adapter/Memcached.php
old mode 100755
new mode 100644
index 54bbed783..f7fab63d5
--- a/library/Zend/Cache/Storage/Adapter/Memcached.php
+++ b/library/Zend/Cache/Storage/Adapter/Memcached.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php b/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
old mode 100755
new mode 100644
index fabf3033d..5a2b6a1db
--- a/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php b/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php
old mode 100755
new mode 100644
index 10edb99ae..b3bf81018
--- a/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php
+++ b/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/Memory.php b/library/Zend/Cache/Storage/Adapter/Memory.php
old mode 100755
new mode 100644
index 85aa32e6b..b54c03f23
--- a/library/Zend/Cache/Storage/Adapter/Memory.php
+++ b/library/Zend/Cache/Storage/Adapter/Memory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/MemoryOptions.php b/library/Zend/Cache/Storage/Adapter/MemoryOptions.php
old mode 100755
new mode 100644
index be48418c6..a10088d99
--- a/library/Zend/Cache/Storage/Adapter/MemoryOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/MemoryOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/Redis.php b/library/Zend/Cache/Storage/Adapter/Redis.php
old mode 100755
new mode 100644
index 1adb3d4a4..ba40ffa70
--- a/library/Zend/Cache/Storage/Adapter/Redis.php
+++ b/library/Zend/Cache/Storage/Adapter/Redis.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/RedisOptions.php b/library/Zend/Cache/Storage/Adapter/RedisOptions.php
old mode 100755
new mode 100644
index f5e674875..256cb265b
--- a/library/Zend/Cache/Storage/Adapter/RedisOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/RedisOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php b/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
old mode 100755
new mode 100644
index ed8ee2147..772bd3c79
--- a/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
+++ b/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/Session.php b/library/Zend/Cache/Storage/Adapter/Session.php
old mode 100755
new mode 100644
index 4603c2314..2be5cc2db
--- a/library/Zend/Cache/Storage/Adapter/Session.php
+++ b/library/Zend/Cache/Storage/Adapter/Session.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/SessionOptions.php b/library/Zend/Cache/Storage/Adapter/SessionOptions.php
old mode 100755
new mode 100644
index 8e4c6d5c9..2dbfddeca
--- a/library/Zend/Cache/Storage/Adapter/SessionOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/SessionOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/WinCache.php b/library/Zend/Cache/Storage/Adapter/WinCache.php
old mode 100755
new mode 100644
index b911e0400..42d4c9d4f
--- a/library/Zend/Cache/Storage/Adapter/WinCache.php
+++ b/library/Zend/Cache/Storage/Adapter/WinCache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php b/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
old mode 100755
new mode 100644
index 8c9789ae7..9b8dbbd4a
--- a/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/XCache.php b/library/Zend/Cache/Storage/Adapter/XCache.php
old mode 100755
new mode 100644
index 18073e9fe..57ac50fc5
--- a/library/Zend/Cache/Storage/Adapter/XCache.php
+++ b/library/Zend/Cache/Storage/Adapter/XCache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -45,7 +45,7 @@ class XCache extends AbstractAdapter implements
     /**
      * Constructor
      *
-     * @param  null|array|Traversable|ApcOptions $options
+     * @param  null|array|Traversable|XCacheOptions $options
      * @throws Exception\ExceptionInterface
      */
     public function __construct($options = null)
@@ -74,7 +74,7 @@ class XCache extends AbstractAdapter implements
     /**
      * Set options.
      *
-     * @param  array|Traversable|ApcOptions $options
+     * @param  array|Traversable|XCacheOptions $options
      * @return XCache
      * @see    getOptions()
      */
diff --git a/library/Zend/Cache/Storage/Adapter/XCacheOptions.php b/library/Zend/Cache/Storage/Adapter/XCacheOptions.php
old mode 100755
new mode 100644
index 4c97136b7..9c5b17c90
--- a/library/Zend/Cache/Storage/Adapter/XCacheOptions.php
+++ b/library/Zend/Cache/Storage/Adapter/XCacheOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php b/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
old mode 100755
new mode 100644
index c48992a59..95dd9008a
--- a/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
+++ b/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Adapter/ZendServerShm.php b/library/Zend/Cache/Storage/Adapter/ZendServerShm.php
old mode 100755
new mode 100644
index 6b226d7c0..3c5d5e90d
--- a/library/Zend/Cache/Storage/Adapter/ZendServerShm.php
+++ b/library/Zend/Cache/Storage/Adapter/ZendServerShm.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/AdapterPluginManager.php b/library/Zend/Cache/Storage/AdapterPluginManager.php
old mode 100755
new mode 100644
index 665b36c81..6278d3c1f
--- a/library/Zend/Cache/Storage/AdapterPluginManager.php
+++ b/library/Zend/Cache/Storage/AdapterPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php b/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php
old mode 100755
new mode 100644
index 5088fe255..0576c6a70
--- a/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php
+++ b/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Capabilities.php b/library/Zend/Cache/Storage/Capabilities.php
old mode 100755
new mode 100644
index c81e08cbd..b09922d27
--- a/library/Zend/Cache/Storage/Capabilities.php
+++ b/library/Zend/Cache/Storage/Capabilities.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -40,8 +40,8 @@ class Capabilities
     /**
      * Expire read
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|bool
      */
@@ -50,8 +50,8 @@ class Capabilities
     /**
      * Max. key length
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|int
      */
@@ -60,8 +60,8 @@ class Capabilities
     /**
      * Min. TTL (0 means items never expire)
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|int
      */
@@ -70,8 +70,8 @@ class Capabilities
     /**
      * Max. TTL (0 means infinite)
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|int
      */
@@ -80,8 +80,8 @@ class Capabilities
     /**
      * Namespace is prefix
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|bool
      */
@@ -90,8 +90,8 @@ class Capabilities
     /**
      * Namespace separator
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|string
      */
@@ -100,28 +100,28 @@ class Capabilities
     /**
      * Static ttl
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|bool
      */
     protected $staticTtl;
 
-   /**
-    * Supported datatypes
-    *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
-    *
-    * @var null|array
-    */
+    /**
+     * Supported datatypes
+     *
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
+     *
+     * @var null|array
+     */
     protected $supportedDatatypes;
 
     /**
      * Supported metdata
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|array
      */
@@ -130,8 +130,8 @@ class Capabilities
     /**
      * TTL precision
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|int
      */
@@ -140,8 +140,8 @@ class Capabilities
     /**
      * Use request time
      *
-    * If it's NULL the capability isn't set and the getter
-    * returns the base capability or the default value.
+     * If it's NULL the capability isn't set and the getter
+     * returns the base capability or the default value.
      *
      * @var null|bool
      */
diff --git a/library/Zend/Cache/Storage/ClearByNamespaceInterface.php b/library/Zend/Cache/Storage/ClearByNamespaceInterface.php
old mode 100755
new mode 100644
index 15fb4e756..ed2aac94f
--- a/library/Zend/Cache/Storage/ClearByNamespaceInterface.php
+++ b/library/Zend/Cache/Storage/ClearByNamespaceInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/ClearByPrefixInterface.php b/library/Zend/Cache/Storage/ClearByPrefixInterface.php
old mode 100755
new mode 100644
index eb2fb5e0b..f1279576c
--- a/library/Zend/Cache/Storage/ClearByPrefixInterface.php
+++ b/library/Zend/Cache/Storage/ClearByPrefixInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/ClearExpiredInterface.php b/library/Zend/Cache/Storage/ClearExpiredInterface.php
old mode 100755
new mode 100644
index 6f7b0a36a..264e7eb2f
--- a/library/Zend/Cache/Storage/ClearExpiredInterface.php
+++ b/library/Zend/Cache/Storage/ClearExpiredInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Event.php b/library/Zend/Cache/Storage/Event.php
old mode 100755
new mode 100644
index 62c32f4f8..b82cbb127
--- a/library/Zend/Cache/Storage/Event.php
+++ b/library/Zend/Cache/Storage/Event.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/ExceptionEvent.php b/library/Zend/Cache/Storage/ExceptionEvent.php
old mode 100755
new mode 100644
index e9ffb4a0c..1882c6ad0
--- a/library/Zend/Cache/Storage/ExceptionEvent.php
+++ b/library/Zend/Cache/Storage/ExceptionEvent.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/FlushableInterface.php b/library/Zend/Cache/Storage/FlushableInterface.php
old mode 100755
new mode 100644
index 6c72541e6..2fe060538
--- a/library/Zend/Cache/Storage/FlushableInterface.php
+++ b/library/Zend/Cache/Storage/FlushableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/IterableInterface.php b/library/Zend/Cache/Storage/IterableInterface.php
old mode 100755
new mode 100644
index 68c4ba2ca..af24b7f80
--- a/library/Zend/Cache/Storage/IterableInterface.php
+++ b/library/Zend/Cache/Storage/IterableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/IteratorInterface.php b/library/Zend/Cache/Storage/IteratorInterface.php
old mode 100755
new mode 100644
index ec76261d1..e60f52f89
--- a/library/Zend/Cache/Storage/IteratorInterface.php
+++ b/library/Zend/Cache/Storage/IteratorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/OptimizableInterface.php b/library/Zend/Cache/Storage/OptimizableInterface.php
old mode 100755
new mode 100644
index 0f57022fb..f7ce2984b
--- a/library/Zend/Cache/Storage/OptimizableInterface.php
+++ b/library/Zend/Cache/Storage/OptimizableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php b/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
old mode 100755
new mode 100644
index 0e1ab90cb..cc918f5a7
--- a/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
+++ b/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php b/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
old mode 100755
new mode 100644
index 0b257be77..5fc1bcb00
--- a/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
+++ b/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php b/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
old mode 100755
new mode 100644
index e6acace0c..11e0abdab
--- a/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
+++ b/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php b/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
old mode 100755
new mode 100644
index ddec6354c..64f0d9902
--- a/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
+++ b/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -85,7 +85,7 @@ class IgnoreUserAbort extends AbstractPlugin
     public function onBefore(Event $event)
     {
         if ($this->activatedTarget === null && !ignore_user_abort(true)) {
-            $this->activatedTarget = $event->getTarget();
+            $this->activatedTarget = $event->getStorage();
         }
     }
 
@@ -101,7 +101,7 @@ class IgnoreUserAbort extends AbstractPlugin
      */
     public function onAfter(Event $event)
     {
-        if ($this->activatedTarget === $event->getTarget()) {
+        if ($this->activatedTarget === $event->getStorage()) {
             // exit if connection aborted
             if ($this->getOptions()->getExitOnAbort() && connection_aborted()) {
                 exit;
diff --git a/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php b/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
old mode 100755
new mode 100644
index 42643df7a..9d432048f
--- a/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
+++ b/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Plugin/PluginInterface.php b/library/Zend/Cache/Storage/Plugin/PluginInterface.php
old mode 100755
new mode 100644
index af3d007ca..cad0b455f
--- a/library/Zend/Cache/Storage/Plugin/PluginInterface.php
+++ b/library/Zend/Cache/Storage/Plugin/PluginInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Plugin/PluginOptions.php b/library/Zend/Cache/Storage/Plugin/PluginOptions.php
old mode 100755
new mode 100644
index cd32a295e..59ea170aa
--- a/library/Zend/Cache/Storage/Plugin/PluginOptions.php
+++ b/library/Zend/Cache/Storage/Plugin/PluginOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/Plugin/Serializer.php b/library/Zend/Cache/Storage/Plugin/Serializer.php
old mode 100755
new mode 100644
index c785e751e..d79f221a0
--- a/library/Zend/Cache/Storage/Plugin/Serializer.php
+++ b/library/Zend/Cache/Storage/Plugin/Serializer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/PluginManager.php b/library/Zend/Cache/Storage/PluginManager.php
old mode 100755
new mode 100644
index a799a37d3..ebdaa67c0
--- a/library/Zend/Cache/Storage/PluginManager.php
+++ b/library/Zend/Cache/Storage/PluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/PostEvent.php b/library/Zend/Cache/Storage/PostEvent.php
old mode 100755
new mode 100644
index 9302b0814..8ca7877ff
--- a/library/Zend/Cache/Storage/PostEvent.php
+++ b/library/Zend/Cache/Storage/PostEvent.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/StorageInterface.php b/library/Zend/Cache/Storage/StorageInterface.php
old mode 100755
new mode 100644
index c89ca5bef..2b0910fe5
--- a/library/Zend/Cache/Storage/StorageInterface.php
+++ b/library/Zend/Cache/Storage/StorageInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/TaggableInterface.php b/library/Zend/Cache/Storage/TaggableInterface.php
old mode 100755
new mode 100644
index 3917b0e41..1bf63bd0a
--- a/library/Zend/Cache/Storage/TaggableInterface.php
+++ b/library/Zend/Cache/Storage/TaggableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php b/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php
old mode 100755
new mode 100644
index be543e82f..737a03335
--- a/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php
+++ b/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/StorageFactory.php b/library/Zend/Cache/StorageFactory.php
old mode 100755
new mode 100644
index 86fca3a31..8023bc9a1
--- a/library/Zend/Cache/StorageFactory.php
+++ b/library/Zend/Cache/StorageFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Cache/composer.json b/library/Zend/Cache/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Captcha/AbstractAdapter.php b/library/Zend/Captcha/AbstractAdapter.php
old mode 100755
new mode 100644
index 11784d69e..70642e650
--- a/library/Zend/Captcha/AbstractAdapter.php
+++ b/library/Zend/Captcha/AbstractAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/AbstractWord.php b/library/Zend/Captcha/AbstractWord.php
old mode 100755
new mode 100644
index 5ad803661..b0a3b0010
--- a/library/Zend/Captcha/AbstractWord.php
+++ b/library/Zend/Captcha/AbstractWord.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/AdapterInterface.php b/library/Zend/Captcha/AdapterInterface.php
old mode 100755
new mode 100644
index 227daa5c7..4827952f0
--- a/library/Zend/Captcha/AdapterInterface.php
+++ b/library/Zend/Captcha/AdapterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/CONTRIBUTING.md b/library/Zend/Captcha/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Captcha/Dumb.php b/library/Zend/Captcha/Dumb.php
old mode 100755
new mode 100644
index 9461adf0c..975cb6f14
--- a/library/Zend/Captcha/Dumb.php
+++ b/library/Zend/Captcha/Dumb.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/Exception/DomainException.php b/library/Zend/Captcha/Exception/DomainException.php
old mode 100755
new mode 100644
index ac900097b..94e434389
--- a/library/Zend/Captcha/Exception/DomainException.php
+++ b/library/Zend/Captcha/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/Exception/ExceptionInterface.php b/library/Zend/Captcha/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index a42e6a869..afb8edbd2
--- a/library/Zend/Captcha/Exception/ExceptionInterface.php
+++ b/library/Zend/Captcha/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php b/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
old mode 100755
new mode 100644
index 78c319114..127c5d170
--- a/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/Exception/ImageNotLoadableException.php b/library/Zend/Captcha/Exception/ImageNotLoadableException.php
old mode 100755
new mode 100644
index 718091a97..c6533d67e
--- a/library/Zend/Captcha/Exception/ImageNotLoadableException.php
+++ b/library/Zend/Captcha/Exception/ImageNotLoadableException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/Exception/InvalidArgumentException.php b/library/Zend/Captcha/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 955fcd4ef..c8d7ff5e9
--- a/library/Zend/Captcha/Exception/InvalidArgumentException.php
+++ b/library/Zend/Captcha/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/Exception/NoFontProvidedException.php b/library/Zend/Captcha/Exception/NoFontProvidedException.php
old mode 100755
new mode 100644
index eaf044725..28b2293c9
--- a/library/Zend/Captcha/Exception/NoFontProvidedException.php
+++ b/library/Zend/Captcha/Exception/NoFontProvidedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/Exception/RuntimeException.php b/library/Zend/Captcha/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 4545d4f87..bb03210d3
--- a/library/Zend/Captcha/Exception/RuntimeException.php
+++ b/library/Zend/Captcha/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/Factory.php b/library/Zend/Captcha/Factory.php
old mode 100755
new mode 100644
index 04f15d868..ff7e6b825
--- a/library/Zend/Captcha/Factory.php
+++ b/library/Zend/Captcha/Factory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/Figlet.php b/library/Zend/Captcha/Figlet.php
old mode 100755
new mode 100644
index 002f5f307..a660549c8
--- a/library/Zend/Captcha/Figlet.php
+++ b/library/Zend/Captcha/Figlet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/Image.php b/library/Zend/Captcha/Image.php
old mode 100755
new mode 100644
index 7f91b9128..b95550d07
--- a/library/Zend/Captcha/Image.php
+++ b/library/Zend/Captcha/Image.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/README.md b/library/Zend/Captcha/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Captcha/ReCaptcha.php b/library/Zend/Captcha/ReCaptcha.php
old mode 100755
new mode 100644
index 7e5c01934..d701b00d1
--- a/library/Zend/Captcha/ReCaptcha.php
+++ b/library/Zend/Captcha/ReCaptcha.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Captcha/composer.json b/library/Zend/Captcha/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Code/Annotation/AnnotationCollection.php b/library/Zend/Code/Annotation/AnnotationCollection.php
old mode 100755
new mode 100644
index 7b9aa51da..48a71fc03
--- a/library/Zend/Code/Annotation/AnnotationCollection.php
+++ b/library/Zend/Code/Annotation/AnnotationCollection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Annotation/AnnotationInterface.php b/library/Zend/Code/Annotation/AnnotationInterface.php
old mode 100755
new mode 100644
index a67439ccd..f8fcc7ac3
--- a/library/Zend/Code/Annotation/AnnotationInterface.php
+++ b/library/Zend/Code/Annotation/AnnotationInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Annotation/AnnotationManager.php b/library/Zend/Code/Annotation/AnnotationManager.php
old mode 100755
new mode 100644
index a82ebb77d..f49bef5df
--- a/library/Zend/Code/Annotation/AnnotationManager.php
+++ b/library/Zend/Code/Annotation/AnnotationManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php b/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php
old mode 100755
new mode 100644
index 5168e3278..d462985ff
--- a/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php
+++ b/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php b/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php
old mode 100755
new mode 100644
index b3f756624..f142ac466
--- a/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php
+++ b/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Annotation/Parser/ParserInterface.php b/library/Zend/Code/Annotation/Parser/ParserInterface.php
old mode 100755
new mode 100644
index bb6746e80..9d84642f8
--- a/library/Zend/Code/Annotation/Parser/ParserInterface.php
+++ b/library/Zend/Code/Annotation/Parser/ParserInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/CONTRIBUTING.md b/library/Zend/Code/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Code/Exception/BadMethodCallException.php b/library/Zend/Code/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index f97274d2f..03465969e
--- a/library/Zend/Code/Exception/BadMethodCallException.php
+++ b/library/Zend/Code/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Exception/ExceptionInterface.php b/library/Zend/Code/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 587876669..cb3e15eec
--- a/library/Zend/Code/Exception/ExceptionInterface.php
+++ b/library/Zend/Code/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Exception/InvalidArgumentException.php b/library/Zend/Code/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 1a8df9e73..65fe03e62
--- a/library/Zend/Code/Exception/InvalidArgumentException.php
+++ b/library/Zend/Code/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Exception/RuntimeException.php b/library/Zend/Code/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 8d890a6a8..fabca6931
--- a/library/Zend/Code/Exception/RuntimeException.php
+++ b/library/Zend/Code/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/AbstractGenerator.php b/library/Zend/Code/Generator/AbstractGenerator.php
old mode 100755
new mode 100644
index 3dc6de567..ef6aa67d0
--- a/library/Zend/Code/Generator/AbstractGenerator.php
+++ b/library/Zend/Code/Generator/AbstractGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/AbstractMemberGenerator.php b/library/Zend/Code/Generator/AbstractMemberGenerator.php
old mode 100755
new mode 100644
index dec0d8dc0..10684a3e7
--- a/library/Zend/Code/Generator/AbstractMemberGenerator.php
+++ b/library/Zend/Code/Generator/AbstractMemberGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/BodyGenerator.php b/library/Zend/Code/Generator/BodyGenerator.php
old mode 100755
new mode 100644
index 4851e5ca4..03e4f409a
--- a/library/Zend/Code/Generator/BodyGenerator.php
+++ b/library/Zend/Code/Generator/BodyGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/ClassGenerator.php b/library/Zend/Code/Generator/ClassGenerator.php
old mode 100755
new mode 100644
index e84558746..d0791d332
--- a/library/Zend/Code/Generator/ClassGenerator.php
+++ b/library/Zend/Code/Generator/ClassGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/Tag.php b/library/Zend/Code/Generator/DocBlock/Tag.php
old mode 100755
new mode 100644
index 58bd045e0..5901fb13d
--- a/library/Zend/Code/Generator/DocBlock/Tag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/Tag/AbstractTypeableTag.php b/library/Zend/Code/Generator/DocBlock/Tag/AbstractTypeableTag.php
old mode 100755
new mode 100644
index 1ecf5dc07..3d95e9080
--- a/library/Zend/Code/Generator/DocBlock/Tag/AbstractTypeableTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/AbstractTypeableTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/Tag/AuthorTag.php b/library/Zend/Code/Generator/DocBlock/Tag/AuthorTag.php
old mode 100755
new mode 100644
index 333912dca..a6b540867
--- a/library/Zend/Code/Generator/DocBlock/Tag/AuthorTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/AuthorTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/Tag/GenericTag.php b/library/Zend/Code/Generator/DocBlock/Tag/GenericTag.php
old mode 100755
new mode 100644
index 4ff98d9f7..d4ea10849
--- a/library/Zend/Code/Generator/DocBlock/Tag/GenericTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/GenericTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php b/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
old mode 100755
new mode 100644
index 91a974152..832d4346f
--- a/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/Tag/MethodTag.php b/library/Zend/Code/Generator/DocBlock/Tag/MethodTag.php
old mode 100755
new mode 100644
index e3c84c4ca..fc68c6d97
--- a/library/Zend/Code/Generator/DocBlock/Tag/MethodTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/MethodTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php b/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
old mode 100755
new mode 100644
index 75d8f86cb..4753eee07
--- a/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/Tag/PropertyTag.php b/library/Zend/Code/Generator/DocBlock/Tag/PropertyTag.php
old mode 100755
new mode 100644
index 26699a897..6a1de98f8
--- a/library/Zend/Code/Generator/DocBlock/Tag/PropertyTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/PropertyTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php b/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
old mode 100755
new mode 100644
index f3b356ebb..d20155771
--- a/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/Tag/TagInterface.php b/library/Zend/Code/Generator/DocBlock/Tag/TagInterface.php
old mode 100755
new mode 100644
index 4d4ef3fcd..70d46b9b0
--- a/library/Zend/Code/Generator/DocBlock/Tag/TagInterface.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/TagInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/Tag/ThrowsTag.php b/library/Zend/Code/Generator/DocBlock/Tag/ThrowsTag.php
old mode 100755
new mode 100644
index 6350746e8..20df0b4f1
--- a/library/Zend/Code/Generator/DocBlock/Tag/ThrowsTag.php
+++ b/library/Zend/Code/Generator/DocBlock/Tag/ThrowsTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlock/TagManager.php b/library/Zend/Code/Generator/DocBlock/TagManager.php
old mode 100755
new mode 100644
index 4ff3a2bc6..00531f655
--- a/library/Zend/Code/Generator/DocBlock/TagManager.php
+++ b/library/Zend/Code/Generator/DocBlock/TagManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/DocBlockGenerator.php b/library/Zend/Code/Generator/DocBlockGenerator.php
old mode 100755
new mode 100644
index e983fa6b1..1a84335c5
--- a/library/Zend/Code/Generator/DocBlockGenerator.php
+++ b/library/Zend/Code/Generator/DocBlockGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/Exception/ExceptionInterface.php b/library/Zend/Code/Generator/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index d6abfd426..226b37ca3
--- a/library/Zend/Code/Generator/Exception/ExceptionInterface.php
+++ b/library/Zend/Code/Generator/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/Exception/InvalidArgumentException.php b/library/Zend/Code/Generator/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 11a4b2480..0b5cb4c2e
--- a/library/Zend/Code/Generator/Exception/InvalidArgumentException.php
+++ b/library/Zend/Code/Generator/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/Exception/RuntimeException.php b/library/Zend/Code/Generator/Exception/RuntimeException.php
old mode 100755
new mode 100644
index b1acd4f96..7b95186fa
--- a/library/Zend/Code/Generator/Exception/RuntimeException.php
+++ b/library/Zend/Code/Generator/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/FileGenerator.php b/library/Zend/Code/Generator/FileGenerator.php
old mode 100755
new mode 100644
index 5cb559c37..27d6b4540
--- a/library/Zend/Code/Generator/FileGenerator.php
+++ b/library/Zend/Code/Generator/FileGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -90,8 +90,6 @@ class FileGenerator extends AbstractGenerator
         $file->setSourceContent($fileReflection->getContents());
         $file->setSourceDirty(false);
 
-        $body = $fileReflection->getContents();
-
         $uses = $fileReflection->getUses();
 
         foreach ($fileReflection->getClasses() as $class) {
@@ -454,8 +452,12 @@ class FileGenerator extends AbstractGenerator
         if ($namespace) {
             $namespace = sprintf('namespace %s;%s', $namespace, str_repeat(self::LINE_FEED, 2));
             if (preg_match('#/\* Zend_Code_Generator_FileGenerator-NamespaceMarker \*/#m', $output)) {
-                $output = preg_replace('#/\* Zend_Code_Generator_FileGenerator-NamespaceMarker \*/#m', $namespace,
-                    $output, 1);
+                $output = preg_replace(
+                    '#/\* Zend_Code_Generator_FileGenerator-NamespaceMarker \*/#m',
+                    $namespace,
+                    $output,
+                    1
+                );
             } else {
                 $output .= $namespace;
             }
@@ -505,8 +507,12 @@ class FileGenerator extends AbstractGenerator
             $useOutput .= self::LINE_FEED;
 
             if (preg_match('#/\* Zend_Code_Generator_FileGenerator-UseMarker \*/#m', $output)) {
-                $output = preg_replace('#/\* Zend_Code_Generator_FileGenerator-UseMarker \*/#m', $useOutput,
-                    $output, 1);
+                $output = preg_replace(
+                    '#/\* Zend_Code_Generator_FileGenerator-UseMarker \*/#m',
+                    $useOutput,
+                    $output,
+                    1
+                );
             } else {
                 $output .= $useOutput;
             }
diff --git a/library/Zend/Code/Generator/FileGeneratorRegistry.php b/library/Zend/Code/Generator/FileGeneratorRegistry.php
old mode 100755
new mode 100644
index 164cc5254..953cb6bf5
--- a/library/Zend/Code/Generator/FileGeneratorRegistry.php
+++ b/library/Zend/Code/Generator/FileGeneratorRegistry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/GeneratorInterface.php b/library/Zend/Code/Generator/GeneratorInterface.php
old mode 100755
new mode 100644
index 77e1eb8c8..59e9d3a0e
--- a/library/Zend/Code/Generator/GeneratorInterface.php
+++ b/library/Zend/Code/Generator/GeneratorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/MethodGenerator.php b/library/Zend/Code/Generator/MethodGenerator.php
old mode 100755
new mode 100644
index d98cbd80d..24f67ead8
--- a/library/Zend/Code/Generator/MethodGenerator.php
+++ b/library/Zend/Code/Generator/MethodGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/ParameterGenerator.php b/library/Zend/Code/Generator/ParameterGenerator.php
old mode 100755
new mode 100644
index 30fad22c0..3714565ce
--- a/library/Zend/Code/Generator/ParameterGenerator.php
+++ b/library/Zend/Code/Generator/ParameterGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/PropertyGenerator.php b/library/Zend/Code/Generator/PropertyGenerator.php
old mode 100755
new mode 100644
index 36735ad37..a5bd0bd74
--- a/library/Zend/Code/Generator/PropertyGenerator.php
+++ b/library/Zend/Code/Generator/PropertyGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/PropertyValueGenerator.php b/library/Zend/Code/Generator/PropertyValueGenerator.php
old mode 100755
new mode 100644
index f36fc8c1f..bf4156cb4
--- a/library/Zend/Code/Generator/PropertyValueGenerator.php
+++ b/library/Zend/Code/Generator/PropertyValueGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generator/ValueGenerator.php b/library/Zend/Code/Generator/ValueGenerator.php
old mode 100755
new mode 100644
index 69e110b77..d67402342
--- a/library/Zend/Code/Generator/ValueGenerator.php
+++ b/library/Zend/Code/Generator/ValueGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -73,7 +73,8 @@ class ValueGenerator extends AbstractGenerator
      */
     public function __construct($value = null, $type = self::TYPE_AUTO, $outputMode = self::OUTPUT_MULTIPLE_LINE, ArrayObject $constants = null)
     {
-        if ($value !== null) { // strict check is important here if $type = AUTO
+        // strict check is important here if $type = AUTO
+        if ($value !== null) {
             $this->setValue($value);
         }
         if ($type !== self::TYPE_AUTO) {
diff --git a/library/Zend/Code/Generic/Prototype/PrototypeClassFactory.php b/library/Zend/Code/Generic/Prototype/PrototypeClassFactory.php
old mode 100755
new mode 100644
index 7c3a9bf1b..2fcc5f77a
--- a/library/Zend/Code/Generic/Prototype/PrototypeClassFactory.php
+++ b/library/Zend/Code/Generic/Prototype/PrototypeClassFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generic/Prototype/PrototypeGenericInterface.php b/library/Zend/Code/Generic/Prototype/PrototypeGenericInterface.php
old mode 100755
new mode 100644
index 3a5e44a88..06a41daef
--- a/library/Zend/Code/Generic/Prototype/PrototypeGenericInterface.php
+++ b/library/Zend/Code/Generic/Prototype/PrototypeGenericInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Generic/Prototype/PrototypeInterface.php b/library/Zend/Code/Generic/Prototype/PrototypeInterface.php
old mode 100755
new mode 100644
index 2815e54d5..acbfb7220
--- a/library/Zend/Code/Generic/Prototype/PrototypeInterface.php
+++ b/library/Zend/Code/Generic/Prototype/PrototypeInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/NameInformation.php b/library/Zend/Code/NameInformation.php
old mode 100755
new mode 100644
index 819ebfb00..5a7166c12
--- a/library/Zend/Code/NameInformation.php
+++ b/library/Zend/Code/NameInformation.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/README.md b/library/Zend/Code/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Code/Reflection/ClassReflection.php b/library/Zend/Code/Reflection/ClassReflection.php
old mode 100755
new mode 100644
index 86d1f14cb..2d7b4ae72
--- a/library/Zend/Code/Reflection/ClassReflection.php
+++ b/library/Zend/Code/Reflection/ClassReflection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlock/Tag/AuthorTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/AuthorTag.php
old mode 100755
new mode 100644
index 9afdee087..8b48fbe05
--- a/library/Zend/Code/Reflection/DocBlock/Tag/AuthorTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/AuthorTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
old mode 100755
new mode 100644
index 9f3481085..6cd1bb62f
--- a/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlock/Tag/LicenseTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/LicenseTag.php
old mode 100755
new mode 100644
index d1148ef62..ee7ec1450
--- a/library/Zend/Code/Reflection/DocBlock/Tag/LicenseTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/LicenseTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
old mode 100755
new mode 100644
index 50738bfea..7e80861e4
--- a/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
old mode 100755
new mode 100644
index b11a16e4e..74b8a1d54
--- a/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlock/Tag/PhpDocTypedTagInterface.php b/library/Zend/Code/Reflection/DocBlock/Tag/PhpDocTypedTagInterface.php
old mode 100755
new mode 100644
index 01bea4b9d..19b1119ab
--- a/library/Zend/Code/Reflection/DocBlock/Tag/PhpDocTypedTagInterface.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/PhpDocTypedTagInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
old mode 100755
new mode 100644
index a15ffd215..9f5b4b92d
--- a/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
old mode 100755
new mode 100644
index f43d7e2e3..c9294149c
--- a/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlock/Tag/TagInterface.php b/library/Zend/Code/Reflection/DocBlock/Tag/TagInterface.php
old mode 100755
new mode 100644
index f34e154f6..653c88446
--- a/library/Zend/Code/Reflection/DocBlock/Tag/TagInterface.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/TagInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlock/Tag/ThrowsTag.php b/library/Zend/Code/Reflection/DocBlock/Tag/ThrowsTag.php
old mode 100755
new mode 100644
index 25453460f..5b57dea52
--- a/library/Zend/Code/Reflection/DocBlock/Tag/ThrowsTag.php
+++ b/library/Zend/Code/Reflection/DocBlock/Tag/ThrowsTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlock/TagManager.php b/library/Zend/Code/Reflection/DocBlock/TagManager.php
old mode 100755
new mode 100644
index 4d8f0da85..3a5474db4
--- a/library/Zend/Code/Reflection/DocBlock/TagManager.php
+++ b/library/Zend/Code/Reflection/DocBlock/TagManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/DocBlockReflection.php b/library/Zend/Code/Reflection/DocBlockReflection.php
old mode 100755
new mode 100644
index a49021364..c43db8ddf
--- a/library/Zend/Code/Reflection/DocBlockReflection.php
+++ b/library/Zend/Code/Reflection/DocBlockReflection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/Exception/BadMethodCallException.php b/library/Zend/Code/Reflection/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 6eeb226fb..f40a1992a
--- a/library/Zend/Code/Reflection/Exception/BadMethodCallException.php
+++ b/library/Zend/Code/Reflection/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/Exception/ExceptionInterface.php b/library/Zend/Code/Reflection/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index dfb6736c9..a3574f839
--- a/library/Zend/Code/Reflection/Exception/ExceptionInterface.php
+++ b/library/Zend/Code/Reflection/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php b/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 086796917..bc816819e
--- a/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php
+++ b/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/Exception/RuntimeException.php b/library/Zend/Code/Reflection/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 1965fb604..f538b65e5
--- a/library/Zend/Code/Reflection/Exception/RuntimeException.php
+++ b/library/Zend/Code/Reflection/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/FileReflection.php b/library/Zend/Code/Reflection/FileReflection.php
old mode 100755
new mode 100644
index dfd07a046..d079ba718
--- a/library/Zend/Code/Reflection/FileReflection.php
+++ b/library/Zend/Code/Reflection/FileReflection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/FunctionReflection.php b/library/Zend/Code/Reflection/FunctionReflection.php
old mode 100755
new mode 100644
index c752f1eca..aed8d5847
--- a/library/Zend/Code/Reflection/FunctionReflection.php
+++ b/library/Zend/Code/Reflection/FunctionReflection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/MethodReflection.php b/library/Zend/Code/Reflection/MethodReflection.php
old mode 100755
new mode 100644
index 10a9b8ab4..051d59a4e
--- a/library/Zend/Code/Reflection/MethodReflection.php
+++ b/library/Zend/Code/Reflection/MethodReflection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -211,7 +211,7 @@ class MethodReflection extends PhpReflectionMethod implements ReflectionInterfac
      * @param bool $bodyOnly
      * @return string
      */
-    protected function extractMethodContents($bodyOnly=false)
+    protected function extractMethodContents($bodyOnly = false)
     {
         $fileName = $this->getDeclaringClass()->getFileName();
 
@@ -438,7 +438,7 @@ class MethodReflection extends PhpReflectionMethod implements ReflectionInterfac
     {
         $isValid = false;
         $count = count($haystack);
-        for ($i = $position+1;$i < $count; $i++) {
+        for ($i = $position+1; $i < $count; $i++) {
             $tokenType = (is_array($haystack[$i])) ? token_name($haystack[$i][0]) : $haystack[$i];
             $tokenValue = (is_array($haystack[$i])) ? $haystack[$i][1] : $haystack[$i];
 
diff --git a/library/Zend/Code/Reflection/ParameterReflection.php b/library/Zend/Code/Reflection/ParameterReflection.php
old mode 100755
new mode 100644
index e6239abce..77e72c057
--- a/library/Zend/Code/Reflection/ParameterReflection.php
+++ b/library/Zend/Code/Reflection/ParameterReflection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/PropertyReflection.php b/library/Zend/Code/Reflection/PropertyReflection.php
old mode 100755
new mode 100644
index c9b5a8d25..8d9ce4975
--- a/library/Zend/Code/Reflection/PropertyReflection.php
+++ b/library/Zend/Code/Reflection/PropertyReflection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Reflection/ReflectionInterface.php b/library/Zend/Code/Reflection/ReflectionInterface.php
old mode 100755
new mode 100644
index ed5ffd46c..a081cf71d
--- a/library/Zend/Code/Reflection/ReflectionInterface.php
+++ b/library/Zend/Code/Reflection/ReflectionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/AggregateDirectoryScanner.php b/library/Zend/Code/Scanner/AggregateDirectoryScanner.php
old mode 100755
new mode 100644
index 63fd67529..629d7f903
--- a/library/Zend/Code/Scanner/AggregateDirectoryScanner.php
+++ b/library/Zend/Code/Scanner/AggregateDirectoryScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/AnnotationScanner.php b/library/Zend/Code/Scanner/AnnotationScanner.php
old mode 100755
new mode 100644
index 76e8144c0..5410c0256
--- a/library/Zend/Code/Scanner/AnnotationScanner.php
+++ b/library/Zend/Code/Scanner/AnnotationScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/CachingFileScanner.php b/library/Zend/Code/Scanner/CachingFileScanner.php
old mode 100755
new mode 100644
index cb7286704..deef2440f
--- a/library/Zend/Code/Scanner/CachingFileScanner.php
+++ b/library/Zend/Code/Scanner/CachingFileScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/ClassScanner.php b/library/Zend/Code/Scanner/ClassScanner.php
old mode 100755
new mode 100644
index 2efc5539c..8680c4948
--- a/library/Zend/Code/Scanner/ClassScanner.php
+++ b/library/Zend/Code/Scanner/ClassScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -401,7 +401,7 @@ class ClassScanner implements ScannerInterface
     /**
      * Return a list of properties
      *
-     * @return PropertyScanner
+     * @return PropertyScanner[]
      */
     public function getProperties()
     {
diff --git a/library/Zend/Code/Scanner/ConstantScanner.php b/library/Zend/Code/Scanner/ConstantScanner.php
old mode 100755
new mode 100644
index c37c7a22c..f2a81da51
--- a/library/Zend/Code/Scanner/ConstantScanner.php
+++ b/library/Zend/Code/Scanner/ConstantScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/DerivedClassScanner.php b/library/Zend/Code/Scanner/DerivedClassScanner.php
old mode 100755
new mode 100644
index 6c8463ede..a7c7f37fd
--- a/library/Zend/Code/Scanner/DerivedClassScanner.php
+++ b/library/Zend/Code/Scanner/DerivedClassScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/DirectoryScanner.php b/library/Zend/Code/Scanner/DirectoryScanner.php
old mode 100755
new mode 100644
index b1a0223da..33120ff70
--- a/library/Zend/Code/Scanner/DirectoryScanner.php
+++ b/library/Zend/Code/Scanner/DirectoryScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/DocBlockScanner.php b/library/Zend/Code/Scanner/DocBlockScanner.php
old mode 100755
new mode 100644
index 3bb28ece1..b367849bc
--- a/library/Zend/Code/Scanner/DocBlockScanner.php
+++ b/library/Zend/Code/Scanner/DocBlockScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/FileScanner.php b/library/Zend/Code/Scanner/FileScanner.php
old mode 100755
new mode 100644
index 64700f611..e462f7275
--- a/library/Zend/Code/Scanner/FileScanner.php
+++ b/library/Zend/Code/Scanner/FileScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/FunctionScanner.php b/library/Zend/Code/Scanner/FunctionScanner.php
old mode 100755
new mode 100644
index dbb082b23..d1fd2198c
--- a/library/Zend/Code/Scanner/FunctionScanner.php
+++ b/library/Zend/Code/Scanner/FunctionScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/MethodScanner.php b/library/Zend/Code/Scanner/MethodScanner.php
old mode 100755
new mode 100644
index e92b4d109..3724fa471
--- a/library/Zend/Code/Scanner/MethodScanner.php
+++ b/library/Zend/Code/Scanner/MethodScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/ParameterScanner.php b/library/Zend/Code/Scanner/ParameterScanner.php
old mode 100755
new mode 100644
index ef15a16c8..d61300605
--- a/library/Zend/Code/Scanner/ParameterScanner.php
+++ b/library/Zend/Code/Scanner/ParameterScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/PropertyScanner.php b/library/Zend/Code/Scanner/PropertyScanner.php
old mode 100755
new mode 100644
index ce38b1585..a5a08651f
--- a/library/Zend/Code/Scanner/PropertyScanner.php
+++ b/library/Zend/Code/Scanner/PropertyScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/ScannerInterface.php b/library/Zend/Code/Scanner/ScannerInterface.php
old mode 100755
new mode 100644
index 8acb04ecd..f832edac4
--- a/library/Zend/Code/Scanner/ScannerInterface.php
+++ b/library/Zend/Code/Scanner/ScannerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/TokenArrayScanner.php b/library/Zend/Code/Scanner/TokenArrayScanner.php
old mode 100755
new mode 100644
index 72d27f6d2..c04be33e3
--- a/library/Zend/Code/Scanner/TokenArrayScanner.php
+++ b/library/Zend/Code/Scanner/TokenArrayScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/Util.php b/library/Zend/Code/Scanner/Util.php
old mode 100755
new mode 100644
index e54ae0b88..dbd5bf7a4
--- a/library/Zend/Code/Scanner/Util.php
+++ b/library/Zend/Code/Scanner/Util.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/Scanner/ValueScanner.php b/library/Zend/Code/Scanner/ValueScanner.php
old mode 100755
new mode 100644
index d0826cc24..0a87cc015
--- a/library/Zend/Code/Scanner/ValueScanner.php
+++ b/library/Zend/Code/Scanner/ValueScanner.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Code/composer.json b/library/Zend/Code/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Config/AbstractConfigFactory.php b/library/Zend/Config/AbstractConfigFactory.php
old mode 100755
new mode 100644
index 20f04be02..2f19f392a
--- a/library/Zend/Config/AbstractConfigFactory.php
+++ b/library/Zend/Config/AbstractConfigFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/CONTRIBUTING.md b/library/Zend/Config/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Config/Config.php b/library/Zend/Config/Config.php
old mode 100755
new mode 100644
index 17b679782..402b6e42e
--- a/library/Zend/Config/Config.php
+++ b/library/Zend/Config/Config.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Exception/ExceptionInterface.php b/library/Zend/Config/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index d6e0240f1..087bfe33a
--- a/library/Zend/Config/Exception/ExceptionInterface.php
+++ b/library/Zend/Config/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Exception/InvalidArgumentException.php b/library/Zend/Config/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 11e49110b..0b9421eb0
--- a/library/Zend/Config/Exception/InvalidArgumentException.php
+++ b/library/Zend/Config/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Exception/RuntimeException.php b/library/Zend/Config/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 6ed90a20c..b9e145c92
--- a/library/Zend/Config/Exception/RuntimeException.php
+++ b/library/Zend/Config/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Factory.php b/library/Zend/Config/Factory.php
old mode 100755
new mode 100644
index 9646bf0c5..38256aca7
--- a/library/Zend/Config/Factory.php
+++ b/library/Zend/Config/Factory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -34,10 +34,11 @@ class Factory
      * @var array
      */
     protected static $extensions = array(
-        'ini'  => 'ini',
-        'json' => 'json',
-        'xml'  => 'xml',
-        'yaml' => 'yaml',
+        'ini'         => 'ini',
+        'json'        => 'json',
+        'xml'         => 'xml',
+        'yaml'        => 'yaml',
+        'properties'  => 'javaproperties',
     );
 
     /**
diff --git a/library/Zend/Config/Processor/Constant.php b/library/Zend/Config/Processor/Constant.php
old mode 100755
new mode 100644
index 28f76b9a7..069b8a8d2
--- a/library/Zend/Config/Processor/Constant.php
+++ b/library/Zend/Config/Processor/Constant.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Processor/Filter.php b/library/Zend/Config/Processor/Filter.php
old mode 100755
new mode 100644
index 99909f289..3a2b1cb95
--- a/library/Zend/Config/Processor/Filter.php
+++ b/library/Zend/Config/Processor/Filter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Processor/ProcessorInterface.php b/library/Zend/Config/Processor/ProcessorInterface.php
old mode 100755
new mode 100644
index 6aa28e91c..2ee94f204
--- a/library/Zend/Config/Processor/ProcessorInterface.php
+++ b/library/Zend/Config/Processor/ProcessorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Processor/Queue.php b/library/Zend/Config/Processor/Queue.php
old mode 100755
new mode 100644
index 9a7905f21..2dddd42fb
--- a/library/Zend/Config/Processor/Queue.php
+++ b/library/Zend/Config/Processor/Queue.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Processor/Token.php b/library/Zend/Config/Processor/Token.php
old mode 100755
new mode 100644
index 2af2e1b3f..cf0ecab86
--- a/library/Zend/Config/Processor/Token.php
+++ b/library/Zend/Config/Processor/Token.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Processor/Translator.php b/library/Zend/Config/Processor/Translator.php
old mode 100755
new mode 100644
index 48c0985de..f33a891ae
--- a/library/Zend/Config/Processor/Translator.php
+++ b/library/Zend/Config/Processor/Translator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/README.md b/library/Zend/Config/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Config/Reader/Ini.php b/library/Zend/Config/Reader/Ini.php
old mode 100755
new mode 100644
index 343668549..b78a21d9e
--- a/library/Zend/Config/Reader/Ini.php
+++ b/library/Zend/Config/Reader/Ini.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Reader/JavaProperties.php b/library/Zend/Config/Reader/JavaProperties.php
old mode 100755
new mode 100644
index 965bd3c80..24613d97b
--- a/library/Zend/Config/Reader/JavaProperties.php
+++ b/library/Zend/Config/Reader/JavaProperties.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Reader/Json.php b/library/Zend/Config/Reader/Json.php
old mode 100755
new mode 100644
index 407e2aafa..9e60d413b
--- a/library/Zend/Config/Reader/Json.php
+++ b/library/Zend/Config/Reader/Json.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Reader/ReaderInterface.php b/library/Zend/Config/Reader/ReaderInterface.php
old mode 100755
new mode 100644
index 0393fe052..1394943c7
--- a/library/Zend/Config/Reader/ReaderInterface.php
+++ b/library/Zend/Config/Reader/ReaderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Reader/Xml.php b/library/Zend/Config/Reader/Xml.php
old mode 100755
new mode 100644
index 348354fab..b0cb4bb9f
--- a/library/Zend/Config/Reader/Xml.php
+++ b/library/Zend/Config/Reader/Xml.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -59,7 +59,6 @@ class Xml implements ReaderInterface
                 $filename
             ));
         }
-
         $this->reader = new XMLReader();
         $this->reader->open($filename, null, LIBXML_XINCLUDE);
 
@@ -76,6 +75,7 @@ class Xml implements ReaderInterface
         );
         $return = $this->process();
         restore_error_handler();
+        $this->reader->close();
 
         return $return;
     }
@@ -110,6 +110,7 @@ class Xml implements ReaderInterface
         );
         $return = $this->process();
         restore_error_handler();
+        $this->reader->close();
 
         return $return;
     }
diff --git a/library/Zend/Config/Reader/Yaml.php b/library/Zend/Config/Reader/Yaml.php
old mode 100755
new mode 100644
index 709b8b8a6..41f33946c
--- a/library/Zend/Config/Reader/Yaml.php
+++ b/library/Zend/Config/Reader/Yaml.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/ReaderPluginManager.php b/library/Zend/Config/ReaderPluginManager.php
old mode 100755
new mode 100644
index 3e74a5640..4c350643f
--- a/library/Zend/Config/ReaderPluginManager.php
+++ b/library/Zend/Config/ReaderPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -19,10 +19,11 @@ class ReaderPluginManager extends AbstractPluginManager
      * @var array
      */
     protected $invokableClasses = array(
-        'ini'  => 'Zend\Config\Reader\Ini',
-        'json' => 'Zend\Config\Reader\Json',
-        'xml'  => 'Zend\Config\Reader\Xml',
-        'yaml' => 'Zend\Config\Reader\Yaml',
+        'ini'             => 'Zend\Config\Reader\Ini',
+        'json'            => 'Zend\Config\Reader\Json',
+        'xml'             => 'Zend\Config\Reader\Xml',
+        'yaml'            => 'Zend\Config\Reader\Yaml',
+        'javaproperties'  => 'Zend\Config\Reader\JavaProperties',
     );
 
     /**
diff --git a/library/Zend/Config/Writer/AbstractWriter.php b/library/Zend/Config/Writer/AbstractWriter.php
old mode 100755
new mode 100644
index a02111f7d..0acd8453e
--- a/library/Zend/Config/Writer/AbstractWriter.php
+++ b/library/Zend/Config/Writer/AbstractWriter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Writer/Ini.php b/library/Zend/Config/Writer/Ini.php
old mode 100755
new mode 100644
index 9244f73e6..0372d712c
--- a/library/Zend/Config/Writer/Ini.php
+++ b/library/Zend/Config/Writer/Ini.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Writer/Json.php b/library/Zend/Config/Writer/Json.php
old mode 100755
new mode 100644
index 04548495b..78a68b3e4
--- a/library/Zend/Config/Writer/Json.php
+++ b/library/Zend/Config/Writer/Json.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Writer/PhpArray.php b/library/Zend/Config/Writer/PhpArray.php
old mode 100755
new mode 100644
index 352d15842..f70c10b94
--- a/library/Zend/Config/Writer/PhpArray.php
+++ b/library/Zend/Config/Writer/PhpArray.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Writer/WriterInterface.php b/library/Zend/Config/Writer/WriterInterface.php
old mode 100755
new mode 100644
index afbecd104..92e821d45
--- a/library/Zend/Config/Writer/WriterInterface.php
+++ b/library/Zend/Config/Writer/WriterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/Writer/Xml.php b/library/Zend/Config/Writer/Xml.php
old mode 100755
new mode 100644
index 0fd36b959..f388558f0
--- a/library/Zend/Config/Writer/Xml.php
+++ b/library/Zend/Config/Writer/Xml.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -71,7 +71,7 @@ class Xml extends AbstractWriter
 
             if ($branchType === 'numeric') {
                 if (is_array($value)) {
-                    $this->addBranch($value, $value, $writer);
+                    $this->addBranch($branchName, $value, $writer);
                 } else {
                     $writer->writeElement($branchName, (string) $value);
                 }
diff --git a/library/Zend/Config/Writer/Yaml.php b/library/Zend/Config/Writer/Yaml.php
old mode 100755
new mode 100644
index f741ad677..e872d9b76
--- a/library/Zend/Config/Writer/Yaml.php
+++ b/library/Zend/Config/Writer/Yaml.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/WriterPluginManager.php b/library/Zend/Config/WriterPluginManager.php
old mode 100755
new mode 100644
index c70e4415c..9b031ffab
--- a/library/Zend/Config/WriterPluginManager.php
+++ b/library/Zend/Config/WriterPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Config/composer.json b/library/Zend/Config/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Console/Adapter/AbstractAdapter.php b/library/Zend/Console/Adapter/AbstractAdapter.php
old mode 100755
new mode 100644
index 49718034f..c85e47d96
--- a/library/Zend/Console/Adapter/AbstractAdapter.php
+++ b/library/Zend/Console/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Adapter/AdapterInterface.php b/library/Zend/Console/Adapter/AdapterInterface.php
old mode 100755
new mode 100644
index 45407b80a..60f631ee7
--- a/library/Zend/Console/Adapter/AdapterInterface.php
+++ b/library/Zend/Console/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Adapter/Posix.php b/library/Zend/Console/Adapter/Posix.php
old mode 100755
new mode 100644
index 184e6ad92..ee2a3376a
--- a/library/Zend/Console/Adapter/Posix.php
+++ b/library/Zend/Console/Adapter/Posix.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Adapter/Virtual.php b/library/Zend/Console/Adapter/Virtual.php
old mode 100755
new mode 100644
index f1b1eb95e..752a26d28
--- a/library/Zend/Console/Adapter/Virtual.php
+++ b/library/Zend/Console/Adapter/Virtual.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Adapter/Windows.php b/library/Zend/Console/Adapter/Windows.php
old mode 100755
new mode 100644
index c1bf8b734..ce6d4c4f5
--- a/library/Zend/Console/Adapter/Windows.php
+++ b/library/Zend/Console/Adapter/Windows.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Adapter/WindowsAnsicon.php b/library/Zend/Console/Adapter/WindowsAnsicon.php
old mode 100755
new mode 100644
index 3519a9e21..3808ee8aa
--- a/library/Zend/Console/Adapter/WindowsAnsicon.php
+++ b/library/Zend/Console/Adapter/WindowsAnsicon.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/CONTRIBUTING.md b/library/Zend/Console/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Console/Charset/Ascii.php b/library/Zend/Console/Charset/Ascii.php
old mode 100755
new mode 100644
index 0cc326148..e6be409e4
--- a/library/Zend/Console/Charset/Ascii.php
+++ b/library/Zend/Console/Charset/Ascii.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Charset/AsciiExtended.php b/library/Zend/Console/Charset/AsciiExtended.php
old mode 100755
new mode 100644
index 2cdf07c2d..7e4b6ac55
--- a/library/Zend/Console/Charset/AsciiExtended.php
+++ b/library/Zend/Console/Charset/AsciiExtended.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Charset/CharsetInterface.php b/library/Zend/Console/Charset/CharsetInterface.php
old mode 100755
new mode 100644
index c64656c1d..a34ccb445
--- a/library/Zend/Console/Charset/CharsetInterface.php
+++ b/library/Zend/Console/Charset/CharsetInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Charset/DECSG.php b/library/Zend/Console/Charset/DECSG.php
old mode 100755
new mode 100644
index 958de4211..2eada167c
--- a/library/Zend/Console/Charset/DECSG.php
+++ b/library/Zend/Console/Charset/DECSG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Charset/Utf8.php b/library/Zend/Console/Charset/Utf8.php
old mode 100755
new mode 100644
index 63ae157b9..26a846b4a
--- a/library/Zend/Console/Charset/Utf8.php
+++ b/library/Zend/Console/Charset/Utf8.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Charset/Utf8Heavy.php b/library/Zend/Console/Charset/Utf8Heavy.php
old mode 100755
new mode 100644
index 6f9686900..3f0b736ac
--- a/library/Zend/Console/Charset/Utf8Heavy.php
+++ b/library/Zend/Console/Charset/Utf8Heavy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Color/Xterm256.php b/library/Zend/Console/Color/Xterm256.php
old mode 100755
new mode 100644
index 8b367789d..54870cd62
--- a/library/Zend/Console/Color/Xterm256.php
+++ b/library/Zend/Console/Color/Xterm256.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/ColorInterface.php b/library/Zend/Console/ColorInterface.php
old mode 100755
new mode 100644
index b2cc770b4..6fdc3a77b
--- a/library/Zend/Console/ColorInterface.php
+++ b/library/Zend/Console/ColorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Console.php b/library/Zend/Console/Console.php
old mode 100755
new mode 100644
index a3c701346..1d380ddb4
--- a/library/Zend/Console/Console.php
+++ b/library/Zend/Console/Console.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Exception/BadMethodCallException.php b/library/Zend/Console/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index aa650fc04..65daaf4bd
--- a/library/Zend/Console/Exception/BadMethodCallException.php
+++ b/library/Zend/Console/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Exception/ExceptionInterface.php b/library/Zend/Console/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 70d8baf81..9830733ae
--- a/library/Zend/Console/Exception/ExceptionInterface.php
+++ b/library/Zend/Console/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Exception/InvalidArgumentException.php b/library/Zend/Console/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index ad3b4e97b..c930f2233
--- a/library/Zend/Console/Exception/InvalidArgumentException.php
+++ b/library/Zend/Console/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Exception/RuntimeException.php b/library/Zend/Console/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 6551912c4..de79db526
--- a/library/Zend/Console/Exception/RuntimeException.php
+++ b/library/Zend/Console/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Getopt.php b/library/Zend/Console/Getopt.php
old mode 100755
new mode 100644
index 12493264a..77e830bae
--- a/library/Zend/Console/Getopt.php
+++ b/library/Zend/Console/Getopt.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Prompt/AbstractPrompt.php b/library/Zend/Console/Prompt/AbstractPrompt.php
old mode 100755
new mode 100644
index cd717cf35..225533cef
--- a/library/Zend/Console/Prompt/AbstractPrompt.php
+++ b/library/Zend/Console/Prompt/AbstractPrompt.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Prompt/Char.php b/library/Zend/Console/Prompt/Char.php
old mode 100755
new mode 100644
index b6c305145..a16e3fc65
--- a/library/Zend/Console/Prompt/Char.php
+++ b/library/Zend/Console/Prompt/Char.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Prompt/Confirm.php b/library/Zend/Console/Prompt/Confirm.php
old mode 100755
new mode 100644
index f660452be..674657903
--- a/library/Zend/Console/Prompt/Confirm.php
+++ b/library/Zend/Console/Prompt/Confirm.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Prompt/Line.php b/library/Zend/Console/Prompt/Line.php
old mode 100755
new mode 100644
index 7a7427d7a..3b2bb784d
--- a/library/Zend/Console/Prompt/Line.php
+++ b/library/Zend/Console/Prompt/Line.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Prompt/Number.php b/library/Zend/Console/Prompt/Number.php
old mode 100755
new mode 100644
index 8ce533005..7f096a7e1
--- a/library/Zend/Console/Prompt/Number.php
+++ b/library/Zend/Console/Prompt/Number.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Prompt/PromptInterface.php b/library/Zend/Console/Prompt/PromptInterface.php
old mode 100755
new mode 100644
index da1b6215c..54e8615c1
--- a/library/Zend/Console/Prompt/PromptInterface.php
+++ b/library/Zend/Console/Prompt/PromptInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Prompt/Select.php b/library/Zend/Console/Prompt/Select.php
old mode 100755
new mode 100644
index 050a97d53..e31361cf2
--- a/library/Zend/Console/Prompt/Select.php
+++ b/library/Zend/Console/Prompt/Select.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/README.md b/library/Zend/Console/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Console/Request.php b/library/Zend/Console/Request.php
old mode 100755
new mode 100644
index 57b48bb2c..1c885c4f3
--- a/library/Zend/Console/Request.php
+++ b/library/Zend/Console/Request.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/Response.php b/library/Zend/Console/Response.php
old mode 100755
new mode 100644
index 75a068614..b6784257d
--- a/library/Zend/Console/Response.php
+++ b/library/Zend/Console/Response.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/RouteMatcher/DefaultRouteMatcher.php b/library/Zend/Console/RouteMatcher/DefaultRouteMatcher.php
old mode 100755
new mode 100644
index a5f8fae57..07a65504e
--- a/library/Zend/Console/RouteMatcher/DefaultRouteMatcher.php
+++ b/library/Zend/Console/RouteMatcher/DefaultRouteMatcher.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/RouteMatcher/RouteMatcherInterface.php b/library/Zend/Console/RouteMatcher/RouteMatcherInterface.php
old mode 100755
new mode 100644
index 62f463c33..b8d5bac79
--- a/library/Zend/Console/RouteMatcher/RouteMatcherInterface.php
+++ b/library/Zend/Console/RouteMatcher/RouteMatcherInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Console/composer.json b/library/Zend/Console/composer.json
old mode 100755
new mode 100644
index 404a7c254..8265ef2bd
--- a/library/Zend/Console/composer.json
+++ b/library/Zend/Console/composer.json
@@ -17,6 +17,10 @@
         "php": ">=5.3.23",
         "zendframework/zend-stdlib": "self.version"
     },
+    "suggest": {
+        "zendframework/zend-validator": "To support DefaultRouteMatcher usage",
+        "zendframework/zend-filter": "To support DefaultRouteMatcher usage"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.3-dev",
diff --git a/library/Zend/Crypt/BlockCipher.php b/library/Zend/Crypt/BlockCipher.php
old mode 100755
new mode 100644
index 9b2a713ec..4cba25617
--- a/library/Zend/Crypt/BlockCipher.php
+++ b/library/Zend/Crypt/BlockCipher.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/CONTRIBUTING.md b/library/Zend/Crypt/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Crypt/Exception/ExceptionInterface.php b/library/Zend/Crypt/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index ef9374361..0748e326d
--- a/library/Zend/Crypt/Exception/ExceptionInterface.php
+++ b/library/Zend/Crypt/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Exception/InvalidArgumentException.php b/library/Zend/Crypt/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 723593b38..2e64150bf
--- a/library/Zend/Crypt/Exception/InvalidArgumentException.php
+++ b/library/Zend/Crypt/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Exception/RuntimeException.php b/library/Zend/Crypt/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 052566ff4..037a448d4
--- a/library/Zend/Crypt/Exception/RuntimeException.php
+++ b/library/Zend/Crypt/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Hash.php b/library/Zend/Crypt/Hash.php
old mode 100755
new mode 100644
index ccbd15d3b..826cc8888
--- a/library/Zend/Crypt/Hash.php
+++ b/library/Zend/Crypt/Hash.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Hmac.php b/library/Zend/Crypt/Hmac.php
old mode 100755
new mode 100644
index decde91b0..5e3ee975d
--- a/library/Zend/Crypt/Hmac.php
+++ b/library/Zend/Crypt/Hmac.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php b/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index e87602e93..b513962a5
--- a/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php
+++ b/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php b/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 02f3b5f5a..a82f9e3b7
--- a/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php
+++ b/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php b/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php
old mode 100755
new mode 100644
index e35903854..85b8c1726
--- a/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php
+++ b/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Key/Derivation/Pbkdf2.php b/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
old mode 100755
new mode 100644
index 8d216d646..af3835a4e
--- a/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
+++ b/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Key/Derivation/SaltedS2k.php b/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
old mode 100755
new mode 100644
index 763d2f53a..4a01e1907
--- a/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
+++ b/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -15,6 +15,7 @@ namespace Zend\Crypt\Key\Derivation;
 class SaltedS2k
 {
     protected static $supportedMhashAlgos = array (
+        'adler32'    => MHASH_ADLER32,
         'md2'        => MHASH_MD2,
         'md4'        => MHASH_MD4,
         'md5'        => MHASH_MD5,
@@ -26,13 +27,21 @@ class SaltedS2k
         'ripemd128'  => MHASH_RIPEMD128,
         'ripemd256'  => MHASH_RIPEMD256,
         'ripemd320'  => MHASH_RIPEMD320,
-        'haval128,3' => MHASH_HAVAL128,
-        'haval160,3' => MHASH_HAVAL160,
-        'haval192,3' => MHASH_HAVAL192,
-        'haval224,3' => MHASH_HAVAL224,
-        'haval256,3' => MHASH_HAVAL256,
-        'tiger128,3' => MHASH_TIGER128,
-        'riger160,3' => MHASH_TIGER160,
+        'haval128,3' => MHASH_HAVAL128, // @deprecated use haval128 instead
+        'haval128'   => MHASH_HAVAL128,
+        'haval160,3' => MHASH_HAVAL160, // @deprecated use haval160 instead
+        'haval160'   => MHASH_HAVAL160,
+        'haval192,3' => MHASH_HAVAL192, // @deprecated use haval192 instead
+        'haval192'   => MHASH_HAVAL192,
+        'haval224,3' => MHASH_HAVAL224, // @deprecated use haval224 instead
+        'haval224'   => MHASH_HAVAL224,
+        'haval256,3' => MHASH_HAVAL256, // @deprecated use haval256 instead
+        'haval256'   => MHASH_HAVAL256,
+        'tiger'      => MHASH_TIGER,
+        'tiger128,3' => MHASH_TIGER128, // @deprecated use tiger128 instead
+        'tiger128'   => MHASH_TIGER128,
+        'tiger160,3' => MHASH_TIGER160, // @deprecated use tiger160 instead
+        'tiger160'   => MHASH_TIGER160,
         'whirpool'   => MHASH_WHIRLPOOL,
         'snefru256'  => MHASH_SNEFRU256,
         'gost'       => MHASH_GOST,
diff --git a/library/Zend/Crypt/Key/Derivation/Scrypt.php b/library/Zend/Crypt/Key/Derivation/Scrypt.php
old mode 100755
new mode 100644
index da2a78367..a5923dea8
--- a/library/Zend/Crypt/Key/Derivation/Scrypt.php
+++ b/library/Zend/Crypt/Key/Derivation/Scrypt.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Password/Apache.php b/library/Zend/Crypt/Password/Apache.php
old mode 100755
new mode 100644
index d9359827a..7bbb3dc65
--- a/library/Zend/Crypt/Password/Apache.php
+++ b/library/Zend/Crypt/Password/Apache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Password/Bcrypt.php b/library/Zend/Crypt/Password/Bcrypt.php
old mode 100755
new mode 100644
index b489ddd48..94e6e89fa
--- a/library/Zend/Crypt/Password/Bcrypt.php
+++ b/library/Zend/Crypt/Password/Bcrypt.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -34,11 +34,6 @@ class Bcrypt implements PasswordInterface
      */
     protected $salt;
 
-    /**
-     * @var bool
-     */
-    protected $backwardCompatibility = false;
-
     /**
      * Constructor
      *
@@ -87,19 +82,7 @@ class Bcrypt implements PasswordInterface
          * Check for security flaw in the bcrypt implementation used by crypt()
          * @see http://php.net/security/crypt_blowfish.php
          */
-        if ((PHP_VERSION_ID >= 50307) && !$this->backwardCompatibility) {
-            $prefix = '$2y$';
-        } else {
-            $prefix = '$2a$';
-            // check if the password contains 8-bit character
-            if (preg_match('/[\x80-\xFF]/', $password)) {
-                throw new Exception\RuntimeException(
-                    'The bcrypt implementation used by PHP can contain a security flaw ' .
-                    'using password with 8-bit character. ' .
-                    'We suggest to upgrade to PHP 5.3.7+ or use passwords with only 7-bit characters'
-                );
-            }
-        }
+        $prefix = '$2y$';
         $hash = crypt($password, $prefix . $this->cost . '$' . $salt64);
         if (strlen($hash) < 13) {
             throw new Exception\RuntimeException('Error during the bcrypt generation');
@@ -186,22 +169,23 @@ class Bcrypt implements PasswordInterface
     /**
      * Set the backward compatibility $2a$ instead of $2y$ for PHP 5.3.7+
      *
+     * @deprecated since zf 2.3 requires PHP >= 5.3.23
      * @param bool $value
      * @return Bcrypt
      */
     public function setBackwardCompatibility($value)
     {
-        $this->backwardCompatibility = (bool) $value;
         return $this;
     }
 
     /**
      * Get the backward compatibility
      *
+     * @deprecated since zf 2.3 requires PHP >= 5.3.23
      * @return bool
      */
     public function getBackwardCompatibility()
     {
-        return $this->backwardCompatibility;
+        return false;
     }
 }
diff --git a/library/Zend/Crypt/Password/Exception/ExceptionInterface.php b/library/Zend/Crypt/Password/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 5c65fb781..8a3f7229a
--- a/library/Zend/Crypt/Password/Exception/ExceptionInterface.php
+++ b/library/Zend/Crypt/Password/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php b/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 97f1a9d14..3011eb38d
--- a/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php
+++ b/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Password/Exception/RuntimeException.php b/library/Zend/Crypt/Password/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 57f2976cc..9adcf0d4a
--- a/library/Zend/Crypt/Password/Exception/RuntimeException.php
+++ b/library/Zend/Crypt/Password/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Password/PasswordInterface.php b/library/Zend/Crypt/Password/PasswordInterface.php
old mode 100755
new mode 100644
index 1f7683eac..ff106d93d
--- a/library/Zend/Crypt/Password/PasswordInterface.php
+++ b/library/Zend/Crypt/Password/PasswordInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/PublicKey/DiffieHellman.php b/library/Zend/Crypt/PublicKey/DiffieHellman.php
old mode 100755
new mode 100644
index 4d5615fcc..3ca593f2f
--- a/library/Zend/Crypt/PublicKey/DiffieHellman.php
+++ b/library/Zend/Crypt/PublicKey/DiffieHellman.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/PublicKey/Rsa.php b/library/Zend/Crypt/PublicKey/Rsa.php
old mode 100755
new mode 100644
index 44faaa7d7..8561ea758
--- a/library/Zend/Crypt/PublicKey/Rsa.php
+++ b/library/Zend/Crypt/PublicKey/Rsa.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php b/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php
old mode 100755
new mode 100644
index 5051c7716..b87e84b1b
--- a/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php b/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index ccaad1b39..7c8efca24
--- a/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php b/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 857a15252..ede577884
--- a/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php b/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php
old mode 100755
new mode 100644
index bdbf10bf1..09497448c
--- a/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php b/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php
old mode 100755
new mode 100644
index 54ebd5f5f..164de3122
--- a/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php b/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php
old mode 100755
new mode 100644
index d73078d28..b8e1e56dc
--- a/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php
+++ b/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/PublicKey/RsaOptions.php b/library/Zend/Crypt/PublicKey/RsaOptions.php
old mode 100755
new mode 100644
index 54cd7c55b..b8aca7574
--- a/library/Zend/Crypt/PublicKey/RsaOptions.php
+++ b/library/Zend/Crypt/PublicKey/RsaOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/README.md b/library/Zend/Crypt/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php b/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 7e62c51b2..e78ede758
--- a/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php
+++ b/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php b/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index fa85f6784..dcf71f999
--- a/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php
+++ b/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php b/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 5dd9386a5..1ce2b0c64
--- a/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php
+++ b/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Symmetric/Mcrypt.php b/library/Zend/Crypt/Symmetric/Mcrypt.php
old mode 100755
new mode 100644
index acdb26a1a..38fd84733
--- a/library/Zend/Crypt/Symmetric/Mcrypt.php
+++ b/library/Zend/Crypt/Symmetric/Mcrypt.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php b/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php
old mode 100755
new mode 100644
index 24050c311..29e3155dc
--- a/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php
+++ b/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php b/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php
old mode 100755
new mode 100644
index df4add46d..3ce1478a4
--- a/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php
+++ b/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Symmetric/PaddingPluginManager.php b/library/Zend/Crypt/Symmetric/PaddingPluginManager.php
old mode 100755
new mode 100644
index 48ae0690d..10f8c6538
--- a/library/Zend/Crypt/Symmetric/PaddingPluginManager.php
+++ b/library/Zend/Crypt/Symmetric/PaddingPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Symmetric/SymmetricInterface.php b/library/Zend/Crypt/Symmetric/SymmetricInterface.php
old mode 100755
new mode 100644
index acf160e96..ea4627e9c
--- a/library/Zend/Crypt/Symmetric/SymmetricInterface.php
+++ b/library/Zend/Crypt/Symmetric/SymmetricInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/SymmetricPluginManager.php b/library/Zend/Crypt/SymmetricPluginManager.php
old mode 100755
new mode 100644
index 5f49cccc2..261edd961
--- a/library/Zend/Crypt/SymmetricPluginManager.php
+++ b/library/Zend/Crypt/SymmetricPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/Utils.php b/library/Zend/Crypt/Utils.php
old mode 100755
new mode 100644
index ff013dcbc..7d4685fb4
--- a/library/Zend/Crypt/Utils.php
+++ b/library/Zend/Crypt/Utils.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Crypt/composer.json b/library/Zend/Crypt/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Db/Adapter/Adapter.php b/library/Zend/Db/Adapter/Adapter.php
old mode 100755
new mode 100644
index b4c7edfff..1ad6fb1fd
--- a/library/Zend/Db/Adapter/Adapter.php
+++ b/library/Zend/Db/Adapter/Adapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -160,6 +160,7 @@ class Adapter implements AdapterInterface, Profiler\ProfilerAwareInterface
      *
      * @param string $sql
      * @param string|array|ParameterContainer $parametersOrQueryMode
+     * @param \Zend\Db\ResultSet\ResultSetInterface $resultPrototype
      * @throws Exception\InvalidArgumentException
      * @return Driver\StatementInterface|ResultSet\ResultSet
      */
diff --git a/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php b/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php
old mode 100755
new mode 100644
index 42800a2ce..b40865e7a
--- a/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php
+++ b/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/AdapterAwareInterface.php b/library/Zend/Db/Adapter/AdapterAwareInterface.php
old mode 100755
new mode 100644
index 95443a9a0..3013fd4ce
--- a/library/Zend/Db/Adapter/AdapterAwareInterface.php
+++ b/library/Zend/Db/Adapter/AdapterAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/AdapterAwareTrait.php b/library/Zend/Db/Adapter/AdapterAwareTrait.php
old mode 100755
new mode 100644
index 3df7b36b1..be888d9f1
--- a/library/Zend/Db/Adapter/AdapterAwareTrait.php
+++ b/library/Zend/Db/Adapter/AdapterAwareTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/AdapterInterface.php b/library/Zend/Db/Adapter/AdapterInterface.php
old mode 100755
new mode 100644
index 57a6a7376..a9310671a
--- a/library/Zend/Db/Adapter/AdapterInterface.php
+++ b/library/Zend/Db/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/AdapterServiceFactory.php b/library/Zend/Db/Adapter/AdapterServiceFactory.php
old mode 100755
new mode 100644
index f0619ad8e..2f418ce64
--- a/library/Zend/Db/Adapter/AdapterServiceFactory.php
+++ b/library/Zend/Db/Adapter/AdapterServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/ConnectionInterface.php b/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
old mode 100755
new mode 100644
index 2e27fd688..0ac8a3991
--- a/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
+++ b/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/DriverInterface.php b/library/Zend/Db/Adapter/Driver/DriverInterface.php
old mode 100755
new mode 100644
index 98bbc835d..3bddb1930
--- a/library/Zend/Db/Adapter/Driver/DriverInterface.php
+++ b/library/Zend/Db/Adapter/Driver/DriverInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php b/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php
old mode 100755
new mode 100644
index 22ba95478..b30eb8eae
--- a/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php
+++ b/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php b/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php
old mode 100755
new mode 100644
index 10c96f773..405f2f713
--- a/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php
+++ b/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php b/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
old mode 100755
new mode 100644
index 536497410..7d756e355
--- a/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
+++ b/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php b/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php
old mode 100755
new mode 100644
index d129b49b3..783e0f40c
--- a/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php
+++ b/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php b/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php
old mode 100755
new mode 100644
index add4e1e3f..b425f2483
--- a/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php
+++ b/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php b/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
old mode 100755
new mode 100644
index 029a9ed27..35c4243a1
--- a/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
+++ b/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php b/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
old mode 100755
new mode 100644
index d84db10fe..587d25f36
--- a/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
+++ b/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php b/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
old mode 100755
new mode 100644
index 443350ca1..4fcc55842
--- a/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
+++ b/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Mysqli/Result.php b/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
old mode 100755
new mode 100644
index 11622b15a..d620ee15a
--- a/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
+++ b/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php b/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
old mode 100755
new mode 100644
index d462cd177..1c68e37cd
--- a/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
+++ b/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Oci8/Connection.php b/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
old mode 100755
new mode 100644
index 73376521e..0bb3b2544
--- a/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
+++ b/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php b/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
old mode 100755
new mode 100644
index 9685f8c41..c846df725
--- a/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
+++ b/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Oci8/Result.php b/library/Zend/Db/Adapter/Driver/Oci8/Result.php
old mode 100755
new mode 100644
index f0ae96abd..b993743f1
--- a/library/Zend/Db/Adapter/Driver/Oci8/Result.php
+++ b/library/Zend/Db/Adapter/Driver/Oci8/Result.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Oci8/Statement.php b/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
old mode 100755
new mode 100644
index 707442fde..15d5fb5b8
--- a/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
+++ b/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Pdo/Connection.php b/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
old mode 100755
new mode 100644
index 1cd2c6667..7a8bff4ca
--- a/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
+++ b/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Pdo/Feature/OracleRowCounter.php b/library/Zend/Db/Adapter/Driver/Pdo/Feature/OracleRowCounter.php
old mode 100755
new mode 100644
index 2a25cdd6b..1f62aa6ec
--- a/library/Zend/Db/Adapter/Driver/Pdo/Feature/OracleRowCounter.php
+++ b/library/Zend/Db/Adapter/Driver/Pdo/Feature/OracleRowCounter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php b/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php
old mode 100755
new mode 100644
index 13c8d66d4..2a73c663e
--- a/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php
+++ b/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php b/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
old mode 100755
new mode 100644
index 3de7beb49..6c8c0073e
--- a/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
+++ b/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Pdo/Result.php b/library/Zend/Db/Adapter/Driver/Pdo/Result.php
old mode 100755
new mode 100644
index 9323282d6..613abb12b
--- a/library/Zend/Db/Adapter/Driver/Pdo/Result.php
+++ b/library/Zend/Db/Adapter/Driver/Pdo/Result.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Pdo/Statement.php b/library/Zend/Db/Adapter/Driver/Pdo/Statement.php
old mode 100755
new mode 100644
index 891bec9d7..244863984
--- a/library/Zend/Db/Adapter/Driver/Pdo/Statement.php
+++ b/library/Zend/Db/Adapter/Driver/Pdo/Statement.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php b/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
old mode 100755
new mode 100644
index fa91289a4..8aa80819c
--- a/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
+++ b/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -155,30 +155,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
             return $this;
         }
 
-        // localize
-        $p = $this->connectionParameters;
-
-        // given a list of key names, test for existence in $p
-        $findParameterValue = function (array $names) use ($p) {
-            foreach ($names as $name) {
-                if (isset($p[$name])) {
-                    return $p[$name];
-                }
-            }
-            return null;
-        };
-
-        $connection             = array();
-        $connection['host']     = $findParameterValue(array('hostname', 'host'));
-        $connection['user']     = $findParameterValue(array('username', 'user'));
-        $connection['password'] = $findParameterValue(array('password', 'passwd', 'pw'));
-        $connection['dbname']   = $findParameterValue(array('database', 'dbname', 'db', 'schema'));
-        $connection['port']     = (isset($p['port'])) ? (int) $p['port'] : null;
-        $connection['socket']   = (isset($p['socket'])) ? $p['socket'] : null;
-
-        $connection = array_filter($connection); // remove nulls
-        $connection = http_build_query($connection, null, ' '); // @link http://php.net/pg_connect
-
+        $connection = $this->getConnectionString();
         set_error_handler(function ($number, $string) {
             throw new Exception\RuntimeException(
                 __METHOD__ . ': Unable to connect to database', null, new Exception\ErrorException($string, $number)
@@ -308,4 +285,36 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
         $result = pg_query($this->resource, 'SELECT CURRVAL(\'' . str_replace('\'', '\\\'', $name) . '\') as "currval"');
         return pg_fetch_result($result, 0, 'currval');
     }
+
+    /**
+     * Get Connection String
+     *
+     * @return string
+     */
+    private function getConnectionString()
+    {
+        // localize
+        $p = $this->connectionParameters;
+
+        // given a list of key names, test for existence in $p
+        $findParameterValue = function (array $names) use ($p) {
+            foreach ($names as $name) {
+                if (isset($p[$name])) {
+                    return $p[$name];
+                }
+            }
+            return null;
+        };
+
+        $connectionParameters = array(
+            'host'     => $findParameterValue(array('hostname', 'host')),
+            'user'     => $findParameterValue(array('username', 'user')),
+            'password' => $findParameterValue(array('password', 'passwd', 'pw')),
+            'dbname'   => $findParameterValue(array('database', 'dbname', 'db', 'schema')),
+            'port'     => isset($p['port']) ? (int) $p['port'] : null,
+            'socket'   => isset($p['socket']) ? $p['socket'] : null,
+        );
+
+        return urldecode(http_build_query(array_filter($connectionParameters), null, ' '));
+    }
 }
diff --git a/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php b/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php
old mode 100755
new mode 100644
index 36e5e0f29..b186fe829
--- a/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php
+++ b/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Pgsql/Result.php b/library/Zend/Db/Adapter/Driver/Pgsql/Result.php
old mode 100755
new mode 100644
index 6c2410dae..a37391468
--- a/library/Zend/Db/Adapter/Driver/Pgsql/Result.php
+++ b/library/Zend/Db/Adapter/Driver/Pgsql/Result.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php b/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
old mode 100755
new mode 100644
index c105a6647..c58a70559
--- a/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
+++ b/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/ResultInterface.php b/library/Zend/Db/Adapter/Driver/ResultInterface.php
old mode 100755
new mode 100644
index cb1f40784..fd83b9d7e
--- a/library/Zend/Db/Adapter/Driver/ResultInterface.php
+++ b/library/Zend/Db/Adapter/Driver/ResultInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
old mode 100755
new mode 100644
index f0d859a4a..9fcd36754
--- a/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
+++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ErrorException.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ErrorException.php
old mode 100755
new mode 100644
index 9976eee63..40b15abec
--- a/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ErrorException.php
+++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ErrorException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ExceptionInterface.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index a7168e8d6..2a039d96b
--- a/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ExceptionInterface.php
+++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
old mode 100755
new mode 100644
index cc7f9bebc..dafefbfde
--- a/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
+++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
old mode 100755
new mode 100644
index 0cb8b2435..dc917d4d9
--- a/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
+++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
old mode 100755
new mode 100644
index 4aefa9ff9..c0b83ff11
--- a/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
+++ b/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
@@ -4,7 +4,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Driver/StatementInterface.php b/library/Zend/Db/Adapter/Driver/StatementInterface.php
old mode 100755
new mode 100644
index a1ba56709..6c9e8858a
--- a/library/Zend/Db/Adapter/Driver/StatementInterface.php
+++ b/library/Zend/Db/Adapter/Driver/StatementInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Exception/ErrorException.php b/library/Zend/Db/Adapter/Exception/ErrorException.php
old mode 100755
new mode 100644
index 125550a24..5704ad1a6
--- a/library/Zend/Db/Adapter/Exception/ErrorException.php
+++ b/library/Zend/Db/Adapter/Exception/ErrorException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Exception/ExceptionInterface.php b/library/Zend/Db/Adapter/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 3f3660d99..afd43b6ad
--- a/library/Zend/Db/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/Db/Adapter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php b/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 5cf7a4bfa..392677d7d
--- a/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php b/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php
old mode 100755
new mode 100644
index d1c035afc..bb75d0c0e
--- a/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php
+++ b/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Exception/InvalidQueryException.php b/library/Zend/Db/Adapter/Exception/InvalidQueryException.php
old mode 100755
new mode 100644
index 1372237fe..f24c84c4b
--- a/library/Zend/Db/Adapter/Exception/InvalidQueryException.php
+++ b/library/Zend/Db/Adapter/Exception/InvalidQueryException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Exception/RuntimeException.php b/library/Zend/Db/Adapter/Exception/RuntimeException.php
old mode 100755
new mode 100644
index e1ff78599..81b4fcd54
--- a/library/Zend/Db/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/Db/Adapter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Exception/UnexpectedValueException.php b/library/Zend/Db/Adapter/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index 46859f26d..1e73c6689
--- a/library/Zend/Db/Adapter/Exception/UnexpectedValueException.php
+++ b/library/Zend/Db/Adapter/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/ParameterContainer.php b/library/Zend/Db/Adapter/ParameterContainer.php
old mode 100755
new mode 100644
index 429a65423..e3e9228c7
--- a/library/Zend/Db/Adapter/ParameterContainer.php
+++ b/library/Zend/Db/Adapter/ParameterContainer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Platform/IbmDb2.php b/library/Zend/Db/Adapter/Platform/IbmDb2.php
old mode 100755
new mode 100644
index 693b647e8..182600c2d
--- a/library/Zend/Db/Adapter/Platform/IbmDb2.php
+++ b/library/Zend/Db/Adapter/Platform/IbmDb2.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Platform/Mysql.php b/library/Zend/Db/Adapter/Platform/Mysql.php
old mode 100755
new mode 100644
index 6e02f083a..366901cd6
--- a/library/Zend/Db/Adapter/Platform/Mysql.php
+++ b/library/Zend/Db/Adapter/Platform/Mysql.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Platform/Oracle.php b/library/Zend/Db/Adapter/Platform/Oracle.php
old mode 100755
new mode 100644
index 61f700a49..24390c8dd
--- a/library/Zend/Db/Adapter/Platform/Oracle.php
+++ b/library/Zend/Db/Adapter/Platform/Oracle.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Platform/PlatformInterface.php b/library/Zend/Db/Adapter/Platform/PlatformInterface.php
old mode 100755
new mode 100644
index d8ec05b2b..f0f39f989
--- a/library/Zend/Db/Adapter/Platform/PlatformInterface.php
+++ b/library/Zend/Db/Adapter/Platform/PlatformInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Platform/Postgresql.php b/library/Zend/Db/Adapter/Platform/Postgresql.php
old mode 100755
new mode 100644
index 197aa4537..07149febc
--- a/library/Zend/Db/Adapter/Platform/Postgresql.php
+++ b/library/Zend/Db/Adapter/Platform/Postgresql.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Platform/Sql92.php b/library/Zend/Db/Adapter/Platform/Sql92.php
old mode 100755
new mode 100644
index bbeda46d7..181956c55
--- a/library/Zend/Db/Adapter/Platform/Sql92.php
+++ b/library/Zend/Db/Adapter/Platform/Sql92.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Platform/SqlServer.php b/library/Zend/Db/Adapter/Platform/SqlServer.php
old mode 100755
new mode 100644
index 74a9acb9c..3a21b3c47
--- a/library/Zend/Db/Adapter/Platform/SqlServer.php
+++ b/library/Zend/Db/Adapter/Platform/SqlServer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Platform/Sqlite.php b/library/Zend/Db/Adapter/Platform/Sqlite.php
old mode 100755
new mode 100644
index 340c247e3..5ff195d99
--- a/library/Zend/Db/Adapter/Platform/Sqlite.php
+++ b/library/Zend/Db/Adapter/Platform/Sqlite.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Profiler/Profiler.php b/library/Zend/Db/Adapter/Profiler/Profiler.php
old mode 100755
new mode 100644
index 5115e3f3f..ca0cad057
--- a/library/Zend/Db/Adapter/Profiler/Profiler.php
+++ b/library/Zend/Db/Adapter/Profiler/Profiler.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Profiler/ProfilerAwareInterface.php b/library/Zend/Db/Adapter/Profiler/ProfilerAwareInterface.php
old mode 100755
new mode 100644
index a0b631d94..d6473713c
--- a/library/Zend/Db/Adapter/Profiler/ProfilerAwareInterface.php
+++ b/library/Zend/Db/Adapter/Profiler/ProfilerAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/Profiler/ProfilerInterface.php b/library/Zend/Db/Adapter/Profiler/ProfilerInterface.php
old mode 100755
new mode 100644
index 5f8ee90e2..ed0c6396a
--- a/library/Zend/Db/Adapter/Profiler/ProfilerInterface.php
+++ b/library/Zend/Db/Adapter/Profiler/ProfilerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/StatementContainer.php b/library/Zend/Db/Adapter/StatementContainer.php
old mode 100755
new mode 100644
index 51dff646b..59b7d5060
--- a/library/Zend/Db/Adapter/StatementContainer.php
+++ b/library/Zend/Db/Adapter/StatementContainer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Adapter/StatementContainerInterface.php b/library/Zend/Db/Adapter/StatementContainerInterface.php
old mode 100755
new mode 100644
index 098d6a6fd..fc8964d10
--- a/library/Zend/Db/Adapter/StatementContainerInterface.php
+++ b/library/Zend/Db/Adapter/StatementContainerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/CONTRIBUTING.md b/library/Zend/Db/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Db/Exception/ErrorException.php b/library/Zend/Db/Exception/ErrorException.php
old mode 100755
new mode 100644
index f6915a8c2..6a3d5a290
--- a/library/Zend/Db/Exception/ErrorException.php
+++ b/library/Zend/Db/Exception/ErrorException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Exception/ExceptionInterface.php b/library/Zend/Db/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 9f480dd4e..f8d23d230
--- a/library/Zend/Db/Exception/ExceptionInterface.php
+++ b/library/Zend/Db/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Exception/InvalidArgumentException.php b/library/Zend/Db/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index efeba3a77..52a6f6c01
--- a/library/Zend/Db/Exception/InvalidArgumentException.php
+++ b/library/Zend/Db/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Exception/RuntimeException.php b/library/Zend/Db/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 57ed58476..a95db6571
--- a/library/Zend/Db/Exception/RuntimeException.php
+++ b/library/Zend/Db/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Exception/UnexpectedValueException.php b/library/Zend/Db/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index 9671d8a46..febcd3303
--- a/library/Zend/Db/Exception/UnexpectedValueException.php
+++ b/library/Zend/Db/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Metadata.php b/library/Zend/Db/Metadata/Metadata.php
old mode 100755
new mode 100644
index 3db73d85b..1c4bc0ccb
--- a/library/Zend/Db/Metadata/Metadata.php
+++ b/library/Zend/Db/Metadata/Metadata.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/MetadataInterface.php b/library/Zend/Db/Metadata/MetadataInterface.php
old mode 100755
new mode 100644
index f0f58eb30..1a3772dcf
--- a/library/Zend/Db/Metadata/MetadataInterface.php
+++ b/library/Zend/Db/Metadata/MetadataInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Object/AbstractTableObject.php b/library/Zend/Db/Metadata/Object/AbstractTableObject.php
old mode 100755
new mode 100644
index e315e8913..d51859e64
--- a/library/Zend/Db/Metadata/Object/AbstractTableObject.php
+++ b/library/Zend/Db/Metadata/Object/AbstractTableObject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Object/ColumnObject.php b/library/Zend/Db/Metadata/Object/ColumnObject.php
old mode 100755
new mode 100644
index e76a91a99..ef529b67e
--- a/library/Zend/Db/Metadata/Object/ColumnObject.php
+++ b/library/Zend/Db/Metadata/Object/ColumnObject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Object/ConstraintKeyObject.php b/library/Zend/Db/Metadata/Object/ConstraintKeyObject.php
old mode 100755
new mode 100644
index 568368805..81147bf6b
--- a/library/Zend/Db/Metadata/Object/ConstraintKeyObject.php
+++ b/library/Zend/Db/Metadata/Object/ConstraintKeyObject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Object/ConstraintObject.php b/library/Zend/Db/Metadata/Object/ConstraintObject.php
old mode 100755
new mode 100644
index 089c5ea1f..4c10c296f
--- a/library/Zend/Db/Metadata/Object/ConstraintObject.php
+++ b/library/Zend/Db/Metadata/Object/ConstraintObject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Object/TableObject.php b/library/Zend/Db/Metadata/Object/TableObject.php
old mode 100755
new mode 100644
index 8735fbfc8..1a3ea4094
--- a/library/Zend/Db/Metadata/Object/TableObject.php
+++ b/library/Zend/Db/Metadata/Object/TableObject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Object/TriggerObject.php b/library/Zend/Db/Metadata/Object/TriggerObject.php
old mode 100755
new mode 100644
index eece8c4f4..d0e424ac0
--- a/library/Zend/Db/Metadata/Object/TriggerObject.php
+++ b/library/Zend/Db/Metadata/Object/TriggerObject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Object/ViewObject.php b/library/Zend/Db/Metadata/Object/ViewObject.php
old mode 100755
new mode 100644
index 5130e9ecc..a580d4808
--- a/library/Zend/Db/Metadata/Object/ViewObject.php
+++ b/library/Zend/Db/Metadata/Object/ViewObject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Source/AbstractSource.php b/library/Zend/Db/Metadata/Source/AbstractSource.php
old mode 100755
new mode 100644
index 63d63a928..7b57dc29b
--- a/library/Zend/Db/Metadata/Source/AbstractSource.php
+++ b/library/Zend/Db/Metadata/Source/AbstractSource.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Source/MysqlMetadata.php b/library/Zend/Db/Metadata/Source/MysqlMetadata.php
old mode 100755
new mode 100644
index ac9642f9c..4c28f3f25
--- a/library/Zend/Db/Metadata/Source/MysqlMetadata.php
+++ b/library/Zend/Db/Metadata/Source/MysqlMetadata.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Source/OracleMetadata.php b/library/Zend/Db/Metadata/Source/OracleMetadata.php
old mode 100755
new mode 100644
index 44deac13d..3207dc6cc
--- a/library/Zend/Db/Metadata/Source/OracleMetadata.php
+++ b/library/Zend/Db/Metadata/Source/OracleMetadata.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php b/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
old mode 100755
new mode 100644
index bb274487d..ca58ce8d7
--- a/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
+++ b/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Source/SqlServerMetadata.php b/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
old mode 100755
new mode 100644
index b2b3e76fa..8c1fe7ef0
--- a/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
+++ b/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Metadata/Source/SqliteMetadata.php b/library/Zend/Db/Metadata/Source/SqliteMetadata.php
old mode 100755
new mode 100644
index f3869af8c..0fc1e15bc
--- a/library/Zend/Db/Metadata/Source/SqliteMetadata.php
+++ b/library/Zend/Db/Metadata/Source/SqliteMetadata.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -78,9 +78,6 @@ class SqliteMetadata extends AbstractSource
         $this->prepareDataHierarchy('columns', $schema, $table);
         $this->prepareDataHierarchy('sqlite_columns', $schema, $table);
 
-        $p = $this->adapter->getPlatform();
-
-
         $results = $this->fetchPragma('table_info', $table, $schema);
 
         $columns = array();
diff --git a/library/Zend/Db/README.md b/library/Zend/Db/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Db/ResultSet/AbstractResultSet.php b/library/Zend/Db/ResultSet/AbstractResultSet.php
old mode 100755
new mode 100644
index 0db4c2d38..a5cbb6822
--- a/library/Zend/Db/ResultSet/AbstractResultSet.php
+++ b/library/Zend/Db/ResultSet/AbstractResultSet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -171,7 +171,9 @@ abstract class AbstractResultSet implements Iterator, ResultSetInterface
         if ($this->buffer === null) {
             $this->buffer = -2; // implicitly disable buffering from here on
         }
-        $this->dataSource->next();
+        if (!is_array($this->buffer) || $this->position == $this->dataSource->key()) {
+            $this->dataSource->next();
+        }
         $this->position++;
     }
 
diff --git a/library/Zend/Db/ResultSet/Exception/ExceptionInterface.php b/library/Zend/Db/ResultSet/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 7f7648b33..c4aa1aa8b
--- a/library/Zend/Db/ResultSet/Exception/ExceptionInterface.php
+++ b/library/Zend/Db/ResultSet/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php b/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 42f3c93ae..32b626770
--- a/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php
+++ b/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/ResultSet/Exception/RuntimeException.php b/library/Zend/Db/ResultSet/Exception/RuntimeException.php
old mode 100755
new mode 100644
index f201ac10f..244c1d974
--- a/library/Zend/Db/ResultSet/Exception/RuntimeException.php
+++ b/library/Zend/Db/ResultSet/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/ResultSet/HydratingResultSet.php b/library/Zend/Db/ResultSet/HydratingResultSet.php
old mode 100755
new mode 100644
index a4bd91629..f7a44f13f
--- a/library/Zend/Db/ResultSet/HydratingResultSet.php
+++ b/library/Zend/Db/ResultSet/HydratingResultSet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/ResultSet/ResultSet.php b/library/Zend/Db/ResultSet/ResultSet.php
old mode 100755
new mode 100644
index 2286410c6..59bfac9d1
--- a/library/Zend/Db/ResultSet/ResultSet.php
+++ b/library/Zend/Db/ResultSet/ResultSet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/ResultSet/ResultSetInterface.php b/library/Zend/Db/ResultSet/ResultSetInterface.php
old mode 100755
new mode 100644
index c2bbd73b2..63de36913
--- a/library/Zend/Db/ResultSet/ResultSetInterface.php
+++ b/library/Zend/Db/ResultSet/ResultSetInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/RowGateway/AbstractRowGateway.php b/library/Zend/Db/RowGateway/AbstractRowGateway.php
old mode 100755
new mode 100644
index 4e1ee4612..ed3f60aea
--- a/library/Zend/Db/RowGateway/AbstractRowGateway.php
+++ b/library/Zend/Db/RowGateway/AbstractRowGateway.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php b/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 7bb37fc98..54004999f
--- a/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php
+++ b/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php b/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 7db3117de..1f8203412
--- a/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php
+++ b/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/RowGateway/Exception/RuntimeException.php b/library/Zend/Db/RowGateway/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 0b698c645..acfa6b246
--- a/library/Zend/Db/RowGateway/Exception/RuntimeException.php
+++ b/library/Zend/Db/RowGateway/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/RowGateway/Feature/AbstractFeature.php b/library/Zend/Db/RowGateway/Feature/AbstractFeature.php
old mode 100755
new mode 100644
index ead006798..d53a0ccb2
--- a/library/Zend/Db/RowGateway/Feature/AbstractFeature.php
+++ b/library/Zend/Db/RowGateway/Feature/AbstractFeature.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/RowGateway/Feature/FeatureSet.php b/library/Zend/Db/RowGateway/Feature/FeatureSet.php
old mode 100755
new mode 100644
index de3b2344f..424251c64
--- a/library/Zend/Db/RowGateway/Feature/FeatureSet.php
+++ b/library/Zend/Db/RowGateway/Feature/FeatureSet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/RowGateway/RowGateway.php b/library/Zend/Db/RowGateway/RowGateway.php
old mode 100755
new mode 100644
index df2295c14..97e7fdab3
--- a/library/Zend/Db/RowGateway/RowGateway.php
+++ b/library/Zend/Db/RowGateway/RowGateway.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/RowGateway/RowGatewayInterface.php b/library/Zend/Db/RowGateway/RowGatewayInterface.php
old mode 100755
new mode 100644
index e0a20b554..7683e94bc
--- a/library/Zend/Db/RowGateway/RowGatewayInterface.php
+++ b/library/Zend/Db/RowGateway/RowGatewayInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/AbstractSql.php b/library/Zend/Db/Sql/AbstractSql.php
old mode 100755
new mode 100644
index 80cd7318e..7726af427
--- a/library/Zend/Db/Sql/AbstractSql.php
+++ b/library/Zend/Db/Sql/AbstractSql.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/AlterTable.php b/library/Zend/Db/Sql/Ddl/AlterTable.php
old mode 100755
new mode 100644
index 2721db5a2..6ab95a02b
--- a/library/Zend/Db/Sql/Ddl/AlterTable.php
+++ b/library/Zend/Db/Sql/Ddl/AlterTable.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Column/BigInteger.php b/library/Zend/Db/Sql/Ddl/Column/BigInteger.php
old mode 100755
new mode 100644
index d915a948f..75ce21cc3
--- a/library/Zend/Db/Sql/Ddl/Column/BigInteger.php
+++ b/library/Zend/Db/Sql/Ddl/Column/BigInteger.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Column/Blob.php b/library/Zend/Db/Sql/Ddl/Column/Blob.php
old mode 100755
new mode 100644
index 1892ca603..a171b8379
--- a/library/Zend/Db/Sql/Ddl/Column/Blob.php
+++ b/library/Zend/Db/Sql/Ddl/Column/Blob.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -22,11 +22,11 @@ class Blob extends Column
     protected $type = 'BLOB';
 
     /**
-     * @param null  $name
-     * @param int   $length
-     * @param bool  $nullable
-     * @param null  $default
-     * @param array $options
+     * @param string $name
+     * @param int    $length
+     * @param bool   $nullable
+     * @param null   $default
+     * @param array  $options
      */
     public function __construct($name, $length, $nullable = false, $default = null, array $options = array())
     {
diff --git a/library/Zend/Db/Sql/Ddl/Column/Boolean.php b/library/Zend/Db/Sql/Ddl/Column/Boolean.php
old mode 100755
new mode 100644
index 36c07187c..26f83f825
--- a/library/Zend/Db/Sql/Ddl/Column/Boolean.php
+++ b/library/Zend/Db/Sql/Ddl/Column/Boolean.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Column/Char.php b/library/Zend/Db/Sql/Ddl/Column/Char.php
old mode 100755
new mode 100644
index 507cfe2c6..8fb6552df
--- a/library/Zend/Db/Sql/Ddl/Column/Char.php
+++ b/library/Zend/Db/Sql/Ddl/Column/Char.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Column/Column.php b/library/Zend/Db/Sql/Ddl/Column/Column.php
old mode 100755
new mode 100644
index de2f852b0..f24b3ab88
--- a/library/Zend/Db/Sql/Ddl/Column/Column.php
+++ b/library/Zend/Db/Sql/Ddl/Column/Column.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Column/ColumnInterface.php b/library/Zend/Db/Sql/Ddl/Column/ColumnInterface.php
old mode 100755
new mode 100644
index 331e5254f..f21e11d98
--- a/library/Zend/Db/Sql/Ddl/Column/ColumnInterface.php
+++ b/library/Zend/Db/Sql/Ddl/Column/ColumnInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,10 +11,30 @@ namespace Zend\Db\Sql\Ddl\Column;
 
 use Zend\Db\Sql\ExpressionInterface;
 
+/**
+ * Interface ColumnInterface describes the protocol on how Column objects interact
+ *
+ * @package Zend\Db\Sql\Ddl\Column
+ */
 interface ColumnInterface extends ExpressionInterface
 {
+    /**
+     * @return string
+     */
     public function getName();
+
+    /**
+     * @return bool
+     */
     public function isNullable();
+
+    /**
+     * @return null|string|int
+     */
     public function getDefault();
+
+    /**
+     * @return array
+     */
     public function getOptions();
 }
diff --git a/library/Zend/Db/Sql/Ddl/Column/Date.php b/library/Zend/Db/Sql/Ddl/Column/Date.php
old mode 100755
new mode 100644
index 489a11439..266e0699c
--- a/library/Zend/Db/Sql/Ddl/Column/Date.php
+++ b/library/Zend/Db/Sql/Ddl/Column/Date.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Column/Decimal.php b/library/Zend/Db/Sql/Ddl/Column/Decimal.php
old mode 100755
new mode 100644
index 8a0ff25e3..b27231740
--- a/library/Zend/Db/Sql/Ddl/Column/Decimal.php
+++ b/library/Zend/Db/Sql/Ddl/Column/Decimal.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Column/Float.php b/library/Zend/Db/Sql/Ddl/Column/Float.php
old mode 100755
new mode 100644
index e866abcf5..5111b9902
--- a/library/Zend/Db/Sql/Ddl/Column/Float.php
+++ b/library/Zend/Db/Sql/Ddl/Column/Float.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Column/Integer.php b/library/Zend/Db/Sql/Ddl/Column/Integer.php
old mode 100755
new mode 100644
index 5e424285c..b24466416
--- a/library/Zend/Db/Sql/Ddl/Column/Integer.php
+++ b/library/Zend/Db/Sql/Ddl/Column/Integer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Column/Text.php b/library/Zend/Db/Sql/Ddl/Column/Text.php
old mode 100755
new mode 100644
index 3e4070909..ea63af907
--- a/library/Zend/Db/Sql/Ddl/Column/Text.php
+++ b/library/Zend/Db/Sql/Ddl/Column/Text.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Column/Time.php b/library/Zend/Db/Sql/Ddl/Column/Time.php
old mode 100755
new mode 100644
index 68d3c6648..d7e85404c
--- a/library/Zend/Db/Sql/Ddl/Column/Time.php
+++ b/library/Zend/Db/Sql/Ddl/Column/Time.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Column/Varchar.php b/library/Zend/Db/Sql/Ddl/Column/Varchar.php
old mode 100755
new mode 100644
index 49a718c78..0f3496c69
--- a/library/Zend/Db/Sql/Ddl/Column/Varchar.php
+++ b/library/Zend/Db/Sql/Ddl/Column/Varchar.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Constraint/AbstractConstraint.php b/library/Zend/Db/Sql/Ddl/Constraint/AbstractConstraint.php
old mode 100755
new mode 100644
index 19909fadb..d83e31230
--- a/library/Zend/Db/Sql/Ddl/Constraint/AbstractConstraint.php
+++ b/library/Zend/Db/Sql/Ddl/Constraint/AbstractConstraint.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Constraint/Check.php b/library/Zend/Db/Sql/Ddl/Constraint/Check.php
old mode 100755
new mode 100644
index 1afbeb39c..a739b9afc
--- a/library/Zend/Db/Sql/Ddl/Constraint/Check.php
+++ b/library/Zend/Db/Sql/Ddl/Constraint/Check.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Constraint/ConstraintInterface.php b/library/Zend/Db/Sql/Ddl/Constraint/ConstraintInterface.php
old mode 100755
new mode 100644
index bcb964394..667e56016
--- a/library/Zend/Db/Sql/Ddl/Constraint/ConstraintInterface.php
+++ b/library/Zend/Db/Sql/Ddl/Constraint/ConstraintInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Constraint/ForeignKey.php b/library/Zend/Db/Sql/Ddl/Constraint/ForeignKey.php
old mode 100755
new mode 100644
index 1d0c0cad4..e974e1f73
--- a/library/Zend/Db/Sql/Ddl/Constraint/ForeignKey.php
+++ b/library/Zend/Db/Sql/Ddl/Constraint/ForeignKey.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php b/library/Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php
old mode 100755
new mode 100644
index 84124a4d0..b2501e0b9
--- a/library/Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php
+++ b/library/Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/Constraint/UniqueKey.php b/library/Zend/Db/Sql/Ddl/Constraint/UniqueKey.php
old mode 100755
new mode 100644
index 8d871054e..b983f2fb8
--- a/library/Zend/Db/Sql/Ddl/Constraint/UniqueKey.php
+++ b/library/Zend/Db/Sql/Ddl/Constraint/UniqueKey.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -17,12 +17,12 @@ class UniqueKey extends AbstractConstraint
     protected $specification = 'CONSTRAINT UNIQUE KEY %s(...)';
 
     /**
-     * @param  string $column
+     * @param  array $columns
      * @param  null|string $name
      */
-    public function __construct($column, $name = null)
+    public function __construct($columns, $name = null)
     {
-        $this->setColumns($column);
+        $this->setColumns($columns);
         $this->name = $name;
     }
 
diff --git a/library/Zend/Db/Sql/Ddl/CreateTable.php b/library/Zend/Db/Sql/Ddl/CreateTable.php
old mode 100755
new mode 100644
index 45bfd982d..f331b232f
--- a/library/Zend/Db/Sql/Ddl/CreateTable.php
+++ b/library/Zend/Db/Sql/Ddl/CreateTable.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/DropTable.php b/library/Zend/Db/Sql/Ddl/DropTable.php
old mode 100755
new mode 100644
index e38425c6b..bf3556883
--- a/library/Zend/Db/Sql/Ddl/DropTable.php
+++ b/library/Zend/Db/Sql/Ddl/DropTable.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Ddl/SqlInterface.php b/library/Zend/Db/Sql/Ddl/SqlInterface.php
old mode 100755
new mode 100644
index 761312458..fb4dab05c
--- a/library/Zend/Db/Sql/Ddl/SqlInterface.php
+++ b/library/Zend/Db/Sql/Ddl/SqlInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Delete.php b/library/Zend/Db/Sql/Delete.php
old mode 100755
new mode 100644
index 1187277da..c9a387add
--- a/library/Zend/Db/Sql/Delete.php
+++ b/library/Zend/Db/Sql/Delete.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Exception/ExceptionInterface.php b/library/Zend/Db/Sql/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 337266de8..9e18dba26
--- a/library/Zend/Db/Sql/Exception/ExceptionInterface.php
+++ b/library/Zend/Db/Sql/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Exception/InvalidArgumentException.php b/library/Zend/Db/Sql/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 0892d68b7..19aef601e
--- a/library/Zend/Db/Sql/Exception/InvalidArgumentException.php
+++ b/library/Zend/Db/Sql/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Exception/RuntimeException.php b/library/Zend/Db/Sql/Exception/RuntimeException.php
old mode 100755
new mode 100644
index b6546b090..5a7dea347
--- a/library/Zend/Db/Sql/Exception/RuntimeException.php
+++ b/library/Zend/Db/Sql/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Expression.php b/library/Zend/Db/Sql/Expression.php
old mode 100755
new mode 100644
index b9f935b40..21b2649e5
--- a/library/Zend/Db/Sql/Expression.php
+++ b/library/Zend/Db/Sql/Expression.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/ExpressionInterface.php b/library/Zend/Db/Sql/ExpressionInterface.php
old mode 100755
new mode 100644
index 99c929939..4781dad06
--- a/library/Zend/Db/Sql/ExpressionInterface.php
+++ b/library/Zend/Db/Sql/ExpressionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Having.php b/library/Zend/Db/Sql/Having.php
old mode 100755
new mode 100644
index abbbd4c88..024f9d0f1
--- a/library/Zend/Db/Sql/Having.php
+++ b/library/Zend/Db/Sql/Having.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Insert.php b/library/Zend/Db/Sql/Insert.php
old mode 100755
new mode 100644
index 8704678f6..944a369ab
--- a/library/Zend/Db/Sql/Insert.php
+++ b/library/Zend/Db/Sql/Insert.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Literal.php b/library/Zend/Db/Sql/Literal.php
old mode 100755
new mode 100644
index ba67415a3..1da410288
--- a/library/Zend/Db/Sql/Literal.php
+++ b/library/Zend/Db/Sql/Literal.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/AbstractPlatform.php b/library/Zend/Db/Sql/Platform/AbstractPlatform.php
old mode 100755
new mode 100644
index c5ddd6ce6..1eec50e34
--- a/library/Zend/Db/Sql/Platform/AbstractPlatform.php
+++ b/library/Zend/Db/Sql/Platform/AbstractPlatform.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/IbmDb2/IbmDb2.php b/library/Zend/Db/Sql/Platform/IbmDb2/IbmDb2.php
old mode 100755
new mode 100644
index f744bb470..0effa78fc
--- a/library/Zend/Db/Sql/Platform/IbmDb2/IbmDb2.php
+++ b/library/Zend/Db/Sql/Platform/IbmDb2/IbmDb2.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/IbmDb2/SelectDecorator.php b/library/Zend/Db/Sql/Platform/IbmDb2/SelectDecorator.php
old mode 100755
new mode 100644
index 4ad323694..47c15ee36
--- a/library/Zend/Db/Sql/Platform/IbmDb2/SelectDecorator.php
+++ b/library/Zend/Db/Sql/Platform/IbmDb2/SelectDecorator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php b/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
old mode 100755
new mode 100644
index d9cfa1556..4206c8736
--- a/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
+++ b/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/Mysql/Mysql.php b/library/Zend/Db/Sql/Platform/Mysql/Mysql.php
old mode 100755
new mode 100644
index 80455869a..5b3f2deec
--- a/library/Zend/Db/Sql/Platform/Mysql/Mysql.php
+++ b/library/Zend/Db/Sql/Platform/Mysql/Mysql.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php b/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
old mode 100755
new mode 100644
index 5c4678a73..797be2c13
--- a/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
+++ b/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/Oracle/Oracle.php b/library/Zend/Db/Sql/Platform/Oracle/Oracle.php
old mode 100755
new mode 100644
index e5af22fa9..e2f3f1769
--- a/library/Zend/Db/Sql/Platform/Oracle/Oracle.php
+++ b/library/Zend/Db/Sql/Platform/Oracle/Oracle.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php b/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
old mode 100755
new mode 100644
index 457c696bb..0fa9e4f1f
--- a/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
+++ b/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/Platform.php b/library/Zend/Db/Sql/Platform/Platform.php
old mode 100755
new mode 100644
index 4a6fc2e98..381325377
--- a/library/Zend/Db/Sql/Platform/Platform.php
+++ b/library/Zend/Db/Sql/Platform/Platform.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php b/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php
old mode 100755
new mode 100644
index 2ff7c97ce..d4384abae
--- a/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php
+++ b/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php b/library/Zend/Db/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php
old mode 100755
new mode 100644
index c84742dfd..c05a18f64
--- a/library/Zend/Db/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php
+++ b/library/Zend/Db/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php b/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
old mode 100755
new mode 100644
index 7667ebcbd..3b085c183
--- a/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
+++ b/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php b/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php
old mode 100755
new mode 100644
index ed72b77aa..1bb500d46
--- a/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php
+++ b/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Predicate/Between.php b/library/Zend/Db/Sql/Predicate/Between.php
old mode 100755
new mode 100644
index 686b65db5..6c81b58ba
--- a/library/Zend/Db/Sql/Predicate/Between.php
+++ b/library/Zend/Db/Sql/Predicate/Between.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Predicate/Expression.php b/library/Zend/Db/Sql/Predicate/Expression.php
old mode 100755
new mode 100644
index 4822dd081..ee54dd291
--- a/library/Zend/Db/Sql/Predicate/Expression.php
+++ b/library/Zend/Db/Sql/Predicate/Expression.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -25,17 +25,6 @@ class Expression extends BaseExpression implements PredicateInterface
             $this->setExpression($expression);
         }
 
-        if (is_array($valueParameter)) {
-            $this->setParameters($valueParameter);
-        } else {
-            $argNum = func_num_args();
-            if ($argNum > 2 || is_scalar($valueParameter)) {
-                $parameters = array();
-                for ($i = 1; $i < $argNum; $i++) {
-                    $parameters[] = func_get_arg($i);
-                }
-                $this->setParameters($parameters);
-            }
-        }
+        $this->setParameters(is_array($valueParameter) ? $valueParameter : array_slice(func_get_args(), 1));
     }
 }
diff --git a/library/Zend/Db/Sql/Predicate/In.php b/library/Zend/Db/Sql/Predicate/In.php
old mode 100755
new mode 100644
index eb7ccc36c..b6697f598
--- a/library/Zend/Db/Sql/Predicate/In.php
+++ b/library/Zend/Db/Sql/Predicate/In.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Predicate/IsNotNull.php b/library/Zend/Db/Sql/Predicate/IsNotNull.php
old mode 100755
new mode 100644
index e09f34912..13dfa3195
--- a/library/Zend/Db/Sql/Predicate/IsNotNull.php
+++ b/library/Zend/Db/Sql/Predicate/IsNotNull.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Predicate/IsNull.php b/library/Zend/Db/Sql/Predicate/IsNull.php
old mode 100755
new mode 100644
index c184a020e..83931ba73
--- a/library/Zend/Db/Sql/Predicate/IsNull.php
+++ b/library/Zend/Db/Sql/Predicate/IsNull.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Predicate/Like.php b/library/Zend/Db/Sql/Predicate/Like.php
old mode 100755
new mode 100644
index b5d6676fe..f4b143ab0
--- a/library/Zend/Db/Sql/Predicate/Like.php
+++ b/library/Zend/Db/Sql/Predicate/Like.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Predicate/Literal.php b/library/Zend/Db/Sql/Predicate/Literal.php
old mode 100755
new mode 100644
index 5ee68c998..8d88cf33d
--- a/library/Zend/Db/Sql/Predicate/Literal.php
+++ b/library/Zend/Db/Sql/Predicate/Literal.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Predicate/NotIn.php b/library/Zend/Db/Sql/Predicate/NotIn.php
old mode 100755
new mode 100644
index 095555900..de32d23c8
--- a/library/Zend/Db/Sql/Predicate/NotIn.php
+++ b/library/Zend/Db/Sql/Predicate/NotIn.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Predicate/NotLike.php b/library/Zend/Db/Sql/Predicate/NotLike.php
old mode 100755
new mode 100644
index 329de23ed..8f4726993
--- a/library/Zend/Db/Sql/Predicate/NotLike.php
+++ b/library/Zend/Db/Sql/Predicate/NotLike.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Predicate/Operator.php b/library/Zend/Db/Sql/Predicate/Operator.php
old mode 100755
new mode 100644
index acd941406..7efb89942
--- a/library/Zend/Db/Sql/Predicate/Operator.php
+++ b/library/Zend/Db/Sql/Predicate/Operator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Predicate/Predicate.php b/library/Zend/Db/Sql/Predicate/Predicate.php
old mode 100755
new mode 100644
index e9ef5757d..d650938dc
--- a/library/Zend/Db/Sql/Predicate/Predicate.php
+++ b/library/Zend/Db/Sql/Predicate/Predicate.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -60,9 +60,9 @@ class Predicate extends PredicateSet
         if ($this->unnest == null) {
             throw new RuntimeException('Not nested');
         }
-        $unnset       = $this->unnest;
+        $unnest       = $this->unnest;
         $this->unnest = null;
-        return $unnset;
+        return $unnest;
     }
 
     /**
diff --git a/library/Zend/Db/Sql/Predicate/PredicateInterface.php b/library/Zend/Db/Sql/Predicate/PredicateInterface.php
old mode 100755
new mode 100644
index 68b197f84..32b99c542
--- a/library/Zend/Db/Sql/Predicate/PredicateInterface.php
+++ b/library/Zend/Db/Sql/Predicate/PredicateInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Predicate/PredicateSet.php b/library/Zend/Db/Sql/Predicate/PredicateSet.php
old mode 100755
new mode 100644
index c616425b3..bf62e8d4c
--- a/library/Zend/Db/Sql/Predicate/PredicateSet.php
+++ b/library/Zend/Db/Sql/Predicate/PredicateSet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/PreparableSqlInterface.php b/library/Zend/Db/Sql/PreparableSqlInterface.php
old mode 100755
new mode 100644
index ea32cd65b..dc66082cb
--- a/library/Zend/Db/Sql/PreparableSqlInterface.php
+++ b/library/Zend/Db/Sql/PreparableSqlInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Select.php b/library/Zend/Db/Sql/Select.php
old mode 100755
new mode 100644
index d63ed299a..ccf1e4146
--- a/library/Zend/Db/Sql/Select.php
+++ b/library/Zend/Db/Sql/Select.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -207,9 +207,9 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
      */
     public function quantifier($quantifier)
     {
-        if (!is_string($quantifier) && !$quantifier instanceof Expression) {
+        if (!is_string($quantifier) && !$quantifier instanceof ExpressionInterface) {
             throw new Exception\InvalidArgumentException(
-                'Quantifier must be one of DISTINCT, ALL, or some platform specific Expression object'
+                'Quantifier must be one of DISTINCT, ALL, or some platform specific object implementing ExpressionInterface'
             );
         }
         $this->quantifier = $quantifier;
@@ -823,7 +823,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
         }
         $orders = array();
         foreach ($this->order as $k => $v) {
-            if ($v instanceof Expression) {
+            if ($v instanceof ExpressionInterface) {
                 /** @var $orderParts \Zend\Db\Adapter\StatementContainer */
                 $orderParts = $this->processExpression($v, $platform, $driver);
                 if ($parameterContainer) {
diff --git a/library/Zend/Db/Sql/Sql.php b/library/Zend/Db/Sql/Sql.php
old mode 100755
new mode 100644
index 17a697e2d..e67ab3ff3
--- a/library/Zend/Db/Sql/Sql.php
+++ b/library/Zend/Db/Sql/Sql.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/SqlInterface.php b/library/Zend/Db/Sql/SqlInterface.php
old mode 100755
new mode 100644
index f7db64c17..2e26eb315
--- a/library/Zend/Db/Sql/SqlInterface.php
+++ b/library/Zend/Db/Sql/SqlInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/TableIdentifier.php b/library/Zend/Db/Sql/TableIdentifier.php
old mode 100755
new mode 100644
index 2c31b930c..79f20699f
--- a/library/Zend/Db/Sql/TableIdentifier.php
+++ b/library/Zend/Db/Sql/TableIdentifier.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Update.php b/library/Zend/Db/Sql/Update.php
old mode 100755
new mode 100644
index 11e44e834..33fbcac09
--- a/library/Zend/Db/Sql/Update.php
+++ b/library/Zend/Db/Sql/Update.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/Sql/Where.php b/library/Zend/Db/Sql/Where.php
old mode 100755
new mode 100644
index f50efb46f..22c9d3863
--- a/library/Zend/Db/Sql/Where.php
+++ b/library/Zend/Db/Sql/Where.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/AbstractTableGateway.php b/library/Zend/Db/TableGateway/AbstractTableGateway.php
old mode 100755
new mode 100644
index 08e88e5b3..a98d19301
--- a/library/Zend/Db/TableGateway/AbstractTableGateway.php
+++ b/library/Zend/Db/TableGateway/AbstractTableGateway.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -19,6 +19,7 @@ use Zend\Db\Sql\Sql;
 use Zend\Db\Sql\TableIdentifier;
 use Zend\Db\Sql\Update;
 use Zend\Db\Sql\Where;
+use Zend\Db\TableGateway\Feature\EventFeature;
 
 /**
  *
@@ -94,13 +95,13 @@ abstract class AbstractTableGateway implements TableGatewayInterface
         }
 
         $this->featureSet->setTableGateway($this);
-        $this->featureSet->apply('preInitialize', array());
+        $this->featureSet->apply(EventFeature::EVENT_PRE_INITIALIZE, array());
 
         if (!$this->adapter instanceof AdapterInterface) {
             throw new Exception\RuntimeException('This table does not have an Adapter setup');
         }
 
-        if (!is_string($this->table) && !$this->table instanceof TableIdentifier) {
+        if (!is_string($this->table) && !$this->table instanceof TableIdentifier && !is_array($this->table)) {
             throw new Exception\RuntimeException('This table object does not have a valid table set.');
         }
 
@@ -112,7 +113,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface
             $this->sql = new Sql($this->adapter, $this->table);
         }
 
-        $this->featureSet->apply('postInitialize', array());
+        $this->featureSet->apply(EventFeature::EVENT_POST_INITIALIZE, array());
 
         $this->isInitialized = true;
     }
@@ -225,7 +226,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface
         }
 
         // apply preSelect features
-        $this->featureSet->apply('preSelect', array($select));
+        $this->featureSet->apply(EventFeature::EVENT_PRE_SELECT, array($select));
 
         // prepare and execute
         $statement = $this->sql->prepareStatementForSqlObject($select);
@@ -236,7 +237,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface
         $resultSet->initialize($result);
 
         // apply postSelect features
-        $this->featureSet->apply('postSelect', array($statement, $result, $resultSet));
+        $this->featureSet->apply(EventFeature::EVENT_POST_SELECT, array($statement, $result, $resultSet));
 
         return $resultSet;
     }
@@ -284,14 +285,14 @@ abstract class AbstractTableGateway implements TableGatewayInterface
         }
 
         // apply preInsert features
-        $this->featureSet->apply('preInsert', array($insert));
+        $this->featureSet->apply(EventFeature::EVENT_PRE_INSERT, array($insert));
 
         $statement = $this->sql->prepareStatementForSqlObject($insert);
         $result = $statement->execute();
         $this->lastInsertValue = $this->adapter->getDriver()->getConnection()->getLastGeneratedValue();
 
         // apply postInsert features
-        $this->featureSet->apply('postInsert', array($statement, $result));
+        $this->featureSet->apply(EventFeature::EVENT_POST_INSERT, array($statement, $result));
 
         return $result->getAffectedRows();
     }
@@ -344,13 +345,13 @@ abstract class AbstractTableGateway implements TableGatewayInterface
         }
 
         // apply preUpdate features
-        $this->featureSet->apply('preUpdate', array($update));
+        $this->featureSet->apply(EventFeature::EVENT_PRE_UPDATE, array($update));
 
         $statement = $this->sql->prepareStatementForSqlObject($update);
         $result = $statement->execute();
 
         // apply postUpdate features
-        $this->featureSet->apply('postUpdate', array($statement, $result));
+        $this->featureSet->apply(EventFeature::EVENT_POST_UPDATE, array($statement, $result));
 
         return $result->getAffectedRows();
     }
@@ -400,13 +401,13 @@ abstract class AbstractTableGateway implements TableGatewayInterface
         }
 
         // pre delete update
-        $this->featureSet->apply('preDelete', array($delete));
+        $this->featureSet->apply(EventFeature::EVENT_PRE_DELETE, array($delete));
 
         $statement = $this->sql->prepareStatementForSqlObject($delete);
         $result = $statement->execute();
 
         // apply postDelete features
-        $this->featureSet->apply('postDelete', array($statement, $result));
+        $this->featureSet->apply(EventFeature::EVENT_POST_DELETE, array($statement, $result));
 
         return $result->getAffectedRows();
     }
@@ -481,6 +482,14 @@ abstract class AbstractTableGateway implements TableGatewayInterface
         $this->sql = clone $this->sql;
         if (is_object($this->table)) {
             $this->table = clone $this->table;
+        } elseif (
+            is_array($this->table)
+            && count($this->table) == 1
+            && is_object(reset($this->table))
+        ) {
+            foreach ($this->table as $alias => &$tableObject) {
+                $tableObject = clone $tableObject;
+            }
         }
     }
 }
diff --git a/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php b/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index ecd3085ac..857e9a204
--- a/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php
+++ b/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php b/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 1f967a594..828cd308b
--- a/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php
+++ b/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/Exception/RuntimeException.php b/library/Zend/Db/TableGateway/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 3c79b9f0f..4b4d9287e
--- a/library/Zend/Db/TableGateway/Exception/RuntimeException.php
+++ b/library/Zend/Db/TableGateway/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/Feature/AbstractFeature.php b/library/Zend/Db/TableGateway/Feature/AbstractFeature.php
old mode 100755
new mode 100644
index 5028078ee..ddbf33284
--- a/library/Zend/Db/TableGateway/Feature/AbstractFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/AbstractFeature.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/Feature/EventFeature.php b/library/Zend/Db/TableGateway/Feature/EventFeature.php
old mode 100755
new mode 100644
index 08e3cffbd..73de610f4
--- a/library/Zend/Db/TableGateway/Feature/EventFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/EventFeature.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -22,6 +22,21 @@ use Zend\EventManager\EventsCapableInterface;
 
 class EventFeature extends AbstractFeature implements EventsCapableInterface
 {
+    const EVENT_PRE_INITIALIZE  = 'preInitialize';
+    const EVENT_POST_INITIALIZE = 'postInitialize';
+
+    const EVENT_PRE_SELECT      = 'preSelect';
+    const EVENT_POST_SELECT     = 'postSelect';
+
+    const EVENT_PRE_INSERT      = 'preInsert';
+    const EVENT_POST_INSERT     = 'postInsert';
+
+    const EVENT_PRE_DELETE      = 'preDelete';
+    const EVENT_POST_DELETE     = 'postDelete';
+
+    const EVENT_PRE_UPDATE      = 'preUpdate';
+    const EVENT_POST_UPDATE     = 'postUpdate';
+
     /**
      * @var EventManagerInterface
      */
@@ -87,7 +102,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
         }
 
         $this->event->setTarget($this->tableGateway);
-        $this->event->setName(__FUNCTION__);
+        $this->event->setName(static::EVENT_PRE_INITIALIZE);
         $this->eventManager->trigger($this->event);
     }
 
@@ -98,7 +113,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
      */
     public function postInitialize()
     {
-        $this->event->setName(__FUNCTION__);
+        $this->event->setName(static::EVENT_POST_INITIALIZE);
         $this->eventManager->trigger($this->event);
     }
 
@@ -113,7 +128,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
      */
     public function preSelect(Select $select)
     {
-        $this->event->setName(__FUNCTION__);
+        $this->event->setName(static::EVENT_PRE_SELECT);
         $this->event->setParams(array('select' => $select));
         $this->eventManager->trigger($this->event);
     }
@@ -133,7 +148,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
      */
     public function postSelect(StatementInterface $statement, ResultInterface $result, ResultSetInterface $resultSet)
     {
-        $this->event->setName(__FUNCTION__);
+        $this->event->setName(static::EVENT_POST_SELECT);
         $this->event->setParams(array(
             'statement' => $statement,
             'result' => $result,
@@ -153,7 +168,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
      */
     public function preInsert(Insert $insert)
     {
-        $this->event->setName(__FUNCTION__);
+        $this->event->setName(static::EVENT_PRE_INSERT);
         $this->event->setParams(array('insert' => $insert));
         $this->eventManager->trigger($this->event);
     }
@@ -171,7 +186,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
      */
     public function postInsert(StatementInterface $statement, ResultInterface $result)
     {
-        $this->event->setName(__FUNCTION__);
+        $this->event->setName(static::EVENT_POST_INSERT);
         $this->event->setParams(array(
             'statement' => $statement,
             'result' => $result,
@@ -190,7 +205,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
      */
     public function preUpdate(Update $update)
     {
-        $this->event->setName(__FUNCTION__);
+        $this->event->setName(static::EVENT_PRE_UPDATE);
         $this->event->setParams(array('update' => $update));
         $this->eventManager->trigger($this->event);
     }
@@ -208,7 +223,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
      */
     public function postUpdate(StatementInterface $statement, ResultInterface $result)
     {
-        $this->event->setName(__FUNCTION__);
+        $this->event->setName(static::EVENT_POST_UPDATE);
         $this->event->setParams(array(
             'statement' => $statement,
             'result' => $result,
@@ -227,7 +242,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
      */
     public function preDelete(Delete $delete)
     {
-        $this->event->setName(__FUNCTION__);
+        $this->event->setName(static::EVENT_PRE_DELETE);
         $this->event->setParams(array('delete' => $delete));
         $this->eventManager->trigger($this->event);
     }
@@ -245,7 +260,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
      */
     public function postDelete(StatementInterface $statement, ResultInterface $result)
     {
-        $this->event->setName(__FUNCTION__);
+        $this->event->setName(static::EVENT_POST_DELETE);
         $this->event->setParams(array(
             'statement' => $statement,
             'result' => $result,
diff --git a/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php b/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php
old mode 100755
new mode 100644
index 1097a86fe..af46132d1
--- a/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php
+++ b/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/Feature/FeatureSet.php b/library/Zend/Db/TableGateway/Feature/FeatureSet.php
old mode 100755
new mode 100644
index 498db1ad7..939444e0e
--- a/library/Zend/Db/TableGateway/Feature/FeatureSet.php
+++ b/library/Zend/Db/TableGateway/Feature/FeatureSet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php b/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php
old mode 100755
new mode 100644
index bb8c6d60b..bdcd97dc3
--- a/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php b/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
old mode 100755
new mode 100644
index 255735de8..b266265ee
--- a/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/Feature/MetadataFeature.php b/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
old mode 100755
new mode 100644
index 59393bec2..278895af3
--- a/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php b/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php
old mode 100755
new mode 100644
index 18c4fd9df..1bae69e81
--- a/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/Feature/SequenceFeature.php b/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
old mode 100755
new mode 100644
index 9f58d1a56..b9f1dd484
--- a/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
+++ b/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/TableGateway/TableGateway.php b/library/Zend/Db/TableGateway/TableGateway.php
old mode 100755
new mode 100644
index 0defd8a4d..79c989bf0
--- a/library/Zend/Db/TableGateway/TableGateway.php
+++ b/library/Zend/Db/TableGateway/TableGateway.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -30,7 +30,7 @@ class TableGateway extends AbstractTableGateway
     public function __construct($table, AdapterInterface $adapter, $features = null, ResultSetInterface $resultSetPrototype = null, Sql $sql = null)
     {
         // table
-        if (!(is_string($table) || $table instanceof TableIdentifier)) {
+        if (!(is_string($table) || $table instanceof TableIdentifier || is_array($table))) {
             throw new Exception\InvalidArgumentException('Table name must be a string or an instance of Zend\Db\Sql\TableIdentifier');
         }
         $this->table = $table;
diff --git a/library/Zend/Db/TableGateway/TableGatewayInterface.php b/library/Zend/Db/TableGateway/TableGatewayInterface.php
old mode 100755
new mode 100644
index 0a77e0f1d..a48fec2e6
--- a/library/Zend/Db/TableGateway/TableGatewayInterface.php
+++ b/library/Zend/Db/TableGateway/TableGatewayInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Db/composer.json b/library/Zend/Db/composer.json
old mode 100755
new mode 100644
index 6eee3ae0c..c80e3344a
--- a/library/Zend/Db/composer.json
+++ b/library/Zend/Db/composer.json
@@ -14,7 +14,8 @@
     },
     "target-dir": "Zend/Db",
     "require": {
-        "php": ">=5.3.23"
+        "php": ">=5.3.23",
+        "zendframework/zend-stdlib": "self.version"
     },
     "require-dev": {
         "zendframework/zend-eventmanager": "self.version",
@@ -23,8 +24,7 @@
     },
     "suggest": {
         "zendframework/zend-eventmanager": "Zend\\EventManager component",
-        "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-        "zendframework/zend-stdlib": "Zend\\Stdlib component"
+        "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
     },
     "extra": {
         "branch-alias": {
diff --git a/library/Zend/Debug/CONTRIBUTING.md b/library/Zend/Debug/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Debug/Debug.php b/library/Zend/Debug/Debug.php
old mode 100755
new mode 100644
index f240935c8..a53091db0
--- a/library/Zend/Debug/Debug.php
+++ b/library/Zend/Debug/Debug.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Debug/README.md b/library/Zend/Debug/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Debug/composer.json b/library/Zend/Debug/composer.json
old mode 100755
new mode 100644
index b6c18c7bf..8846ed728
--- a/library/Zend/Debug/composer.json
+++ b/library/Zend/Debug/composer.json
@@ -17,7 +17,7 @@
         "php": ">=5.3.23"
     },
     "require-dev": {
-        "zendframework/zend-escaper": "*"
+        "zendframework/zend-escaper": "2.*"
     },
     "suggest": {
         "ext/xdebug": "XDebug, for better backtrace output",
diff --git a/library/Zend/Di/CONTRIBUTING.md b/library/Zend/Di/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Di/Config.php b/library/Zend/Di/Config.php
old mode 100755
new mode 100644
index b17730504..3dd6fcbd1
--- a/library/Zend/Di/Config.php
+++ b/library/Zend/Di/Config.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/Annotation/Inject.php b/library/Zend/Di/Definition/Annotation/Inject.php
old mode 100755
new mode 100644
index 8534c0215..9544502c2
--- a/library/Zend/Di/Definition/Annotation/Inject.php
+++ b/library/Zend/Di/Definition/Annotation/Inject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/Annotation/Instantiator.php b/library/Zend/Di/Definition/Annotation/Instantiator.php
old mode 100755
new mode 100644
index d0aed5310..cc55d5d4e
--- a/library/Zend/Di/Definition/Annotation/Instantiator.php
+++ b/library/Zend/Di/Definition/Annotation/Instantiator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/ArrayDefinition.php b/library/Zend/Di/Definition/ArrayDefinition.php
old mode 100755
new mode 100644
index 5e64f5b38..c089962e8
--- a/library/Zend/Di/Definition/ArrayDefinition.php
+++ b/library/Zend/Di/Definition/ArrayDefinition.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/Builder/InjectionMethod.php b/library/Zend/Di/Definition/Builder/InjectionMethod.php
old mode 100755
new mode 100644
index a27f7b192..9160aacd8
--- a/library/Zend/Di/Definition/Builder/InjectionMethod.php
+++ b/library/Zend/Di/Definition/Builder/InjectionMethod.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/Builder/PhpClass.php b/library/Zend/Di/Definition/Builder/PhpClass.php
old mode 100755
new mode 100644
index 80d4197a2..2b9c06648
--- a/library/Zend/Di/Definition/Builder/PhpClass.php
+++ b/library/Zend/Di/Definition/Builder/PhpClass.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/BuilderDefinition.php b/library/Zend/Di/Definition/BuilderDefinition.php
old mode 100755
new mode 100644
index 6ad935a07..e013b2e2b
--- a/library/Zend/Di/Definition/BuilderDefinition.php
+++ b/library/Zend/Di/Definition/BuilderDefinition.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/ClassDefinition.php b/library/Zend/Di/Definition/ClassDefinition.php
old mode 100755
new mode 100644
index 2b110659d..42b1ab0ba
--- a/library/Zend/Di/Definition/ClassDefinition.php
+++ b/library/Zend/Di/Definition/ClassDefinition.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/CompilerDefinition.php b/library/Zend/Di/Definition/CompilerDefinition.php
old mode 100755
new mode 100644
index dcecde10f..5cb27a9c2
--- a/library/Zend/Di/Definition/CompilerDefinition.php
+++ b/library/Zend/Di/Definition/CompilerDefinition.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/DefinitionInterface.php b/library/Zend/Di/Definition/DefinitionInterface.php
old mode 100755
new mode 100644
index 420bb459d..e9d3d13f7
--- a/library/Zend/Di/Definition/DefinitionInterface.php
+++ b/library/Zend/Di/Definition/DefinitionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/IntrospectionStrategy.php b/library/Zend/Di/Definition/IntrospectionStrategy.php
old mode 100755
new mode 100644
index c34fbbb99..0a4329675
--- a/library/Zend/Di/Definition/IntrospectionStrategy.php
+++ b/library/Zend/Di/Definition/IntrospectionStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/PartialMarker.php b/library/Zend/Di/Definition/PartialMarker.php
old mode 100755
new mode 100644
index 4a40728f0..c37e4579d
--- a/library/Zend/Di/Definition/PartialMarker.php
+++ b/library/Zend/Di/Definition/PartialMarker.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Definition/RuntimeDefinition.php b/library/Zend/Di/Definition/RuntimeDefinition.php
old mode 100755
new mode 100644
index 7e7350936..66fbaedf5
--- a/library/Zend/Di/Definition/RuntimeDefinition.php
+++ b/library/Zend/Di/Definition/RuntimeDefinition.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/DefinitionList.php b/library/Zend/Di/DefinitionList.php
old mode 100755
new mode 100644
index efe190e57..0f0c3c7cb
--- a/library/Zend/Di/DefinitionList.php
+++ b/library/Zend/Di/DefinitionList.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/DependencyInjectionInterface.php b/library/Zend/Di/DependencyInjectionInterface.php
old mode 100755
new mode 100644
index b82187613..4acc8dfb8
--- a/library/Zend/Di/DependencyInjectionInterface.php
+++ b/library/Zend/Di/DependencyInjectionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Di.php b/library/Zend/Di/Di.php
old mode 100755
new mode 100644
index 14c2aa99e..6141df08c
--- a/library/Zend/Di/Di.php
+++ b/library/Zend/Di/Di.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -244,7 +244,6 @@ class Di implements DependencyInjectionInterface
             return $im->getSharedInstance($name, $callParameters);
         }
 
-
         $config   = $im->getConfig($name);
         $instance = $this->newInstance($name, $params, $config['shared']);
         array_pop($this->instanceContext);
@@ -412,7 +411,7 @@ class Di implements DependencyInjectionInterface
                         } elseif (is_int($injectName) && is_array($injectValue)) {
                             throw new Exception\RuntimeException(
                                 'An injection was provided with a keyed index and an array of data, try using'
-                                    . ' the name of a particular method as a key for your injection data.'
+                                . ' the name of a particular method as a key for your injection data.'
                             );
                         }
                     }
@@ -426,7 +425,7 @@ class Di implements DependencyInjectionInterface
                                         if ($methodParams) {
                                             foreach ($methodParams as $methodParam) {
                                                 $objectToInjectClass = $this->getClass($objectToInject);
-                                                if ($objectToInjectClass == $methodParam[1] || self::isSubclassOf($objectToInjectClass, $methodParam[1])) {
+                                                if ($objectToInjectClass == $methodParam[1] || is_subclass_of($objectToInjectClass, $methodParam[1])) {
                                                     if ($this->resolveAndCallInjectionMethodForInstance($instance, $typeInjectionMethod, array($methodParam[0] => $objectToInject), $instanceAlias, self::METHOD_IS_REQUIRED, $type)) {
                                                         $calledMethods[$typeInjectionMethod] = true;
                                                     }
@@ -441,7 +440,7 @@ class Di implements DependencyInjectionInterface
                     }
                     if ($methodsToCall) {
                         foreach ($methodsToCall as $methodInfo) {
-                            $this->resolveAndCallInjectionMethodForInstance($instance, $methodInfo['method'], $methodInfo['args'], $instanceAlias,  self::METHOD_IS_REQUIRED, $instanceClass);
+                            $this->resolveAndCallInjectionMethodForInstance($instance, $methodInfo['method'], $methodInfo['args'], $instanceAlias, self::METHOD_IS_REQUIRED, $instanceClass);
                         }
                     }
                 }
@@ -626,7 +625,7 @@ class Di implements DependencyInjectionInterface
             if (array_key_exists('parameters', $iConfig['requestedClass'])) {
                 $newParameters = array();
 
-                foreach ($iConfig['requestedClass']['parameters'] as $name=>$parameter) {
+                foreach ($iConfig['requestedClass']['parameters'] as $name => $parameter) {
                     $newParameters[$requestedClass.'::'.$method.'::'.$name] = $parameter;
                 }
 
@@ -743,7 +742,7 @@ class Di implements DependencyInjectionInterface
                         }
                         $pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
                              $this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
-                        if ($pInstanceClass === $type || self::isSubclassOf($pInstanceClass, $type)) {
+                        if ($pInstanceClass === $type || is_subclass_of($pInstanceClass, $type)) {
                             $computedParams['retrieval'][$fqParamPos] = array($pInstance, $pInstanceClass);
                             continue 2;
                         }
@@ -760,7 +759,7 @@ class Di implements DependencyInjectionInterface
                         }
                         $pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
                              $this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
-                        if ($pInstanceClass === $type || self::isSubclassOf($pInstanceClass, $type)) {
+                        if ($pInstanceClass === $type || is_subclass_of($pInstanceClass, $type)) {
                             $computedParams['retrieval'][$fqParamPos] = array($pInstance, $pInstanceClass);
                             continue 2;
                         }
@@ -817,12 +816,14 @@ class Di implements DependencyInjectionInterface
                         }
                         // if this item was marked strict,
                         // plus it cannot be resolve, and no value exist, bail out
-                        throw new Exception\MissingPropertyException(sprintf(
-                            'Missing %s for parameter ' . $name . ' for ' . $class . '::' . $method,
-                            (($value[0] === null) ? 'value' : 'instance/object' )
-                        ),
-                        $e->getCode(),
-                        $e);
+                        throw new Exception\MissingPropertyException(
+                            sprintf(
+                                'Missing %s for parameter ' . $name . ' for ' . $class . '::' . $method,
+                                (($value[0] === null) ? 'value' : 'instance/object')
+                            ),
+                            $e->getCode(),
+                            $e
+                        );
                     } else {
                         //finally ( be aware to do at the end of flow)
                         array_pop($this->currentDependencies);
@@ -841,12 +842,14 @@ class Di implements DependencyInjectionInterface
                         }
                         // if this item was marked strict,
                         // plus it cannot be resolve, and no value exist, bail out
-                        throw new Exception\MissingPropertyException(sprintf(
-                            'Missing %s for parameter ' . $name . ' for ' . $class . '::' . $method,
-                            (($value[0] === null) ? 'value' : 'instance/object' )
-                        ),
-                        $e->getCode(),
-                        $e);
+                        throw new Exception\MissingPropertyException(
+                            sprintf(
+                                'Missing %s for parameter ' . $name . ' for ' . $class . '::' . $method,
+                                (($value[0] === null) ? 'value' : 'instance/object')
+                            ),
+                            $e->getCode(),
+                            $e
+                        );
                     } else {
                         //finally ( be aware to do at the end of flow)
                         array_pop($this->currentDependencies);
@@ -887,23 +890,14 @@ class Di implements DependencyInjectionInterface
      * @see https://bugs.php.net/bug.php?id=53727
      * @see https://github.com/zendframework/zf2/pull/1807
      *
+     * @deprecated since zf 2.3 requires PHP >= 5.3.23
+     *
      * @param string $className
      * @param $type
      * @return bool
      */
     protected static function isSubclassOf($className, $type)
     {
-        if (is_subclass_of($className, $type)) {
-            return true;
-        }
-        if (PHP_VERSION_ID >= 50307) {
-            return false;
-        }
-        if (!interface_exists($type)) {
-            return false;
-        }
-        $r = new ReflectionClass($className);
-
-        return $r->implementsInterface($type);
+        return is_subclass_of($className, $type);
     }
 }
diff --git a/library/Zend/Di/Display/Console.php b/library/Zend/Di/Display/Console.php
old mode 100755
new mode 100644
index 31b861e63..9c375389c
--- a/library/Zend/Di/Display/Console.php
+++ b/library/Zend/Di/Display/Console.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Exception/CircularDependencyException.php b/library/Zend/Di/Exception/CircularDependencyException.php
old mode 100755
new mode 100644
index 8cb9eae3f..ed064adc2
--- a/library/Zend/Di/Exception/CircularDependencyException.php
+++ b/library/Zend/Di/Exception/CircularDependencyException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Exception/ClassNotFoundException.php b/library/Zend/Di/Exception/ClassNotFoundException.php
old mode 100755
new mode 100644
index 6ba93ba65..90db4a2d1
--- a/library/Zend/Di/Exception/ClassNotFoundException.php
+++ b/library/Zend/Di/Exception/ClassNotFoundException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Exception/ExceptionInterface.php b/library/Zend/Di/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index ae0ba771b..dc1a3942c
--- a/library/Zend/Di/Exception/ExceptionInterface.php
+++ b/library/Zend/Di/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Exception/InvalidArgumentException.php b/library/Zend/Di/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 435cab35d..9b6257c58
--- a/library/Zend/Di/Exception/InvalidArgumentException.php
+++ b/library/Zend/Di/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Exception/InvalidCallbackException.php b/library/Zend/Di/Exception/InvalidCallbackException.php
old mode 100755
new mode 100644
index ccd958bf4..bd216c122
--- a/library/Zend/Di/Exception/InvalidCallbackException.php
+++ b/library/Zend/Di/Exception/InvalidCallbackException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Exception/InvalidParamNameException.php b/library/Zend/Di/Exception/InvalidParamNameException.php
old mode 100755
new mode 100644
index dc0f3ba91..dcf6f9c86
--- a/library/Zend/Di/Exception/InvalidParamNameException.php
+++ b/library/Zend/Di/Exception/InvalidParamNameException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Exception/InvalidPositionException.php b/library/Zend/Di/Exception/InvalidPositionException.php
old mode 100755
new mode 100644
index abfecd58e..352caa706
--- a/library/Zend/Di/Exception/InvalidPositionException.php
+++ b/library/Zend/Di/Exception/InvalidPositionException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Exception/MissingPropertyException.php b/library/Zend/Di/Exception/MissingPropertyException.php
old mode 100755
new mode 100644
index 76ce99afc..dc987cfee
--- a/library/Zend/Di/Exception/MissingPropertyException.php
+++ b/library/Zend/Di/Exception/MissingPropertyException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Exception/RuntimeException.php b/library/Zend/Di/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 1097cae77..a8236a798
--- a/library/Zend/Di/Exception/RuntimeException.php
+++ b/library/Zend/Di/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/Exception/UndefinedReferenceException.php b/library/Zend/Di/Exception/UndefinedReferenceException.php
old mode 100755
new mode 100644
index e7aa43a27..5e87bfde0
--- a/library/Zend/Di/Exception/UndefinedReferenceException.php
+++ b/library/Zend/Di/Exception/UndefinedReferenceException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/InstanceManager.php b/library/Zend/Di/InstanceManager.php
old mode 100755
new mode 100644
index 609fe390f..13c19a36d
--- a/library/Zend/Di/InstanceManager.php
+++ b/library/Zend/Di/InstanceManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -318,6 +318,7 @@ class InstanceManager /* implements InstanceManagerInterface */
             if (strpos($name, 'alias') === 0) {
                 continue;
             }
+
             $classes[] = $name;
         }
 
diff --git a/library/Zend/Di/LocatorInterface.php b/library/Zend/Di/LocatorInterface.php
old mode 100755
new mode 100644
index 88a12f6cc..4368ed78a
--- a/library/Zend/Di/LocatorInterface.php
+++ b/library/Zend/Di/LocatorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/README.md b/library/Zend/Di/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Di/ServiceLocator.php b/library/Zend/Di/ServiceLocator.php
old mode 100755
new mode 100644
index aa93a3df9..60c509cc3
--- a/library/Zend/Di/ServiceLocator.php
+++ b/library/Zend/Di/ServiceLocator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/ServiceLocator/DependencyInjectorProxy.php b/library/Zend/Di/ServiceLocator/DependencyInjectorProxy.php
old mode 100755
new mode 100644
index be0c3cb1d..814189363
--- a/library/Zend/Di/ServiceLocator/DependencyInjectorProxy.php
+++ b/library/Zend/Di/ServiceLocator/DependencyInjectorProxy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/ServiceLocator/Generator.php b/library/Zend/Di/ServiceLocator/Generator.php
old mode 100755
new mode 100644
index 82e8ca191..73bf96f41
--- a/library/Zend/Di/ServiceLocator/Generator.php
+++ b/library/Zend/Di/ServiceLocator/Generator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/ServiceLocator/GeneratorInstance.php b/library/Zend/Di/ServiceLocator/GeneratorInstance.php
old mode 100755
new mode 100644
index aeb5f93ac..f7af46981
--- a/library/Zend/Di/ServiceLocator/GeneratorInstance.php
+++ b/library/Zend/Di/ServiceLocator/GeneratorInstance.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/ServiceLocatorInterface.php b/library/Zend/Di/ServiceLocatorInterface.php
old mode 100755
new mode 100644
index fe5e12572..08f893d0c
--- a/library/Zend/Di/ServiceLocatorInterface.php
+++ b/library/Zend/Di/ServiceLocatorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Di/TODO b/library/Zend/Di/TODO
old mode 100755
new mode 100644
diff --git a/library/Zend/Di/composer.json b/library/Zend/Di/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Dom/CONTRIBUTING.md b/library/Zend/Dom/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Dom/Css2Xpath.php b/library/Zend/Dom/Css2Xpath.php
old mode 100755
new mode 100644
index 7aa7d506c..55b60c37c
--- a/library/Zend/Dom/Css2Xpath.php
+++ b/library/Zend/Dom/Css2Xpath.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Dom/DOMXPath.php b/library/Zend/Dom/DOMXPath.php
old mode 100755
new mode 100644
index 37a016ae8..f46d55044
--- a/library/Zend/Dom/DOMXPath.php
+++ b/library/Zend/Dom/DOMXPath.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Dom;
diff --git a/library/Zend/Dom/Document.php b/library/Zend/Dom/Document.php
old mode 100755
new mode 100644
index 456e17f86..5d389430c
--- a/library/Zend/Dom/Document.php
+++ b/library/Zend/Dom/Document.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Dom/Document/NodeList.php b/library/Zend/Dom/Document/NodeList.php
old mode 100755
new mode 100644
index 352326fe2..3c1c8478c
--- a/library/Zend/Dom/Document/NodeList.php
+++ b/library/Zend/Dom/Document/NodeList.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Dom/Document/Query.php b/library/Zend/Dom/Document/Query.php
old mode 100755
new mode 100644
index bea590328..947e6afd0
--- a/library/Zend/Dom/Document/Query.php
+++ b/library/Zend/Dom/Document/Query.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Dom/Exception/BadMethodCallException.php b/library/Zend/Dom/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index df3eb1fda..993c26d9a
--- a/library/Zend/Dom/Exception/BadMethodCallException.php
+++ b/library/Zend/Dom/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Dom/Exception/ExceptionInterface.php b/library/Zend/Dom/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index f342f8fe6..192515843
--- a/library/Zend/Dom/Exception/ExceptionInterface.php
+++ b/library/Zend/Dom/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Dom/Exception/RuntimeException.php b/library/Zend/Dom/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 6cd15e220..e96886a47
--- a/library/Zend/Dom/Exception/RuntimeException.php
+++ b/library/Zend/Dom/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Dom/NodeList.php b/library/Zend/Dom/NodeList.php
old mode 100755
new mode 100644
index f9d4a1dc5..82447c432
--- a/library/Zend/Dom/NodeList.php
+++ b/library/Zend/Dom/NodeList.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Dom/Query.php b/library/Zend/Dom/Query.php
old mode 100755
new mode 100644
index 551429916..7e65b6025
--- a/library/Zend/Dom/Query.php
+++ b/library/Zend/Dom/Query.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -297,7 +297,7 @@ class Query
      *
      * @param  DOMDocument $document
      * @param  string|array $xpathQuery
-     * @return array
+     * @return \DOMNodeList
      * @throws \ErrorException If query cannot be executed
      */
     protected function getNodeList($document, $xpathQuery)
diff --git a/library/Zend/Dom/README.md b/library/Zend/Dom/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Dom/composer.json b/library/Zend/Dom/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Escaper/CONTRIBUTING.md b/library/Zend/Escaper/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Escaper/Escaper.php b/library/Zend/Escaper/Escaper.php
old mode 100755
new mode 100644
index 3a3d30eb6..ac6fbb8fa
--- a/library/Zend/Escaper/Escaper.php
+++ b/library/Zend/Escaper/Escaper.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Escaper/Exception/ExceptionInterface.php b/library/Zend/Escaper/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 3a7c8a3f2..7174796a3
--- a/library/Zend/Escaper/Exception/ExceptionInterface.php
+++ b/library/Zend/Escaper/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Escaper/Exception/InvalidArgumentException.php b/library/Zend/Escaper/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index c7958b96d..0ad3f7313
--- a/library/Zend/Escaper/Exception/InvalidArgumentException.php
+++ b/library/Zend/Escaper/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Escaper/Exception/RuntimeException.php b/library/Zend/Escaper/Exception/RuntimeException.php
old mode 100755
new mode 100644
index b42175627..d626123af
--- a/library/Zend/Escaper/Exception/RuntimeException.php
+++ b/library/Zend/Escaper/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Escaper/README.md b/library/Zend/Escaper/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Escaper/composer.json b/library/Zend/Escaper/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/EventManager/AbstractListenerAggregate.php b/library/Zend/EventManager/AbstractListenerAggregate.php
old mode 100755
new mode 100644
index 3f4df278f..a8b887d6f
--- a/library/Zend/EventManager/AbstractListenerAggregate.php
+++ b/library/Zend/EventManager/AbstractListenerAggregate.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/CONTRIBUTING.md b/library/Zend/EventManager/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/EventManager/Event.php b/library/Zend/EventManager/Event.php
old mode 100755
new mode 100644
index abc34e744..bc4ed4429
--- a/library/Zend/EventManager/Event.php
+++ b/library/Zend/EventManager/Event.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/EventInterface.php b/library/Zend/EventManager/EventInterface.php
old mode 100755
new mode 100644
index c1d0de701..3a6274e9f
--- a/library/Zend/EventManager/EventInterface.php
+++ b/library/Zend/EventManager/EventInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/EventManager.php b/library/Zend/EventManager/EventManager.php
old mode 100755
new mode 100644
index 64a25724e..261957c10
--- a/library/Zend/EventManager/EventManager.php
+++ b/library/Zend/EventManager/EventManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -530,7 +530,7 @@ class EventManager implements EventManagerInterface
      * Used to inject shared listeners and wildcard listeners.
      *
      * @param  PriorityQueue $masterListeners
-     * @param  PriorityQueue $listeners
+     * @param  array|Traversable $listeners
      * @return void
      */
     protected function insertListeners($masterListeners, $listeners)
diff --git a/library/Zend/EventManager/EventManagerAwareInterface.php b/library/Zend/EventManager/EventManagerAwareInterface.php
old mode 100755
new mode 100644
index a5c25f25f..77ea5334f
--- a/library/Zend/EventManager/EventManagerAwareInterface.php
+++ b/library/Zend/EventManager/EventManagerAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/EventManagerAwareTrait.php b/library/Zend/EventManager/EventManagerAwareTrait.php
old mode 100755
new mode 100644
index 31e47a4b3..1b87b58fe
--- a/library/Zend/EventManager/EventManagerAwareTrait.php
+++ b/library/Zend/EventManager/EventManagerAwareTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/EventManagerInterface.php b/library/Zend/EventManager/EventManagerInterface.php
old mode 100755
new mode 100644
index 6a2129f93..7e619707b
--- a/library/Zend/EventManager/EventManagerInterface.php
+++ b/library/Zend/EventManager/EventManagerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/EventsCapableInterface.php b/library/Zend/EventManager/EventsCapableInterface.php
old mode 100755
new mode 100644
index d94b8d0fd..e4b99b3fe
--- a/library/Zend/EventManager/EventsCapableInterface.php
+++ b/library/Zend/EventManager/EventsCapableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/Exception/DomainException.php b/library/Zend/EventManager/Exception/DomainException.php
old mode 100755
new mode 100644
index 180f481be..6b247ad95
--- a/library/Zend/EventManager/Exception/DomainException.php
+++ b/library/Zend/EventManager/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/Exception/ExceptionInterface.php b/library/Zend/EventManager/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 68cd6c361..61382cfc6
--- a/library/Zend/EventManager/Exception/ExceptionInterface.php
+++ b/library/Zend/EventManager/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/Exception/InvalidArgumentException.php b/library/Zend/EventManager/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 2a4a6b533..2b277514a
--- a/library/Zend/EventManager/Exception/InvalidArgumentException.php
+++ b/library/Zend/EventManager/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/Exception/InvalidCallbackException.php b/library/Zend/EventManager/Exception/InvalidCallbackException.php
old mode 100755
new mode 100644
index e76659425..3afda0cb9
--- a/library/Zend/EventManager/Exception/InvalidCallbackException.php
+++ b/library/Zend/EventManager/Exception/InvalidCallbackException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/Filter/FilterInterface.php b/library/Zend/EventManager/Filter/FilterInterface.php
old mode 100755
new mode 100644
index b69fc2cb9..71d0c1dce
--- a/library/Zend/EventManager/Filter/FilterInterface.php
+++ b/library/Zend/EventManager/Filter/FilterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/Filter/FilterIterator.php b/library/Zend/EventManager/Filter/FilterIterator.php
old mode 100755
new mode 100644
index 60f811fb1..d15274ba1
--- a/library/Zend/EventManager/Filter/FilterIterator.php
+++ b/library/Zend/EventManager/Filter/FilterIterator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/FilterChain.php b/library/Zend/EventManager/FilterChain.php
old mode 100755
new mode 100644
index d79a5de97..9618600f7
--- a/library/Zend/EventManager/FilterChain.php
+++ b/library/Zend/EventManager/FilterChain.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/GlobalEventManager.php b/library/Zend/EventManager/GlobalEventManager.php
old mode 100755
new mode 100644
index 4bac5b574..5615cb420
--- a/library/Zend/EventManager/GlobalEventManager.php
+++ b/library/Zend/EventManager/GlobalEventManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/ListenerAggregateInterface.php b/library/Zend/EventManager/ListenerAggregateInterface.php
old mode 100755
new mode 100644
index cd0eef4ce..df76708d1
--- a/library/Zend/EventManager/ListenerAggregateInterface.php
+++ b/library/Zend/EventManager/ListenerAggregateInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/ListenerAggregateTrait.php b/library/Zend/EventManager/ListenerAggregateTrait.php
old mode 100755
new mode 100644
index bd287e49c..17ae0b04d
--- a/library/Zend/EventManager/ListenerAggregateTrait.php
+++ b/library/Zend/EventManager/ListenerAggregateTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/ProvidesEvents.php b/library/Zend/EventManager/ProvidesEvents.php
old mode 100755
new mode 100644
index 0cfeb1975..edb19c1d9
--- a/library/Zend/EventManager/ProvidesEvents.php
+++ b/library/Zend/EventManager/ProvidesEvents.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/README.md b/library/Zend/EventManager/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/EventManager/ResponseCollection.php b/library/Zend/EventManager/ResponseCollection.php
old mode 100755
new mode 100644
index b9fb7353b..f0b60e03b
--- a/library/Zend/EventManager/ResponseCollection.php
+++ b/library/Zend/EventManager/ResponseCollection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/SharedEventAggregateAwareInterface.php b/library/Zend/EventManager/SharedEventAggregateAwareInterface.php
old mode 100755
new mode 100644
index 4cda8bc12..73b849c3f
--- a/library/Zend/EventManager/SharedEventAggregateAwareInterface.php
+++ b/library/Zend/EventManager/SharedEventAggregateAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/SharedEventManager.php b/library/Zend/EventManager/SharedEventManager.php
old mode 100755
new mode 100644
index 054243111..40fae74ae
--- a/library/Zend/EventManager/SharedEventManager.php
+++ b/library/Zend/EventManager/SharedEventManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/SharedEventManagerAwareInterface.php b/library/Zend/EventManager/SharedEventManagerAwareInterface.php
old mode 100755
new mode 100644
index 09e5c98c1..f6c05ec65
--- a/library/Zend/EventManager/SharedEventManagerAwareInterface.php
+++ b/library/Zend/EventManager/SharedEventManagerAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/SharedEventManagerInterface.php b/library/Zend/EventManager/SharedEventManagerInterface.php
old mode 100755
new mode 100644
index f67058803..1e26c570d
--- a/library/Zend/EventManager/SharedEventManagerInterface.php
+++ b/library/Zend/EventManager/SharedEventManagerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/SharedListenerAggregateInterface.php b/library/Zend/EventManager/SharedListenerAggregateInterface.php
old mode 100755
new mode 100644
index 0c592f713..e11904075
--- a/library/Zend/EventManager/SharedListenerAggregateInterface.php
+++ b/library/Zend/EventManager/SharedListenerAggregateInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/StaticEventManager.php b/library/Zend/EventManager/StaticEventManager.php
old mode 100755
new mode 100644
index 28e6921b0..e3b089e12
--- a/library/Zend/EventManager/StaticEventManager.php
+++ b/library/Zend/EventManager/StaticEventManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/EventManager/composer.json b/library/Zend/EventManager/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Feed/CONTRIBUTING.md b/library/Zend/Feed/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Feed/Exception/BadMethodCallException.php b/library/Zend/Feed/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 107c3e64e..3e994f2eb
--- a/library/Zend/Feed/Exception/BadMethodCallException.php
+++ b/library/Zend/Feed/Exception/BadMethodCallException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Feed\Exception;
 
-class BadMethodCallException
-    extends \BadMethodCallException
-    implements ExceptionInterface
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Feed/Exception/ExceptionInterface.php b/library/Zend/Feed/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 82619590b..0f752962f
--- a/library/Zend/Feed/Exception/ExceptionInterface.php
+++ b/library/Zend/Feed/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Exception/InvalidArgumentException.php b/library/Zend/Feed/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 56647bc8a..29b64828a
--- a/library/Zend/Feed/Exception/InvalidArgumentException.php
+++ b/library/Zend/Feed/Exception/InvalidArgumentException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Feed\Exception;
 
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Feed/Exception/RuntimeException.php b/library/Zend/Feed/Exception/RuntimeException.php
old mode 100755
new mode 100644
index ece11e059..43167a1e7
--- a/library/Zend/Feed/Exception/RuntimeException.php
+++ b/library/Zend/Feed/Exception/RuntimeException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Feed\Exception;
 
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Feed/PubSubHubbub/AbstractCallback.php b/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
old mode 100755
new mode 100644
index 7645cb905..7321c9625
--- a/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
+++ b/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/PubSubHubbub/CallbackInterface.php b/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
old mode 100755
new mode 100644
index 8873c3db4..c6b7412fd
--- a/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
+++ b/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php b/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index e9286a0bf..f32bc1c3e
--- a/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php
+++ b/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php b/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 951253149..cad1e01bd
--- a/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php
+++ b/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,8 +11,6 @@ namespace Zend\Feed\PubSubHubbub\Exception;
 
 use Zend\Feed\Exception;
 
-class InvalidArgumentException
-    extends Exception\InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php b/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php
old mode 100755
new mode 100644
index f4a49c79e..cc954a519
--- a/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php
+++ b/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,8 +11,6 @@ namespace Zend\Feed\PubSubHubbub\Exception;
 
 use Zend\Feed\Exception;
 
-class RuntimeException
-    extends Exception\RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Feed/PubSubHubbub/HttpResponse.php b/library/Zend/Feed/PubSubHubbub/HttpResponse.php
old mode 100755
new mode 100644
index 0c4c74172..0c1adf2ec
--- a/library/Zend/Feed/PubSubHubbub/HttpResponse.php
+++ b/library/Zend/Feed/PubSubHubbub/HttpResponse.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php b/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php
old mode 100755
new mode 100644
index 92e688133..3ebd07f5b
--- a/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php
+++ b/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/PubSubHubbub/Model/Subscription.php b/library/Zend/Feed/PubSubHubbub/Model/Subscription.php
old mode 100755
new mode 100644
index 9571106a4..46a5d82c8
--- a/library/Zend/Feed/PubSubHubbub/Model/Subscription.php
+++ b/library/Zend/Feed/PubSubHubbub/Model/Subscription.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php b/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
old mode 100755
new mode 100644
index ccd272329..09e7d7559
--- a/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
+++ b/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php b/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
old mode 100755
new mode 100644
index 585be54d1..a930a70be
--- a/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
+++ b/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/PubSubHubbub/Publisher.php b/library/Zend/Feed/PubSubHubbub/Publisher.php
old mode 100755
new mode 100644
index 916ffcad5..6130992bd
--- a/library/Zend/Feed/PubSubHubbub/Publisher.php
+++ b/library/Zend/Feed/PubSubHubbub/Publisher.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/PubSubHubbub/Subscriber.php b/library/Zend/Feed/PubSubHubbub/Subscriber.php
old mode 100755
new mode 100644
index 265fe776b..d5db90850
--- a/library/Zend/Feed/PubSubHubbub/Subscriber.php
+++ b/library/Zend/Feed/PubSubHubbub/Subscriber.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php b/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
old mode 100755
new mode 100644
index 5ec8af2fe..516025900
--- a/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
+++ b/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/PubSubHubbub/Version.php b/library/Zend/Feed/PubSubHubbub/Version.php
old mode 100755
new mode 100644
index edee6953b..9ac7fb4bd
--- a/library/Zend/Feed/PubSubHubbub/Version.php
+++ b/library/Zend/Feed/PubSubHubbub/Version.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/README.md b/library/Zend/Feed/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Feed/Reader/AbstractEntry.php b/library/Zend/Feed/Reader/AbstractEntry.php
old mode 100755
new mode 100644
index cf8a9361b..73363553f
--- a/library/Zend/Feed/Reader/AbstractEntry.php
+++ b/library/Zend/Feed/Reader/AbstractEntry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/AbstractFeed.php b/library/Zend/Feed/Reader/AbstractFeed.php
old mode 100755
new mode 100644
index f8aa49d81..7a3a9729f
--- a/library/Zend/Feed/Reader/AbstractFeed.php
+++ b/library/Zend/Feed/Reader/AbstractFeed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Collection.php b/library/Zend/Feed/Reader/Collection.php
old mode 100755
new mode 100644
index ac1c96384..f50c1bc2f
--- a/library/Zend/Feed/Reader/Collection.php
+++ b/library/Zend/Feed/Reader/Collection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Collection/AbstractCollection.php b/library/Zend/Feed/Reader/Collection/AbstractCollection.php
old mode 100755
new mode 100644
index 62580248d..749ff5c80
--- a/library/Zend/Feed/Reader/Collection/AbstractCollection.php
+++ b/library/Zend/Feed/Reader/Collection/AbstractCollection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Collection/Author.php b/library/Zend/Feed/Reader/Collection/Author.php
old mode 100755
new mode 100644
index 9e0996e14..82716db2a
--- a/library/Zend/Feed/Reader/Collection/Author.php
+++ b/library/Zend/Feed/Reader/Collection/Author.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Collection/Category.php b/library/Zend/Feed/Reader/Collection/Category.php
old mode 100755
new mode 100644
index 34b8fdedb..57d056040
--- a/library/Zend/Feed/Reader/Collection/Category.php
+++ b/library/Zend/Feed/Reader/Collection/Category.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Collection/Collection.php b/library/Zend/Feed/Reader/Collection/Collection.php
old mode 100755
new mode 100644
index 86a29276a..cf791c2e5
--- a/library/Zend/Feed/Reader/Collection/Collection.php
+++ b/library/Zend/Feed/Reader/Collection/Collection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Entry/AbstractEntry.php b/library/Zend/Feed/Reader/Entry/AbstractEntry.php
old mode 100755
new mode 100644
index 241a8cdba..c6e73259c
--- a/library/Zend/Feed/Reader/Entry/AbstractEntry.php
+++ b/library/Zend/Feed/Reader/Entry/AbstractEntry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Entry/Atom.php b/library/Zend/Feed/Reader/Entry/Atom.php
old mode 100755
new mode 100644
index ed61a21e5..77e54b90b
--- a/library/Zend/Feed/Reader/Entry/Atom.php
+++ b/library/Zend/Feed/Reader/Entry/Atom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Entry/EntryInterface.php b/library/Zend/Feed/Reader/Entry/EntryInterface.php
old mode 100755
new mode 100644
index 86fea3ec5..c5e5fb224
--- a/library/Zend/Feed/Reader/Entry/EntryInterface.php
+++ b/library/Zend/Feed/Reader/Entry/EntryInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Entry/Rss.php b/library/Zend/Feed/Reader/Entry/Rss.php
old mode 100755
new mode 100644
index a59c85fd7..666c0c2f4
--- a/library/Zend/Feed/Reader/Entry/Rss.php
+++ b/library/Zend/Feed/Reader/Entry/Rss.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Exception/BadMethodCallException.php b/library/Zend/Feed/Reader/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 3e265088a..008c57ecc
--- a/library/Zend/Feed/Reader/Exception/BadMethodCallException.php
+++ b/library/Zend/Feed/Reader/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,8 +11,6 @@ namespace Zend\Feed\Reader\Exception;
 
 use Zend\Feed\Exception;
 
-class BadMethodCallException
-    extends Exception\BadMethodCallException
-    implements ExceptionInterface
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Feed/Reader/Exception/ExceptionInterface.php b/library/Zend/Feed/Reader/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 148e5b2dc..e5e664aff
--- a/library/Zend/Feed/Reader/Exception/ExceptionInterface.php
+++ b/library/Zend/Feed/Reader/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php b/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 9f795c682..646b767b9
--- a/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php
+++ b/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,8 +11,6 @@ namespace Zend\Feed\Reader\Exception;
 
 use Zend\Feed\Exception;
 
-class InvalidArgumentException
-    extends Exception\InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Feed/Reader/Exception/RuntimeException.php b/library/Zend/Feed/Reader/Exception/RuntimeException.php
old mode 100755
new mode 100644
index e9ffc9e77..d876e7f00
--- a/library/Zend/Feed/Reader/Exception/RuntimeException.php
+++ b/library/Zend/Feed/Reader/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,8 +11,6 @@ namespace Zend\Feed\Reader\Exception;
 
 use Zend\Feed\Exception;
 
-class RuntimeException
-    extends Exception\RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Feed/Reader/Extension/AbstractEntry.php b/library/Zend/Feed/Reader/Extension/AbstractEntry.php
old mode 100755
new mode 100644
index 15e7574df..72bd62ea3
--- a/library/Zend/Feed/Reader/Extension/AbstractEntry.php
+++ b/library/Zend/Feed/Reader/Extension/AbstractEntry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Extension/AbstractFeed.php b/library/Zend/Feed/Reader/Extension/AbstractFeed.php
old mode 100755
new mode 100644
index 1bea2e498..94acea6e3
--- a/library/Zend/Feed/Reader/Extension/AbstractFeed.php
+++ b/library/Zend/Feed/Reader/Extension/AbstractFeed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -105,7 +105,6 @@ abstract class AbstractFeed
         return $type;
     }
 
-
     /**
      * Return the feed as an array
      *
diff --git a/library/Zend/Feed/Reader/Extension/Atom/Entry.php b/library/Zend/Feed/Reader/Extension/Atom/Entry.php
old mode 100755
new mode 100644
index 9e20321cd..12fb3c636
--- a/library/Zend/Feed/Reader/Extension/Atom/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/Atom/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Extension/Atom/Feed.php b/library/Zend/Feed/Reader/Extension/Atom/Feed.php
old mode 100755
new mode 100644
index 986d23fdb..14bf9c338
--- a/library/Zend/Feed/Reader/Extension/Atom/Feed.php
+++ b/library/Zend/Feed/Reader/Extension/Atom/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Extension/Content/Entry.php b/library/Zend/Feed/Reader/Extension/Content/Entry.php
old mode 100755
new mode 100644
index 9b5f7cb35..539848f25
--- a/library/Zend/Feed/Reader/Extension/Content/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/Content/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php b/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
old mode 100755
new mode 100644
index 1883dc6be..9ecb486b1
--- a/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php b/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
old mode 100755
new mode 100644
index 99977fd44..5aabe8b99
--- a/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
+++ b/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php b/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
old mode 100755
new mode 100644
index 2713353ca..1e656cd06
--- a/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -110,7 +110,6 @@ class Entry extends Extension\AbstractEntry
         return $this->data['categories'];
     }
 
-
     /**
      * Get the entry content
      *
diff --git a/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php b/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
old mode 100755
new mode 100644
index 2738ac732..182ce218a
--- a/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
+++ b/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Extension/Podcast/Entry.php b/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
old mode 100755
new mode 100644
index c97e64ff4..5aec2fd9c
--- a/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Extension/Podcast/Feed.php b/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
old mode 100755
new mode 100644
index 66b13a48b..9fb80de54
--- a/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
+++ b/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -63,7 +63,7 @@ class Feed extends Extension\AbstractFeed
     /**
      * Get the entry category
      *
-     * @return string
+     * @return array|null
      */
     public function getItunesCategories()
     {
@@ -93,7 +93,6 @@ class Feed extends Extension\AbstractFeed
             }
         }
 
-
         if (!$categories) {
             $categories = null;
         }
diff --git a/library/Zend/Feed/Reader/Extension/Slash/Entry.php b/library/Zend/Feed/Reader/Extension/Slash/Entry.php
old mode 100755
new mode 100644
index 9ddb862e2..786d894ea
--- a/library/Zend/Feed/Reader/Extension/Slash/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/Slash/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Extension/Syndication/Feed.php b/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
old mode 100755
new mode 100644
index db1724c14..09f12ddea
--- a/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
+++ b/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Extension/Thread/Entry.php b/library/Zend/Feed/Reader/Extension/Thread/Entry.php
old mode 100755
new mode 100644
index d3bc31587..e5de5bb1c
--- a/library/Zend/Feed/Reader/Extension/Thread/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/Thread/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php b/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
old mode 100755
new mode 100644
index 6d5a97705..42fafb4aa
--- a/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
+++ b/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/ExtensionManager.php b/library/Zend/Feed/Reader/ExtensionManager.php
old mode 100755
new mode 100644
index 9103643a3..bf694c8e2
--- a/library/Zend/Feed/Reader/ExtensionManager.php
+++ b/library/Zend/Feed/Reader/ExtensionManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/ExtensionManagerInterface.php b/library/Zend/Feed/Reader/ExtensionManagerInterface.php
old mode 100755
new mode 100644
index 4bbb91d9e..70ec37d4c
--- a/library/Zend/Feed/Reader/ExtensionManagerInterface.php
+++ b/library/Zend/Feed/Reader/ExtensionManagerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/ExtensionPluginManager.php b/library/Zend/Feed/Reader/ExtensionPluginManager.php
old mode 100755
new mode 100644
index 45d3b26b5..3e3308c29
--- a/library/Zend/Feed/Reader/ExtensionPluginManager.php
+++ b/library/Zend/Feed/Reader/ExtensionPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Feed/AbstractFeed.php b/library/Zend/Feed/Reader/Feed/AbstractFeed.php
old mode 100755
new mode 100644
index dd616bef7..ea9cd978e
--- a/library/Zend/Feed/Reader/Feed/AbstractFeed.php
+++ b/library/Zend/Feed/Reader/Feed/AbstractFeed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Feed/Atom.php b/library/Zend/Feed/Reader/Feed/Atom.php
old mode 100755
new mode 100644
index 72efcf760..50a0fb03c
--- a/library/Zend/Feed/Reader/Feed/Atom.php
+++ b/library/Zend/Feed/Reader/Feed/Atom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Feed/Atom/Source.php b/library/Zend/Feed/Reader/Feed/Atom/Source.php
old mode 100755
new mode 100644
index 5eabd974b..2590de655
--- a/library/Zend/Feed/Reader/Feed/Atom/Source.php
+++ b/library/Zend/Feed/Reader/Feed/Atom/Source.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Feed/FeedInterface.php b/library/Zend/Feed/Reader/Feed/FeedInterface.php
old mode 100755
new mode 100644
index c98a1b333..441ba9269
--- a/library/Zend/Feed/Reader/Feed/FeedInterface.php
+++ b/library/Zend/Feed/Reader/Feed/FeedInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Feed/Rss.php b/library/Zend/Feed/Reader/Feed/Rss.php
old mode 100755
new mode 100644
index bc930901e..16559971e
--- a/library/Zend/Feed/Reader/Feed/Rss.php
+++ b/library/Zend/Feed/Reader/Feed/Rss.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/FeedSet.php b/library/Zend/Feed/Reader/FeedSet.php
old mode 100755
new mode 100644
index e487bc8f4..798229e99
--- a/library/Zend/Feed/Reader/FeedSet.php
+++ b/library/Zend/Feed/Reader/FeedSet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Http/ClientInterface.php b/library/Zend/Feed/Reader/Http/ClientInterface.php
old mode 100755
new mode 100644
index 43932f761..138798185
--- a/library/Zend/Feed/Reader/Http/ClientInterface.php
+++ b/library/Zend/Feed/Reader/Http/ClientInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Http/ResponseInterface.php b/library/Zend/Feed/Reader/Http/ResponseInterface.php
old mode 100755
new mode 100644
index 39c51724b..96b422e16
--- a/library/Zend/Feed/Reader/Http/ResponseInterface.php
+++ b/library/Zend/Feed/Reader/Http/ResponseInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Reader/Reader.php b/library/Zend/Feed/Reader/Reader.php
old mode 100755
new mode 100644
index bcd387ad2..f6708df65
--- a/library/Zend/Feed/Reader/Reader.php
+++ b/library/Zend/Feed/Reader/Reader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -125,7 +125,6 @@ class Reader
         static::$httpClient = $httpClient;
     }
 
-
     /**
      * Gets the HTTP client object. If none is set, a new ZendHttp\Client will be used.
      *
diff --git a/library/Zend/Feed/Uri.php b/library/Zend/Feed/Uri.php
old mode 100755
new mode 100644
index 940bce11a..9a4565e35
--- a/library/Zend/Feed/Uri.php
+++ b/library/Zend/Feed/Uri.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/AbstractFeed.php b/library/Zend/Feed/Writer/AbstractFeed.php
old mode 100755
new mode 100644
index 1dd6fe54b..097a0a722
--- a/library/Zend/Feed/Writer/AbstractFeed.php
+++ b/library/Zend/Feed/Writer/AbstractFeed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Deleted.php b/library/Zend/Feed/Writer/Deleted.php
old mode 100755
new mode 100644
index b91ee0945..0b469f3dd
--- a/library/Zend/Feed/Writer/Deleted.php
+++ b/library/Zend/Feed/Writer/Deleted.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Entry.php b/library/Zend/Feed/Writer/Entry.php
old mode 100755
new mode 100644
index c5b1085ac..a17c3aa38
--- a/library/Zend/Feed/Writer/Entry.php
+++ b/library/Zend/Feed/Writer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Exception/BadMethodCallException.php b/library/Zend/Feed/Writer/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 79d1c82c7..b2ea2bef0
--- a/library/Zend/Feed/Writer/Exception/BadMethodCallException.php
+++ b/library/Zend/Feed/Writer/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -16,8 +16,6 @@ use Zend\Feed\Exception;
  *
  * Class to represent exceptions that occur during Feed operations.
  */
-class BadMethodCallException
-    extends Exception\BadMethodCallException
-    implements ExceptionInterface
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Feed/Writer/Exception/ExceptionInterface.php b/library/Zend/Feed/Writer/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index c2ed59beb..ee8bdaf62
--- a/library/Zend/Feed/Writer/Exception/ExceptionInterface.php
+++ b/library/Zend/Feed/Writer/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php b/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 838a01bbb..d8c4a8b82
--- a/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php
+++ b/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -16,8 +16,6 @@ use Zend\Feed\Exception;
  *
  * Class to represent exceptions that occur during Feed operations.
  */
-class InvalidArgumentException
-    extends Exception\InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Feed/Writer/Exception/RuntimeException.php b/library/Zend/Feed/Writer/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 0bab4b8f1..ae8ee361f
--- a/library/Zend/Feed/Writer/Exception/RuntimeException.php
+++ b/library/Zend/Feed/Writer/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,8 +11,6 @@ namespace Zend\Feed\Writer\Exception;
 
 use Zend\Feed\Exception;
 
-class RuntimeException
-    extends Exception\RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Feed/Writer/Extension/AbstractRenderer.php b/library/Zend/Feed/Writer/Extension/AbstractRenderer.php
old mode 100755
new mode 100644
index 5e4eb8c82..1a32b4756
--- a/library/Zend/Feed/Writer/Extension/AbstractRenderer.php
+++ b/library/Zend/Feed/Writer/Extension/AbstractRenderer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php b/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
old mode 100755
new mode 100644
index 6b24ec01c..25571c0e0
--- a/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
+++ b/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
old mode 100755
new mode 100644
index b90315169..939b2492b
--- a/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
old mode 100755
new mode 100644
index 8f9465c70..5cc86cd6b
--- a/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
old mode 100755
new mode 100644
index 6e68f98e8..160b5a484
--- a/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
+++ b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/ITunes/Entry.php b/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
old mode 100755
new mode 100644
index 1b7b64aa5..8032ce2f9
--- a/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/ITunes/Feed.php b/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
old mode 100755
new mode 100644
index 22c54db6e..5568d5de3
--- a/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
+++ b/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
old mode 100755
new mode 100644
index bc57d1daa..ed8f732ed
--- a/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
old mode 100755
new mode 100644
index e6113a22f..d978f0320
--- a/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
+++ b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/RendererInterface.php b/library/Zend/Feed/Writer/Extension/RendererInterface.php
old mode 100755
new mode 100644
index e72346c20..9afe88b2a
--- a/library/Zend/Feed/Writer/Extension/RendererInterface.php
+++ b/library/Zend/Feed/Writer/Extension/RendererInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
old mode 100755
new mode 100644
index 077caa6ef..c74cb0202
--- a/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
old mode 100755
new mode 100644
index a0ea739d8..6f19641b8
--- a/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
old mode 100755
new mode 100644
index d661360a1..48c0d8f2e
--- a/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
+++ b/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/ExtensionManager.php b/library/Zend/Feed/Writer/ExtensionManager.php
old mode 100755
new mode 100644
index 77d49a0dc..89be41d88
--- a/library/Zend/Feed/Writer/ExtensionManager.php
+++ b/library/Zend/Feed/Writer/ExtensionManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/ExtensionManagerInterface.php b/library/Zend/Feed/Writer/ExtensionManagerInterface.php
old mode 100755
new mode 100644
index 0f7e023fe..b0e28a08c
--- a/library/Zend/Feed/Writer/ExtensionManagerInterface.php
+++ b/library/Zend/Feed/Writer/ExtensionManagerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/ExtensionPluginManager.php b/library/Zend/Feed/Writer/ExtensionPluginManager.php
old mode 100755
new mode 100644
index 1155c84d2..6763374ca
--- a/library/Zend/Feed/Writer/ExtensionPluginManager.php
+++ b/library/Zend/Feed/Writer/ExtensionPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Feed.php b/library/Zend/Feed/Writer/Feed.php
old mode 100755
new mode 100644
index 36b2b3ba9..d402bb8f6
--- a/library/Zend/Feed/Writer/Feed.php
+++ b/library/Zend/Feed/Writer/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/FeedFactory.php b/library/Zend/Feed/Writer/FeedFactory.php
old mode 100755
new mode 100644
index 15e7a3468..99b528c73
--- a/library/Zend/Feed/Writer/FeedFactory.php
+++ b/library/Zend/Feed/Writer/FeedFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php b/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
old mode 100755
new mode 100644
index e10450198..76b9a685a
--- a/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
+++ b/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Renderer/Entry/Atom.php b/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
old mode 100755
new mode 100644
index 975aa7268..9f3aa7401
--- a/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
+++ b/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -137,7 +137,7 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
         $updated = $dom->createElement('updated');
         $root->appendChild($updated);
         $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->format(DateTime::ISO8601)
+            $this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
         );
         $updated->appendChild($text);
     }
@@ -157,7 +157,7 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
         $el = $dom->createElement('published');
         $root->appendChild($el);
         $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateCreated()->format(DateTime::ISO8601)
+            $this->getDataContainer()->getDateCreated()->format(DateTime::ATOM)
         );
         $el->appendChild($text);
     }
diff --git a/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php b/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
old mode 100755
new mode 100644
index 65ace00bd..8519bd9d9
--- a/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
+++ b/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -40,7 +40,7 @@ class Deleted extends Renderer\AbstractRenderer implements Renderer\RendererInte
         $this->dom->appendChild($entry);
 
         $entry->setAttribute('ref', $this->container->getReference());
-        $entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ISO8601));
+        $entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ATOM));
 
         $this->_setBy($this->dom, $entry);
         $this->_setComment($this->dom, $entry);
diff --git a/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php b/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php
old mode 100755
new mode 100644
index 1ed4aa3d9..f0db3e932
--- a/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php
+++ b/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -42,7 +42,7 @@ class AtomDeleted extends Renderer\AbstractRenderer implements Renderer\Renderer
         $this->dom->appendChild($entry);
 
         $entry->setAttribute('ref', $this->container->getReference());
-        $entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ISO8601));
+        $entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ATOM));
 
         $this->_setBy($this->dom, $entry);
         $this->_setComment($this->dom, $entry);
diff --git a/library/Zend/Feed/Writer/Renderer/Entry/Rss.php b/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
old mode 100755
new mode 100644
index 2338cdc21..aae2f46e2
--- a/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
+++ b/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php b/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
old mode 100755
new mode 100644
index e7ad9f56b..a5400a605
--- a/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -118,7 +118,7 @@ class AbstractAtom extends Renderer\AbstractRenderer
         $updated = $dom->createElement('updated');
         $root->appendChild($updated);
         $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->format(DateTime::ISO8601)
+            $this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
         );
         $updated->appendChild($text);
     }
diff --git a/library/Zend/Feed/Writer/Renderer/Feed/Atom.php b/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
old mode 100755
new mode 100644
index 87b6b94ac..2b33f6a1e
--- a/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php b/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
old mode 100755
new mode 100644
index 379cd5c9f..20fc8df81
--- a/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -115,7 +115,7 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
         $updated = $dom->createElement('updated');
         $root->appendChild($updated);
         $text = $dom->createTextNode(
-            $this->getDataContainer()->getDateModified()->format(DateTime::ISO8601)
+            $this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
         );
         $updated->appendChild($text);
     }
@@ -313,7 +313,6 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
         $img->appendChild($text);
     }
 
-
     /**
      * Set date feed was created
      *
diff --git a/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php b/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
old mode 100755
new mode 100644
index 30f576a1f..3793db0cb
--- a/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php b/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php
old mode 100755
new mode 100644
index bdadd4db0..d552b8089
--- a/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Renderer/Feed/Rss.php b/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
old mode 100755
new mode 100644
index 75c502e32..aff8ae160
--- a/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
+++ b/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Renderer/RendererInterface.php b/library/Zend/Feed/Writer/Renderer/RendererInterface.php
old mode 100755
new mode 100644
index b2e0e00a3..24738efca
--- a/library/Zend/Feed/Writer/Renderer/RendererInterface.php
+++ b/library/Zend/Feed/Writer/Renderer/RendererInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Source.php b/library/Zend/Feed/Writer/Source.php
old mode 100755
new mode 100644
index f0b4dcacb..23affa7a6
--- a/library/Zend/Feed/Writer/Source.php
+++ b/library/Zend/Feed/Writer/Source.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Version.php b/library/Zend/Feed/Writer/Version.php
old mode 100755
new mode 100644
index 8dd20df90..08351ca3f
--- a/library/Zend/Feed/Writer/Version.php
+++ b/library/Zend/Feed/Writer/Version.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/Writer/Writer.php b/library/Zend/Feed/Writer/Writer.php
old mode 100755
new mode 100644
index ae8e15364..8c5397892
--- a/library/Zend/Feed/Writer/Writer.php
+++ b/library/Zend/Feed/Writer/Writer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Feed/composer.json b/library/Zend/Feed/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/File/CONTRIBUTING.md b/library/Zend/File/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/File/ClassFileLocator.php b/library/Zend/File/ClassFileLocator.php
old mode 100755
new mode 100644
index 9ef7821a6..f8c28e863
--- a/library/Zend/File/ClassFileLocator.php
+++ b/library/Zend/File/ClassFileLocator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -116,6 +116,10 @@ class ClassFileLocator extends FilterIterator
                     break;
                 case $t_trait:
                 case T_CLASS:
+                    // ignore T_CLASS after T_DOUBLE_COLON to allow PHP >=5.5 FQCN scalar resolution
+                    if ($i > 0 && is_array($tokens[$i-1]) && $tokens[$i-1][0] === T_DOUBLE_COLON) {
+                        break;
+                    }
                 case T_INTERFACE:
                     // Abstract class, class, interface or trait found
 
diff --git a/library/Zend/File/Exception/BadMethodCallException.php b/library/Zend/File/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 04be86936..0e6ac0349
--- a/library/Zend/File/Exception/BadMethodCallException.php
+++ b/library/Zend/File/Exception/BadMethodCallException.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\File\Exception;
 
-class BadMethodCallException extends \BadMethodCallException implements
-    ExceptionInterface
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/File/Exception/ExceptionInterface.php b/library/Zend/File/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 851724f2a..984da8b6f
--- a/library/Zend/File/Exception/ExceptionInterface.php
+++ b/library/Zend/File/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/File/Exception/InvalidArgumentException.php b/library/Zend/File/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 83ae6a93e..c9132efde
--- a/library/Zend/File/Exception/InvalidArgumentException.php
+++ b/library/Zend/File/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -12,8 +12,6 @@ namespace Zend\File\Exception;
 /**
  * Exception class raised when invalid arguments are discovered
  */
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/File/Exception/RuntimeException.php b/library/Zend/File/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 530821bfa..bd9ae27b7
--- a/library/Zend/File/Exception/RuntimeException.php
+++ b/library/Zend/File/Exception/RuntimeException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\File\Exception;
 
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/File/PhpClassFile.php b/library/Zend/File/PhpClassFile.php
old mode 100755
new mode 100644
index 82503cf36..800c859ca
--- a/library/Zend/File/PhpClassFile.php
+++ b/library/Zend/File/PhpClassFile.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/File/README.md b/library/Zend/File/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/File/Transfer/Adapter/AbstractAdapter.php b/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
old mode 100755
new mode 100644
index a46935f69..90959b05f
--- a/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
+++ b/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -369,14 +369,18 @@ abstract class AbstractAdapter implements TranslatorAwareInterface
                                 break;
                             case (1 <= $argc):
                                 $validator  = array_shift($validatorInfo);
+                                // fall-through
                             case (2 <= $argc):
                                 $breakChainOnFailure = array_shift($validatorInfo);
+                                // fall-through
                             case (3 <= $argc):
                                 $options = array_shift($validatorInfo);
+                                // fall-through
                             case (4 <= $argc):
                                 if (!empty($validatorInfo)) {
                                     $file = array_shift($validatorInfo);
                                 }
+                                // fall-through
                             default:
                                 $this->addValidator($validator, $breakChainOnFailure, $options, $file);
                                 break;
@@ -523,13 +527,13 @@ abstract class AbstractAdapter implements TranslatorAwareInterface
             foreach ($options as $name => $value) {
                 foreach ($file as $key => $content) {
                     switch ($name) {
-                        case 'magicFile' :
+                        case 'magicFile':
                             $this->files[$key]['options'][$name] = (string) $value;
                             break;
 
-                        case 'ignoreNoFile' :
-                        case 'useByteString' :
-                        case 'detectInfos' :
+                        case 'ignoreNoFile':
+                        case 'useByteString':
+                        case 'detectInfos':
                             $this->files[$key]['options'][$name] = (bool) $value;
                             break;
 
diff --git a/library/Zend/File/Transfer/Adapter/FilterPluginManager.php b/library/Zend/File/Transfer/Adapter/FilterPluginManager.php
old mode 100755
new mode 100644
index 28da7ee4a..8179eef19
--- a/library/Zend/File/Transfer/Adapter/FilterPluginManager.php
+++ b/library/Zend/File/Transfer/Adapter/FilterPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/File/Transfer/Adapter/Http.php b/library/Zend/File/Transfer/Adapter/Http.php
old mode 100755
new mode 100644
index 3cba2184d..b7c2908be
--- a/library/Zend/File/Transfer/Adapter/Http.php
+++ b/library/Zend/File/Transfer/Adapter/Http.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php b/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
old mode 100755
new mode 100644
index f24f5d459..c6912c01b
--- a/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
+++ b/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/File/Transfer/Exception/BadMethodCallException.php b/library/Zend/File/Transfer/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 0d47a905b..ed9d0170e
--- a/library/Zend/File/Transfer/Exception/BadMethodCallException.php
+++ b/library/Zend/File/Transfer/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,7 +11,6 @@ namespace Zend\File\Transfer\Exception;
 
 use Zend\File\Exception;
 
-class BadMethodCallException extends Exception\BadMethodCallException implements
-    ExceptionInterface
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/File/Transfer/Exception/ExceptionInterface.php b/library/Zend/File/Transfer/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index a20e99fda..827196bf1
--- a/library/Zend/File/Transfer/Exception/ExceptionInterface.php
+++ b/library/Zend/File/Transfer/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -15,7 +15,6 @@ use Zend\File\Exception\ExceptionInterface as FileException;
  * Exception class for Zend\File\Transfer
  *
  */
-interface ExceptionInterface
-    extends FileException
+interface ExceptionInterface extends FileException
 {
 }
diff --git a/library/Zend/File/Transfer/Exception/InvalidArgumentException.php b/library/Zend/File/Transfer/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index f99187ef9..63999e30a
--- a/library/Zend/File/Transfer/Exception/InvalidArgumentException.php
+++ b/library/Zend/File/Transfer/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,7 +11,6 @@ namespace Zend\File\Transfer\Exception;
 
 use Zend\File\Exception;
 
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php b/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
old mode 100755
new mode 100644
index ae29a3c8d..8a358463f
--- a/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
+++ b/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/File/Transfer/Exception/RuntimeException.php b/library/Zend/File/Transfer/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 215a38ab6..29dcc843c
--- a/library/Zend/File/Transfer/Exception/RuntimeException.php
+++ b/library/Zend/File/Transfer/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,7 +11,6 @@ namespace Zend\File\Transfer\Exception;
 
 use Zend\File\Exception;
 
-class RuntimeException extends Exception\RuntimeException implements
-    ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/File/Transfer/Transfer.php b/library/Zend/File/Transfer/Transfer.php
old mode 100755
new mode 100644
index bdd44c37e..283500193
--- a/library/Zend/File/Transfer/Transfer.php
+++ b/library/Zend/File/Transfer/Transfer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/File/composer.json b/library/Zend/File/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Filter/AbstractFilter.php b/library/Zend/Filter/AbstractFilter.php
old mode 100755
new mode 100644
index a52bcfa73..138a74e81
--- a/library/Zend/Filter/AbstractFilter.php
+++ b/library/Zend/Filter/AbstractFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -52,10 +52,14 @@ abstract class AbstractFilter implements FilterInterface
             } elseif (array_key_exists($key, $this->options)) {
                 $this->options[$key] = $value;
             } else {
-                throw new Exception\InvalidArgumentException(sprintf(
-                    'The option "%s" does not have a matching %s setter method or options[%s] array key',
-                    $key, $setter, $key
-                ));
+                throw new Exception\InvalidArgumentException(
+                    sprintf(
+                        'The option "%s" does not have a matching %s setter method or options[%s] array key',
+                        $key,
+                        $setter,
+                        $key
+                    )
+                );
             }
         }
         return $this;
diff --git a/library/Zend/Filter/AbstractUnicode.php b/library/Zend/Filter/AbstractUnicode.php
old mode 100755
new mode 100644
index 685608f7d..b67c8fda2
--- a/library/Zend/Filter/AbstractUnicode.php
+++ b/library/Zend/Filter/AbstractUnicode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/BaseName.php b/library/Zend/Filter/BaseName.php
old mode 100755
new mode 100644
index 48807ca41..bdbb0b0d5
--- a/library/Zend/Filter/BaseName.php
+++ b/library/Zend/Filter/BaseName.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Boolean.php b/library/Zend/Filter/Boolean.php
old mode 100755
new mode 100644
index 505842f6f..87dc04a6b
--- a/library/Zend/Filter/Boolean.php
+++ b/library/Zend/Filter/Boolean.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -67,10 +67,7 @@ class Boolean extends AbstractFilter
             }
 
             if (is_array($typeOrOptions)) {
-                if (isset($typeOrOptions['type'])
-                    || isset($typeOrOptions['casting'])
-                    || isset($typeOrOptions['translations'])
-                ) {
+                if (isset($typeOrOptions['type']) || isset($typeOrOptions['casting']) || isset($typeOrOptions['translations'])) {
                     $this->setOptions($typeOrOptions);
                 } else {
                     $this->setType($typeOrOptions);
diff --git a/library/Zend/Filter/CONTRIBUTING.md b/library/Zend/Filter/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Filter/Callback.php b/library/Zend/Filter/Callback.php
old mode 100755
new mode 100644
index 51392e166..fea37c491
--- a/library/Zend/Filter/Callback.php
+++ b/library/Zend/Filter/Callback.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Compress.php b/library/Zend/Filter/Compress.php
old mode 100755
new mode 100644
index f6a49e779..d33de12a4
--- a/library/Zend/Filter/Compress.php
+++ b/library/Zend/Filter/Compress.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php b/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
old mode 100755
new mode 100644
index b97e68cf1..352c2dcbc
--- a/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
+++ b/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Compress/Bz2.php b/library/Zend/Filter/Compress/Bz2.php
old mode 100755
new mode 100644
index 79716118b..f0f4341c3
--- a/library/Zend/Filter/Compress/Bz2.php
+++ b/library/Zend/Filter/Compress/Bz2.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php b/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php
old mode 100755
new mode 100644
index cf4e5f3cb..6947ffd38
--- a/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php
+++ b/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Compress/Gz.php b/library/Zend/Filter/Compress/Gz.php
old mode 100755
new mode 100644
index aa0721af2..6663c3e12
--- a/library/Zend/Filter/Compress/Gz.php
+++ b/library/Zend/Filter/Compress/Gz.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Compress/Lzf.php b/library/Zend/Filter/Compress/Lzf.php
old mode 100755
new mode 100644
index ea4fd0c60..5e6b16efa
--- a/library/Zend/Filter/Compress/Lzf.php
+++ b/library/Zend/Filter/Compress/Lzf.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Compress/Rar.php b/library/Zend/Filter/Compress/Rar.php
old mode 100755
new mode 100644
index f8fb84588..39eb36c97
--- a/library/Zend/Filter/Compress/Rar.php
+++ b/library/Zend/Filter/Compress/Rar.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Compress/Snappy.php b/library/Zend/Filter/Compress/Snappy.php
old mode 100755
new mode 100644
index 33a9c6162..d6214e94f
--- a/library/Zend/Filter/Compress/Snappy.php
+++ b/library/Zend/Filter/Compress/Snappy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Compress/Tar.php b/library/Zend/Filter/Compress/Tar.php
old mode 100755
new mode 100644
index f8a3d3129..0addc7db6
--- a/library/Zend/Filter/Compress/Tar.php
+++ b/library/Zend/Filter/Compress/Tar.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -45,7 +45,8 @@ class Tar extends AbstractCompressionAlgorithm
         if (!class_exists('Archive_Tar')) {
             throw new Exception\ExtensionNotLoadedException(
                 'This filter needs PEAR\'s Archive_Tar component. '
-                . 'Ensure loading Archive_Tar (registering autoload or require_once)');
+                . 'Ensure loading Archive_Tar (registering autoload or require_once)'
+            );
         }
 
         parent::__construct($options);
@@ -171,10 +172,9 @@ class Tar extends AbstractCompressionAlgorithm
         if (is_dir($content)) {
             // collect all file infos
             foreach (new RecursiveIteratorIterator(
-                        new RecursiveDirectoryIterator($content, RecursiveDirectoryIterator::KEY_AS_PATHNAME),
-                        RecursiveIteratorIterator::SELF_FIRST
-                    ) as $directory => $info
-            ) {
+                new RecursiveDirectoryIterator($content, RecursiveDirectoryIterator::KEY_AS_PATHNAME),
+                RecursiveIteratorIterator::SELF_FIRST
+            ) as $directory => $info) {
                 if ($info->isFile()) {
                     $file[] = $directory;
                 }
diff --git a/library/Zend/Filter/Compress/Zip.php b/library/Zend/Filter/Compress/Zip.php
old mode 100755
new mode 100644
index 5a6f01a09..27781d2c1
--- a/library/Zend/Filter/Compress/Zip.php
+++ b/library/Zend/Filter/Compress/Zip.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -228,76 +228,76 @@ class Zip extends AbstractCompressionAlgorithm
     public function errorString($error)
     {
         switch ($error) {
-            case ZipArchive::ER_MULTIDISK :
+            case ZipArchive::ER_MULTIDISK:
                 return 'Multidisk ZIP Archives not supported';
 
-            case ZipArchive::ER_RENAME :
+            case ZipArchive::ER_RENAME:
                 return 'Failed to rename the temporary file for ZIP';
 
-            case ZipArchive::ER_CLOSE :
+            case ZipArchive::ER_CLOSE:
                 return 'Failed to close the ZIP Archive';
 
-            case ZipArchive::ER_SEEK :
+            case ZipArchive::ER_SEEK:
                 return 'Failure while seeking the ZIP Archive';
 
-            case ZipArchive::ER_READ :
+            case ZipArchive::ER_READ:
                 return 'Failure while reading the ZIP Archive';
 
-            case ZipArchive::ER_WRITE :
+            case ZipArchive::ER_WRITE:
                 return 'Failure while writing the ZIP Archive';
 
-            case ZipArchive::ER_CRC :
+            case ZipArchive::ER_CRC:
                 return 'CRC failure within the ZIP Archive';
 
-            case ZipArchive::ER_ZIPCLOSED :
+            case ZipArchive::ER_ZIPCLOSED:
                 return 'ZIP Archive already closed';
 
-            case ZipArchive::ER_NOENT :
+            case ZipArchive::ER_NOENT:
                 return 'No such file within the ZIP Archive';
 
-            case ZipArchive::ER_EXISTS :
+            case ZipArchive::ER_EXISTS:
                 return 'ZIP Archive already exists';
 
-            case ZipArchive::ER_OPEN :
+            case ZipArchive::ER_OPEN:
                 return 'Can not open ZIP Archive';
 
-            case ZipArchive::ER_TMPOPEN :
+            case ZipArchive::ER_TMPOPEN:
                 return 'Failure creating temporary ZIP Archive';
 
-            case ZipArchive::ER_ZLIB :
+            case ZipArchive::ER_ZLIB:
                 return 'ZLib Problem';
 
-            case ZipArchive::ER_MEMORY :
+            case ZipArchive::ER_MEMORY:
                 return 'Memory allocation problem while working on a ZIP Archive';
 
-            case ZipArchive::ER_CHANGED :
+            case ZipArchive::ER_CHANGED:
                 return 'ZIP Entry has been changed';
 
-            case ZipArchive::ER_COMPNOTSUPP :
+            case ZipArchive::ER_COMPNOTSUPP:
                 return 'Compression method not supported within ZLib';
 
-            case ZipArchive::ER_EOF :
+            case ZipArchive::ER_EOF:
                 return 'Premature EOF within ZIP Archive';
 
-            case ZipArchive::ER_INVAL :
+            case ZipArchive::ER_INVAL:
                 return 'Invalid argument for ZLIB';
 
-            case ZipArchive::ER_NOZIP :
+            case ZipArchive::ER_NOZIP:
                 return 'Given file is no zip archive';
 
-            case ZipArchive::ER_INTERNAL :
+            case ZipArchive::ER_INTERNAL:
                 return 'Internal error while working on a ZIP Archive';
 
-            case ZipArchive::ER_INCONS :
+            case ZipArchive::ER_INCONS:
                 return 'Inconsistent ZIP archive';
 
-            case ZipArchive::ER_REMOVE :
+            case ZipArchive::ER_REMOVE:
                 return 'Can not remove ZIP Archive';
 
-            case ZipArchive::ER_DELETED :
+            case ZipArchive::ER_DELETED:
                 return 'ZIP Entry has been deleted';
 
-            default :
+            default:
                 return 'Unknown error within ZIP Archive';
         }
     }
diff --git a/library/Zend/Filter/DateTimeFormatter.php b/library/Zend/Filter/DateTimeFormatter.php
old mode 100755
new mode 100644
index b24897b2f..091db4930
--- a/library/Zend/Filter/DateTimeFormatter.php
+++ b/library/Zend/Filter/DateTimeFormatter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Decompress.php b/library/Zend/Filter/Decompress.php
old mode 100755
new mode 100644
index 3489c70c1..440700090
--- a/library/Zend/Filter/Decompress.php
+++ b/library/Zend/Filter/Decompress.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Decrypt.php b/library/Zend/Filter/Decrypt.php
old mode 100755
new mode 100644
index 9c8e8492b..aa2b7b667
--- a/library/Zend/Filter/Decrypt.php
+++ b/library/Zend/Filter/Decrypt.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Digits.php b/library/Zend/Filter/Digits.php
old mode 100755
new mode 100644
index c5e856fbd..cb68407bf
--- a/library/Zend/Filter/Digits.php
+++ b/library/Zend/Filter/Digits.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Dir.php b/library/Zend/Filter/Dir.php
old mode 100755
new mode 100644
index 58bdb77d9..c0ba268b1
--- a/library/Zend/Filter/Dir.php
+++ b/library/Zend/Filter/Dir.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Encrypt.php b/library/Zend/Filter/Encrypt.php
old mode 100755
new mode 100644
index adb13843e..479a12bd5
--- a/library/Zend/Filter/Encrypt.php
+++ b/library/Zend/Filter/Encrypt.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -76,17 +76,20 @@ class Encrypt extends AbstractFilter
             $adapter = 'Zend\Filter\Encrypt\\' . ucfirst($adapter);
         } elseif (!class_exists($adapter)) {
             throw new Exception\DomainException(
-                sprintf('%s expects a valid registry class name; received "%s", which did not resolve',
+                sprintf(
+                    '%s expects a valid registry class name; received "%s", which did not resolve',
                     __METHOD__,
                     $adapter
-            ));
+                )
+            );
         }
 
         $this->adapter = new $adapter($options);
         if (!$this->adapter instanceof Encrypt\EncryptionAlgorithmInterface) {
             throw new Exception\InvalidArgumentException(
                 "Encoding adapter '" . $adapter
-                . "' does not implement Zend\\Filter\\Encrypt\\EncryptionAlgorithmInterface");
+                . "' does not implement Zend\\Filter\\Encrypt\\EncryptionAlgorithmInterface"
+            );
         }
 
         return $this;
@@ -120,7 +123,7 @@ class Encrypt extends AbstractFilter
      */
     public function filter($value)
     {
-        if (!is_string($value)) {
+        if (!is_string($value) && !is_numeric($value)) {
             return $value;
         }
 
diff --git a/library/Zend/Filter/Encrypt/BlockCipher.php b/library/Zend/Filter/Encrypt/BlockCipher.php
old mode 100755
new mode 100644
index 5b7c13664..b51a608b3
--- a/library/Zend/Filter/Encrypt/BlockCipher.php
+++ b/library/Zend/Filter/Encrypt/BlockCipher.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php b/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php
old mode 100755
new mode 100644
index faf0c518c..31257bc3c
--- a/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php
+++ b/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Encrypt/Openssl.php b/library/Zend/Filter/Encrypt/Openssl.php
old mode 100755
new mode 100644
index 571f58cdd..141e4a391
--- a/library/Zend/Filter/Encrypt/Openssl.php
+++ b/library/Zend/Filter/Encrypt/Openssl.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Exception/BadMethodCallException.php b/library/Zend/Filter/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index ae0d3f843..54bf48410
--- a/library/Zend/Filter/Exception/BadMethodCallException.php
+++ b/library/Zend/Filter/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Exception/DomainException.php b/library/Zend/Filter/Exception/DomainException.php
old mode 100755
new mode 100644
index 4a37739b6..8457b938c
--- a/library/Zend/Filter/Exception/DomainException.php
+++ b/library/Zend/Filter/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Exception/ExceptionInterface.php b/library/Zend/Filter/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index dd0be926b..013925569
--- a/library/Zend/Filter/Exception/ExceptionInterface.php
+++ b/library/Zend/Filter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Exception/ExtensionNotLoadedException.php b/library/Zend/Filter/Exception/ExtensionNotLoadedException.php
old mode 100755
new mode 100644
index 7a24b86c7..ef383df46
--- a/library/Zend/Filter/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Filter/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Exception/InvalidArgumentException.php b/library/Zend/Filter/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 52b1c8ab1..25d34607b
--- a/library/Zend/Filter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Filter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Exception/RuntimeException.php b/library/Zend/Filter/Exception/RuntimeException.php
old mode 100755
new mode 100644
index d8b160be7..7131d94c8
--- a/library/Zend/Filter/Exception/RuntimeException.php
+++ b/library/Zend/Filter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/File/Decrypt.php b/library/Zend/Filter/File/Decrypt.php
old mode 100755
new mode 100644
index 4d84fc3b4..95f12bc83
--- a/library/Zend/Filter/File/Decrypt.php
+++ b/library/Zend/Filter/File/Decrypt.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -74,7 +74,6 @@ class Decrypt extends Filter\Decrypt
             $value      = $value['tmp_name'];
         }
 
-
         if (!file_exists($value)) {
             throw new Exception\InvalidArgumentException("File '$value' not found");
         }
diff --git a/library/Zend/Filter/File/Encrypt.php b/library/Zend/Filter/File/Encrypt.php
old mode 100755
new mode 100644
index 9e32b4ce7..5638291a9
--- a/library/Zend/Filter/File/Encrypt.php
+++ b/library/Zend/Filter/File/Encrypt.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/File/LowerCase.php b/library/Zend/Filter/File/LowerCase.php
old mode 100755
new mode 100644
index 15d31482e..b730355d4
--- a/library/Zend/Filter/File/LowerCase.php
+++ b/library/Zend/Filter/File/LowerCase.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/File/Rename.php b/library/Zend/Filter/File/Rename.php
old mode 100755
new mode 100644
index 4ea75c6bb..8b04a4296
--- a/library/Zend/Filter/File/Rename.php
+++ b/library/Zend/Filter/File/Rename.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -225,15 +225,15 @@ class Rename extends Filter\AbstractFilter
                     $files['source'] = (string) $value;
                     break;
 
-                case 'target' :
+                case 'target':
                     $files['target'] = (string) $value;
                     break;
 
-                case 'overwrite' :
+                case 'overwrite':
                     $files['overwrite'] = (bool) $value;
                     break;
 
-                case 'randomize' :
+                case 'randomize':
                     $files['randomize'] = (bool) $value;
                     break;
 
diff --git a/library/Zend/Filter/File/RenameUpload.php b/library/Zend/Filter/File/RenameUpload.php
old mode 100755
new mode 100644
index e0b5d0b5e..52aacce3f
--- a/library/Zend/Filter/File/RenameUpload.php
+++ b/library/Zend/Filter/File/RenameUpload.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -218,7 +218,8 @@ class RenameUpload extends AbstractFilter
         if (!$result || null !== $warningException) {
             throw new Exception\RuntimeException(
                 sprintf("File '%s' could not be renamed. An error occurred while processing the file.", $sourceFile),
-                0, $warningException
+                0,
+                $warningException
             );
         }
 
diff --git a/library/Zend/Filter/File/UpperCase.php b/library/Zend/Filter/File/UpperCase.php
old mode 100755
new mode 100644
index 22bf09279..fe2af6df4
--- a/library/Zend/Filter/File/UpperCase.php
+++ b/library/Zend/Filter/File/UpperCase.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/FilterChain.php b/library/Zend/Filter/FilterChain.php
old mode 100755
new mode 100644
index 5809b2eb8..17ed93c5c
--- a/library/Zend/Filter/FilterChain.php
+++ b/library/Zend/Filter/FilterChain.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/FilterInterface.php b/library/Zend/Filter/FilterInterface.php
old mode 100755
new mode 100644
index 2b3c16353..a3a0c4106
--- a/library/Zend/Filter/FilterInterface.php
+++ b/library/Zend/Filter/FilterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/FilterPluginManager.php b/library/Zend/Filter/FilterPluginManager.php
old mode 100755
new mode 100644
index 3cff6b46c..d556bf72a
--- a/library/Zend/Filter/FilterPluginManager.php
+++ b/library/Zend/Filter/FilterPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/HtmlEntities.php b/library/Zend/Filter/HtmlEntities.php
old mode 100755
new mode 100644
index 2abff010b..a77ba6ed4
--- a/library/Zend/Filter/HtmlEntities.php
+++ b/library/Zend/Filter/HtmlEntities.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -97,7 +97,6 @@ class HtmlEntities extends AbstractFilter
         return $this;
     }
 
-
     /**
      * Get encoding
      *
diff --git a/library/Zend/Filter/Inflector.php b/library/Zend/Filter/Inflector.php
old mode 100755
new mode 100644
index 4120a68f2..dc7e07ef3
--- a/library/Zend/Filter/Inflector.php
+++ b/library/Zend/Filter/Inflector.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Int.php b/library/Zend/Filter/Int.php
old mode 100755
new mode 100644
index 0f2b80dba..787d6eb2c
--- a/library/Zend/Filter/Int.php
+++ b/library/Zend/Filter/Int.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Null.php b/library/Zend/Filter/Null.php
old mode 100755
new mode 100644
index 6b7c653c0..dee5857c1
--- a/library/Zend/Filter/Null.php
+++ b/library/Zend/Filter/Null.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/PregReplace.php b/library/Zend/Filter/PregReplace.php
old mode 100755
new mode 100644
index 9a7e3f3ad..5eeb9476d
--- a/library/Zend/Filter/PregReplace.php
+++ b/library/Zend/Filter/PregReplace.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -32,9 +32,7 @@ class PregReplace extends AbstractFilter
             $options = iterator_to_array($options);
         }
 
-        if (!is_array($options)
-            || (!isset($options['pattern']) && !isset($options['replacement']))
-        ) {
+        if (!is_array($options) || (!isset($options['pattern']) && !isset($options['replacement']))) {
             $args = func_get_args();
             if (isset($args[0])) {
                 $this->setPattern($args[0]);
diff --git a/library/Zend/Filter/README.md b/library/Zend/Filter/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Filter/RealPath.php b/library/Zend/Filter/RealPath.php
old mode 100755
new mode 100644
index 00633d5c9..9a2053274
--- a/library/Zend/Filter/RealPath.php
+++ b/library/Zend/Filter/RealPath.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/StaticFilter.php b/library/Zend/Filter/StaticFilter.php
old mode 100755
new mode 100644
index 2847137b6..aeb5c104e
--- a/library/Zend/Filter/StaticFilter.php
+++ b/library/Zend/Filter/StaticFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/StringToLower.php b/library/Zend/Filter/StringToLower.php
old mode 100755
new mode 100644
index 3d6f66a46..9bbd71221
--- a/library/Zend/Filter/StringToLower.php
+++ b/library/Zend/Filter/StringToLower.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -54,7 +54,7 @@ class StringToLower extends AbstractUnicode
         $value = (string) $value;
 
         if ($this->options['encoding'] !== null) {
-            return mb_strtolower($value,  $this->options['encoding']);
+            return mb_strtolower($value, $this->options['encoding']);
         }
 
         return strtolower($value);
diff --git a/library/Zend/Filter/StringToUpper.php b/library/Zend/Filter/StringToUpper.php
old mode 100755
new mode 100644
index 7f4c78e12..4da55114c
--- a/library/Zend/Filter/StringToUpper.php
+++ b/library/Zend/Filter/StringToUpper.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -54,7 +54,7 @@ class StringToUpper extends AbstractUnicode
         $value = (string) $value;
 
         if ($this->options['encoding'] !== null) {
-            return mb_strtoupper($value,  $this->options['encoding']);
+            return mb_strtoupper($value, $this->options['encoding']);
         }
 
         return strtoupper($value);
diff --git a/library/Zend/Filter/StringTrim.php b/library/Zend/Filter/StringTrim.php
old mode 100755
new mode 100644
index 2eae7fa36..4ec0e6ce8
--- a/library/Zend/Filter/StringTrim.php
+++ b/library/Zend/Filter/StringTrim.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -28,9 +28,7 @@ class StringTrim extends AbstractFilter
     public function __construct($charlistOrOptions = null)
     {
         if ($charlistOrOptions !== null) {
-            if (!is_array($charlistOrOptions)
-                && !$charlistOrOptions  instanceof Traversable
-            ) {
+            if (!is_array($charlistOrOptions) && !$charlistOrOptions  instanceof Traversable) {
                 $this->setCharList($charlistOrOptions);
             } else {
                 $this->setOptions($charlistOrOptions);
diff --git a/library/Zend/Filter/StripNewlines.php b/library/Zend/Filter/StripNewlines.php
old mode 100755
new mode 100644
index 481facaa8..dcf4a1ea4
--- a/library/Zend/Filter/StripNewlines.php
+++ b/library/Zend/Filter/StripNewlines.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/StripTags.php b/library/Zend/Filter/StripTags.php
old mode 100755
new mode 100644
index 7caf4605e..24cc346f7
--- a/library/Zend/Filter/StripTags.php
+++ b/library/Zend/Filter/StripTags.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -105,9 +105,8 @@ class StripTags extends AbstractFilter
                 $tagName = strtolower($element);
                 // Store the tag as allowed with no attributes
                 $this->tagsAllowed[$tagName] = array();
-            }
-            // Otherwise, if a tag was provided with attributes
-            elseif (is_string($index) && (is_array($element) || is_string($element))) {
+            } elseif (is_string($index) && (is_array($element) || is_string($element))) {
+                // Otherwise, if a tag was provided with attributes
                 // Canonicalize the tag name
                 $tagName = strtolower($index);
                 // Canonicalize the attributes
@@ -189,7 +188,7 @@ class StripTags extends AbstractFilter
             if (!preg_match('/--\s*>/s', $value)) {
                 $value = '';
             } else {
-                $value = preg_replace('/<(?:!(?:--[\s\S]*?--\s*)?(>))/s', '',  $value);
+                $value = preg_replace('/<(?:!(?:--[\s\S]*?--\s*)?(>))/s', '', $value);
             }
 
             $value = $start . $value;
diff --git a/library/Zend/Filter/UriNormalize.php b/library/Zend/Filter/UriNormalize.php
old mode 100755
new mode 100644
index 0ab201524..894f673f5
--- a/library/Zend/Filter/UriNormalize.php
+++ b/library/Zend/Filter/UriNormalize.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/AbstractSeparator.php b/library/Zend/Filter/Word/AbstractSeparator.php
old mode 100755
new mode 100644
index 598b0a0bf..9c2e71c06
--- a/library/Zend/Filter/Word/AbstractSeparator.php
+++ b/library/Zend/Filter/Word/AbstractSeparator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/CamelCaseToDash.php b/library/Zend/Filter/Word/CamelCaseToDash.php
old mode 100755
new mode 100644
index f2d1c3462..ce31683b9
--- a/library/Zend/Filter/Word/CamelCaseToDash.php
+++ b/library/Zend/Filter/Word/CamelCaseToDash.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/CamelCaseToSeparator.php b/library/Zend/Filter/Word/CamelCaseToSeparator.php
old mode 100755
new mode 100644
index 0a06586b9..e6addca68
--- a/library/Zend/Filter/Word/CamelCaseToSeparator.php
+++ b/library/Zend/Filter/Word/CamelCaseToSeparator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/CamelCaseToUnderscore.php b/library/Zend/Filter/Word/CamelCaseToUnderscore.php
old mode 100755
new mode 100644
index fb28b6c56..825078476
--- a/library/Zend/Filter/Word/CamelCaseToUnderscore.php
+++ b/library/Zend/Filter/Word/CamelCaseToUnderscore.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/DashToCamelCase.php b/library/Zend/Filter/Word/DashToCamelCase.php
old mode 100755
new mode 100644
index 4d211a01f..6bf36f874
--- a/library/Zend/Filter/Word/DashToCamelCase.php
+++ b/library/Zend/Filter/Word/DashToCamelCase.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/DashToSeparator.php b/library/Zend/Filter/Word/DashToSeparator.php
old mode 100755
new mode 100644
index 086aaa2b1..856d3c2d9
--- a/library/Zend/Filter/Word/DashToSeparator.php
+++ b/library/Zend/Filter/Word/DashToSeparator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/DashToUnderscore.php b/library/Zend/Filter/Word/DashToUnderscore.php
old mode 100755
new mode 100644
index b7d569411..104dedc34
--- a/library/Zend/Filter/Word/DashToUnderscore.php
+++ b/library/Zend/Filter/Word/DashToUnderscore.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/SeparatorToCamelCase.php b/library/Zend/Filter/Word/SeparatorToCamelCase.php
old mode 100755
new mode 100644
index 2804570bd..7526a30f5
--- a/library/Zend/Filter/Word/SeparatorToCamelCase.php
+++ b/library/Zend/Filter/Word/SeparatorToCamelCase.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/SeparatorToDash.php b/library/Zend/Filter/Word/SeparatorToDash.php
old mode 100755
new mode 100644
index 3558a75bc..d9da74d39
--- a/library/Zend/Filter/Word/SeparatorToDash.php
+++ b/library/Zend/Filter/Word/SeparatorToDash.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/SeparatorToSeparator.php b/library/Zend/Filter/Word/SeparatorToSeparator.php
old mode 100755
new mode 100644
index ed5b50f7e..21713c680
--- a/library/Zend/Filter/Word/SeparatorToSeparator.php
+++ b/library/Zend/Filter/Word/SeparatorToSeparator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/UnderscoreToCamelCase.php b/library/Zend/Filter/Word/UnderscoreToCamelCase.php
old mode 100755
new mode 100644
index fc9c5138f..0c6c5be65
--- a/library/Zend/Filter/Word/UnderscoreToCamelCase.php
+++ b/library/Zend/Filter/Word/UnderscoreToCamelCase.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/UnderscoreToDash.php b/library/Zend/Filter/Word/UnderscoreToDash.php
old mode 100755
new mode 100644
index 1a39ebec3..816d35571
--- a/library/Zend/Filter/Word/UnderscoreToDash.php
+++ b/library/Zend/Filter/Word/UnderscoreToDash.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/Word/UnderscoreToSeparator.php b/library/Zend/Filter/Word/UnderscoreToSeparator.php
old mode 100755
new mode 100644
index 86d35a28b..0d55ca4eb
--- a/library/Zend/Filter/Word/UnderscoreToSeparator.php
+++ b/library/Zend/Filter/Word/UnderscoreToSeparator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Filter/composer.json b/library/Zend/Filter/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Form/Annotation/AbstractAnnotationsListener.php b/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
old mode 100755
new mode 100644
index 62685edcc..acdae220d
--- a/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
+++ b/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/AbstractArrayAnnotation.php b/library/Zend/Form/Annotation/AbstractArrayAnnotation.php
old mode 100755
new mode 100644
index d6d8b315d..87c289714
--- a/library/Zend/Form/Annotation/AbstractArrayAnnotation.php
+++ b/library/Zend/Form/Annotation/AbstractArrayAnnotation.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/AbstractArrayOrStringAnnotation.php b/library/Zend/Form/Annotation/AbstractArrayOrStringAnnotation.php
old mode 100755
new mode 100644
index 04e3733a2..221f57bee
--- a/library/Zend/Form/Annotation/AbstractArrayOrStringAnnotation.php
+++ b/library/Zend/Form/Annotation/AbstractArrayOrStringAnnotation.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/AbstractStringAnnotation.php b/library/Zend/Form/Annotation/AbstractStringAnnotation.php
old mode 100755
new mode 100644
index a327ae5c1..b8e8c897c
--- a/library/Zend/Form/Annotation/AbstractStringAnnotation.php
+++ b/library/Zend/Form/Annotation/AbstractStringAnnotation.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/AllowEmpty.php b/library/Zend/Form/Annotation/AllowEmpty.php
old mode 100755
new mode 100644
index eb3a0b70e..682dc2fca
--- a/library/Zend/Form/Annotation/AllowEmpty.php
+++ b/library/Zend/Form/Annotation/AllowEmpty.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/AnnotationBuilder.php b/library/Zend/Form/Annotation/AnnotationBuilder.php
old mode 100755
new mode 100644
index a7e095213..c64613828
--- a/library/Zend/Form/Annotation/AnnotationBuilder.php
+++ b/library/Zend/Form/Annotation/AnnotationBuilder.php
@@ -3,14 +3,13 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Form\Annotation;
 
 use ArrayObject;
-use ReflectionClass;
 use Zend\Code\Annotation\AnnotationCollection;
 use Zend\Code\Annotation\AnnotationManager;
 use Zend\Code\Annotation\Parser;
@@ -335,7 +334,7 @@ class AnnotationBuilder implements EventManagerAwareInterface, FormFactoryAwareI
             : 'Zend\Form\Element';
 
         // Compose as a fieldset or an element, based on specification type
-        if (static::isSubclassOf($type, 'Zend\Form\FieldsetInterface')) {
+        if (is_subclass_of($type, 'Zend\Form\FieldsetInterface')) {
             if (!isset($formSpec['fieldsets'])) {
                 $formSpec['fieldsets'] = array();
             }
@@ -388,22 +387,14 @@ class AnnotationBuilder implements EventManagerAwareInterface, FormFactoryAwareI
      * @see https://bugs.php.net/bug.php?id=53727
      * @see https://github.com/zendframework/zf2/pull/1807
      *
+     * @deprecated since zf 2.3 requires PHP >= 5.3.23
+     *
      * @param string $className
      * @param string $type
      * @return bool
      */
     protected static function isSubclassOf($className, $type)
     {
-        if (is_subclass_of($className, $type)) {
-            return true;
-        }
-        if (PHP_VERSION_ID >= 50307) {
-            return false;
-        }
-        if (!interface_exists($type)) {
-            return false;
-        }
-        $r = new ReflectionClass($className);
-        return $r->implementsInterface($type);
+        return is_subclass_of($className, $type);
     }
 }
diff --git a/library/Zend/Form/Annotation/Attributes.php b/library/Zend/Form/Annotation/Attributes.php
old mode 100755
new mode 100644
index 2a6398f55..db4c5bc5b
--- a/library/Zend/Form/Annotation/Attributes.php
+++ b/library/Zend/Form/Annotation/Attributes.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/ComposedObject.php b/library/Zend/Form/Annotation/ComposedObject.php
old mode 100755
new mode 100644
index 5aa73642c..b8649f997
--- a/library/Zend/Form/Annotation/ComposedObject.php
+++ b/library/Zend/Form/Annotation/ComposedObject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/ElementAnnotationsListener.php b/library/Zend/Form/Annotation/ElementAnnotationsListener.php
old mode 100755
new mode 100644
index e751f6dba..8bfdcb495
--- a/library/Zend/Form/Annotation/ElementAnnotationsListener.php
+++ b/library/Zend/Form/Annotation/ElementAnnotationsListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -142,7 +142,7 @@ class ElementAnnotationsListener extends AbstractAnnotationsListener
 
             $elementSpec['spec']['type'] = 'Zend\Form\Element\Collection';
             $elementSpec['spec']['name'] = $name;
-            $elementSpec['spec']['options'] = new ArrayObject($annotation->getOptions());
+            $elementSpec['spec']['options'] = new ArrayObject($this->mergeOptions($elementSpec, $annotation));
             $elementSpec['spec']['options']['target_element'] = $specification;
             $elementSpec['spec']['options']['target_element']['options']['input_filter_spec'] = $inputFilter;
 
@@ -163,14 +163,10 @@ class ElementAnnotationsListener extends AbstractAnnotationsListener
                 $specification['type'] = 'Zend\Form\Fieldset';
             }
 
-            // Merge options of composed object with the ones of the target object:
-            $options = (isset($elementSpec['spec']['options']) && is_array($elementSpec['spec']['options'])) ? $elementSpec['spec']['options'] : array();
-            $options = array_merge($options, $annotation->getOptions());
-
             // Add element spec:
             $elementSpec['spec'] = $specification;
             $elementSpec['spec']['name'] = $name;
-            $elementSpec['spec']['options'] = new ArrayObject($options);
+            $elementSpec['spec']['options'] = new ArrayObject($this->mergeOptions($elementSpec, $annotation));
         }
     }
 
@@ -324,7 +320,7 @@ class ElementAnnotationsListener extends AbstractAnnotationsListener
         }
 
         $elementSpec = $e->getParam('elementSpec');
-        $elementSpec['spec']['options'] = $annotation->getOptions();
+        $elementSpec['spec']['options'] = $this->mergeOptions($elementSpec, $annotation);
     }
 
     /**
@@ -396,4 +392,25 @@ class ElementAnnotationsListener extends AbstractAnnotationsListener
         }
         $inputSpec['validators'][] = $annotation->getValidator();
     }
+
+    /**
+     * @param array|\ArrayAccess     $elementSpec
+     * @param ComposedObject|Options $annotation
+     *
+     * @return array
+     */
+    private function mergeOptions($elementSpec, $annotation)
+    {
+        if (isset($elementSpec['spec']['options'])) {
+            if (is_array($elementSpec['spec']['options'])) {
+                return array_merge($elementSpec['spec']['options'], $annotation->getOptions());
+            }
+
+            if ($elementSpec['spec']['options'] instanceof ArrayObject) {
+                return array_merge($elementSpec['spec']['options']->getArrayCopy(), $annotation->getOptions());
+            }
+        }
+
+        return $annotation->getOptions();
+    }
 }
diff --git a/library/Zend/Form/Annotation/ErrorMessage.php b/library/Zend/Form/Annotation/ErrorMessage.php
old mode 100755
new mode 100644
index e9ae743c6..28c334b63
--- a/library/Zend/Form/Annotation/ErrorMessage.php
+++ b/library/Zend/Form/Annotation/ErrorMessage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/Exclude.php b/library/Zend/Form/Annotation/Exclude.php
old mode 100755
new mode 100644
index 317d976bd..d2ba94cad
--- a/library/Zend/Form/Annotation/Exclude.php
+++ b/library/Zend/Form/Annotation/Exclude.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/Filter.php b/library/Zend/Form/Annotation/Filter.php
old mode 100755
new mode 100644
index e43b88dd7..ffe43eacb
--- a/library/Zend/Form/Annotation/Filter.php
+++ b/library/Zend/Form/Annotation/Filter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/Flags.php b/library/Zend/Form/Annotation/Flags.php
old mode 100755
new mode 100644
index d7573f7e9..35fafb756
--- a/library/Zend/Form/Annotation/Flags.php
+++ b/library/Zend/Form/Annotation/Flags.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/FormAnnotationsListener.php b/library/Zend/Form/Annotation/FormAnnotationsListener.php
old mode 100755
new mode 100644
index 4adf57866..985660922
--- a/library/Zend/Form/Annotation/FormAnnotationsListener.php
+++ b/library/Zend/Form/Annotation/FormAnnotationsListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/Hydrator.php b/library/Zend/Form/Annotation/Hydrator.php
old mode 100755
new mode 100644
index c7f5e45d1..d8aa0d9f0
--- a/library/Zend/Form/Annotation/Hydrator.php
+++ b/library/Zend/Form/Annotation/Hydrator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/Input.php b/library/Zend/Form/Annotation/Input.php
old mode 100755
new mode 100644
index c01e29e16..702215980
--- a/library/Zend/Form/Annotation/Input.php
+++ b/library/Zend/Form/Annotation/Input.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/InputFilter.php b/library/Zend/Form/Annotation/InputFilter.php
old mode 100755
new mode 100644
index 0ba09013f..c2c8abc75
--- a/library/Zend/Form/Annotation/InputFilter.php
+++ b/library/Zend/Form/Annotation/InputFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/Name.php b/library/Zend/Form/Annotation/Name.php
old mode 100755
new mode 100644
index 63927832a..47b7ee569
--- a/library/Zend/Form/Annotation/Name.php
+++ b/library/Zend/Form/Annotation/Name.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/Object.php b/library/Zend/Form/Annotation/Object.php
old mode 100755
new mode 100644
index 19cfb154a..d2dd93bad
--- a/library/Zend/Form/Annotation/Object.php
+++ b/library/Zend/Form/Annotation/Object.php
@@ -3,20 +3,19 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Form\Annotation;
 
-
 /**
  * Object annotation
  *
  * Use this annotation to specify an object to use as the bound object of a form or fieldset
  *
  * @Annotation
- * @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 Object extends AbstractStringAnnotation
diff --git a/library/Zend/Form/Annotation/Options.php b/library/Zend/Form/Annotation/Options.php
old mode 100755
new mode 100644
index 26743b840..6638d5937
--- a/library/Zend/Form/Annotation/Options.php
+++ b/library/Zend/Form/Annotation/Options.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/Required.php b/library/Zend/Form/Annotation/Required.php
old mode 100755
new mode 100644
index 666370aba..b3f1fe9ea
--- a/library/Zend/Form/Annotation/Required.php
+++ b/library/Zend/Form/Annotation/Required.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/Type.php b/library/Zend/Form/Annotation/Type.php
old mode 100755
new mode 100644
index 9fd0f5dd1..9acee1f1c
--- a/library/Zend/Form/Annotation/Type.php
+++ b/library/Zend/Form/Annotation/Type.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Annotation/ValidationGroup.php b/library/Zend/Form/Annotation/ValidationGroup.php
old mode 100755
new mode 100644
index 85e5c7b14..4bac8da03
--- a/library/Zend/Form/Annotation/ValidationGroup.php
+++ b/library/Zend/Form/Annotation/ValidationGroup.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -17,7 +17,7 @@ namespace Zend\Form\Annotation;
  * The value should be an associative array.
  *
  * @Annotation
- * @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 ValidationGroup extends AbstractArrayAnnotation
diff --git a/library/Zend/Form/Annotation/Validator.php b/library/Zend/Form/Annotation/Validator.php
old mode 100755
new mode 100644
index 61cb66327..7c8349d09
--- a/library/Zend/Form/Annotation/Validator.php
+++ b/library/Zend/Form/Annotation/Validator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/CONTRIBUTING.md b/library/Zend/Form/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Form/Element.php b/library/Zend/Form/Element.php
old mode 100755
new mode 100644
index cfe6880d6..b450d116d
--- a/library/Zend/Form/Element.php
+++ b/library/Zend/Form/Element.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Button.php b/library/Zend/Form/Element/Button.php
old mode 100755
new mode 100644
index 93b9360b1..22e6f62f5
--- a/library/Zend/Form/Element/Button.php
+++ b/library/Zend/Form/Element/Button.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Captcha.php b/library/Zend/Form/Element/Captcha.php
old mode 100755
new mode 100644
index 92f43158a..2d0d45b39
--- a/library/Zend/Form/Element/Captcha.php
+++ b/library/Zend/Form/Element/Captcha.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Checkbox.php b/library/Zend/Form/Element/Checkbox.php
old mode 100755
new mode 100644
index a7fe6fc8d..9d60cdd9a
--- a/library/Zend/Form/Element/Checkbox.php
+++ b/library/Zend/Form/Element/Checkbox.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Collection.php b/library/Zend/Form/Element/Collection.php
old mode 100755
new mode 100644
index f8abf9a17..ff6d1e7f1
--- a/library/Zend/Form/Element/Collection.php
+++ b/library/Zend/Form/Element/Collection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Color.php b/library/Zend/Form/Element/Color.php
old mode 100755
new mode 100644
index 17d42b77f..7de8ee97e
--- a/library/Zend/Form/Element/Color.php
+++ b/library/Zend/Form/Element/Color.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Csrf.php b/library/Zend/Form/Element/Csrf.php
old mode 100755
new mode 100644
index 1ff15aec9..8c8bfa035
--- a/library/Zend/Form/Element/Csrf.php
+++ b/library/Zend/Form/Element/Csrf.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Date.php b/library/Zend/Form/Element/Date.php
old mode 100755
new mode 100644
index 581824f58..209060f37
--- a/library/Zend/Form/Element/Date.php
+++ b/library/Zend/Form/Element/Date.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/DateSelect.php b/library/Zend/Form/Element/DateSelect.php
old mode 100755
new mode 100644
index 490f6013b..d05bf4862
--- a/library/Zend/Form/Element/DateSelect.php
+++ b/library/Zend/Form/Element/DateSelect.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -89,7 +89,7 @@ class DateSelect extends MonthSelect
     /**
      * @param  string|array|\ArrayAccess|PhpDateTime $value
      * @throws \Zend\Form\Exception\InvalidArgumentException
-     * @return void|\Zend\Form\Element
+     * @return self Provides a fluent interface
      */
     public function setValue($value)
     {
@@ -112,6 +112,8 @@ class DateSelect extends MonthSelect
         $this->yearElement->setValue($value['year']);
         $this->monthElement->setValue($value['month']);
         $this->dayElement->setValue($value['day']);
+
+        return $this;
     }
 
     /**
@@ -119,7 +121,8 @@ class DateSelect extends MonthSelect
      */
     public function getValue()
     {
-        return sprintf('%s-%s-%s',
+        return sprintf(
+            '%s-%s-%s',
             $this->getYearElement()->getValue(),
             $this->getMonthElement()->getValue(),
             $this->getDayElement()->getValue()
diff --git a/library/Zend/Form/Element/DateTime.php b/library/Zend/Form/Element/DateTime.php
old mode 100755
new mode 100644
index 1a7ff5982..3ec892eda
--- a/library/Zend/Form/Element/DateTime.php
+++ b/library/Zend/Form/Element/DateTime.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/DateTimeLocal.php b/library/Zend/Form/Element/DateTimeLocal.php
old mode 100755
new mode 100644
index f27cdb80c..5e602a492
--- a/library/Zend/Form/Element/DateTimeLocal.php
+++ b/library/Zend/Form/Element/DateTimeLocal.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/DateTimeSelect.php b/library/Zend/Form/Element/DateTimeSelect.php
old mode 100755
new mode 100644
index 26e88833a..a34747f89
--- a/library/Zend/Form/Element/DateTimeSelect.php
+++ b/library/Zend/Form/Element/DateTimeSelect.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -252,7 +252,8 @@ class DateTimeSelect extends DateSelect
      */
     public function getValue()
     {
-        return sprintf('%s-%s-%s %s:%s:%s',
+        return sprintf(
+            '%s-%s-%s %s:%s:%s',
             $this->getYearElement()->getValue(),
             $this->getMonthElement()->getValue(),
             $this->getDayElement()->getValue(),
@@ -313,9 +314,14 @@ class DateTimeSelect extends DateSelect
                                 if (!isset($date['second'])) {
                                     $date['second'] = '00';
                                 }
-                                $date = sprintf('%s-%s-%s %s:%s:%s',
-                                    $date['year'], $date['month'], $date['day'],
-                                    $date['hour'], $date['minute'], $date['second']
+                                $date = sprintf(
+                                    '%s-%s-%s %s:%s:%s',
+                                    $date['year'],
+                                    $date['month'],
+                                    $date['day'],
+                                    $date['hour'],
+                                    $date['minute'],
+                                    $date['second']
                                 );
                             }
 
diff --git a/library/Zend/Form/Element/Email.php b/library/Zend/Form/Element/Email.php
old mode 100755
new mode 100644
index 69d36fb6f..a16eb4a88
--- a/library/Zend/Form/Element/Email.php
+++ b/library/Zend/Form/Element/Email.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -116,7 +116,6 @@ class Email extends Element implements InputProviderInterface
         return $this;
     }
 
-
     /**
      * Provide default input rules for this element
      *
diff --git a/library/Zend/Form/Element/File.php b/library/Zend/Form/Element/File.php
old mode 100755
new mode 100644
index ecfaa7e5a..685778261
--- a/library/Zend/Form/Element/File.php
+++ b/library/Zend/Form/Element/File.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Hidden.php b/library/Zend/Form/Element/Hidden.php
old mode 100755
new mode 100644
index 6d950db02..9216c0bae
--- a/library/Zend/Form/Element/Hidden.php
+++ b/library/Zend/Form/Element/Hidden.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Image.php b/library/Zend/Form/Element/Image.php
old mode 100755
new mode 100644
index 96e50fc00..11f570429
--- a/library/Zend/Form/Element/Image.php
+++ b/library/Zend/Form/Element/Image.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Month.php b/library/Zend/Form/Element/Month.php
old mode 100755
new mode 100644
index 7a57678a5..e831df081
--- a/library/Zend/Form/Element/Month.php
+++ b/library/Zend/Form/Element/Month.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/MonthSelect.php b/library/Zend/Form/Element/MonthSelect.php
old mode 100755
new mode 100644
index 8f8a461c5..62541bf25
--- a/library/Zend/Form/Element/MonthSelect.php
+++ b/library/Zend/Form/Element/MonthSelect.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -68,7 +68,6 @@ class MonthSelect extends Element implements InputProviderInterface, ElementPrep
      */
     protected $validator;
 
-
     /**
      * Constructor. Add two selects elements
      *
@@ -281,7 +280,8 @@ class MonthSelect extends Element implements InputProviderInterface, ElementPrep
      */
     public function getValue()
     {
-        return sprintf('%s-%s',
+        return sprintf(
+            '%s-%s',
             $this->getYearElement()->getValue(),
             $this->getMonthElement()->getValue()
         );
diff --git a/library/Zend/Form/Element/MultiCheckbox.php b/library/Zend/Form/Element/MultiCheckbox.php
old mode 100755
new mode 100644
index 6e053be43..c98ac3a83
--- a/library/Zend/Form/Element/MultiCheckbox.php
+++ b/library/Zend/Form/Element/MultiCheckbox.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Number.php b/library/Zend/Form/Element/Number.php
old mode 100755
new mode 100644
index 454272928..a56255a81
--- a/library/Zend/Form/Element/Number.php
+++ b/library/Zend/Form/Element/Number.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Password.php b/library/Zend/Form/Element/Password.php
old mode 100755
new mode 100644
index 0bea1c509..47b44947d
--- a/library/Zend/Form/Element/Password.php
+++ b/library/Zend/Form/Element/Password.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Radio.php b/library/Zend/Form/Element/Radio.php
old mode 100755
new mode 100644
index 86d777269..e0b1de556
--- a/library/Zend/Form/Element/Radio.php
+++ b/library/Zend/Form/Element/Radio.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Range.php b/library/Zend/Form/Element/Range.php
old mode 100755
new mode 100644
index 05fb5f98d..c9cf8e5fe
--- a/library/Zend/Form/Element/Range.php
+++ b/library/Zend/Form/Element/Range.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -55,7 +55,6 @@ class Range extends NumberElement
             'inclusive' => $inclusive
         ));
 
-
         if (!isset($this->attributes['step'])
             || 'any' !== $this->attributes['step']
         ) {
diff --git a/library/Zend/Form/Element/Select.php b/library/Zend/Form/Element/Select.php
old mode 100755
new mode 100644
index 94d863aea..7417f6456
--- a/library/Zend/Form/Element/Select.php
+++ b/library/Zend/Form/Element/Select.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Submit.php b/library/Zend/Form/Element/Submit.php
old mode 100755
new mode 100644
index 3f1507e8e..b4360721f
--- a/library/Zend/Form/Element/Submit.php
+++ b/library/Zend/Form/Element/Submit.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Text.php b/library/Zend/Form/Element/Text.php
old mode 100755
new mode 100644
index aff287622..a1aeb2f9b
--- a/library/Zend/Form/Element/Text.php
+++ b/library/Zend/Form/Element/Text.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Textarea.php b/library/Zend/Form/Element/Textarea.php
old mode 100755
new mode 100644
index a2fe2d3c9..82b637028
--- a/library/Zend/Form/Element/Textarea.php
+++ b/library/Zend/Form/Element/Textarea.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Time.php b/library/Zend/Form/Element/Time.php
old mode 100755
new mode 100644
index eca9d3006..26b1d5ed9
--- a/library/Zend/Form/Element/Time.php
+++ b/library/Zend/Form/Element/Time.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Url.php b/library/Zend/Form/Element/Url.php
old mode 100755
new mode 100644
index d95176146..3aceca53e
--- a/library/Zend/Form/Element/Url.php
+++ b/library/Zend/Form/Element/Url.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Element/Week.php b/library/Zend/Form/Element/Week.php
old mode 100755
new mode 100644
index b5549c0da..0fec55931
--- a/library/Zend/Form/Element/Week.php
+++ b/library/Zend/Form/Element/Week.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/ElementAttributeRemovalInterface.php b/library/Zend/Form/ElementAttributeRemovalInterface.php
old mode 100755
new mode 100644
index 768a48b49..975ee4e0c
--- a/library/Zend/Form/ElementAttributeRemovalInterface.php
+++ b/library/Zend/Form/ElementAttributeRemovalInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/ElementInterface.php b/library/Zend/Form/ElementInterface.php
old mode 100755
new mode 100644
index 8081649d1..4fcd995e9
--- a/library/Zend/Form/ElementInterface.php
+++ b/library/Zend/Form/ElementInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/ElementPrepareAwareInterface.php b/library/Zend/Form/ElementPrepareAwareInterface.php
old mode 100755
new mode 100644
index 1e62addd4..ee3390577
--- a/library/Zend/Form/ElementPrepareAwareInterface.php
+++ b/library/Zend/Form/ElementPrepareAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Exception/BadMethodCallException.php b/library/Zend/Form/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 8209503e2..943b2dc46
--- a/library/Zend/Form/Exception/BadMethodCallException.php
+++ b/library/Zend/Form/Exception/BadMethodCallException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Form\Exception;
 
-class BadMethodCallException
-    extends \BadMethodCallException
-    implements ExceptionInterface
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Form/Exception/DomainException.php b/library/Zend/Form/Exception/DomainException.php
old mode 100755
new mode 100644
index 0f5bb4886..1399d8cfd
--- a/library/Zend/Form/Exception/DomainException.php
+++ b/library/Zend/Form/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Exception/ExceptionInterface.php b/library/Zend/Form/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 9ab0609b5..5fc745d67
--- a/library/Zend/Form/Exception/ExceptionInterface.php
+++ b/library/Zend/Form/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Exception/ExtensionNotLoadedException.php b/library/Zend/Form/Exception/ExtensionNotLoadedException.php
old mode 100755
new mode 100644
index cc81df438..02ba3fbb7
--- a/library/Zend/Form/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Form/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Exception/InvalidArgumentException.php b/library/Zend/Form/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 7081cea93..8710b8fef
--- a/library/Zend/Form/Exception/InvalidArgumentException.php
+++ b/library/Zend/Form/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Exception/InvalidElementException.php b/library/Zend/Form/Exception/InvalidElementException.php
old mode 100755
new mode 100644
index b91090b5a..981c0e542
--- a/library/Zend/Form/Exception/InvalidElementException.php
+++ b/library/Zend/Form/Exception/InvalidElementException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Exception/UnexpectedValueException.php b/library/Zend/Form/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index bcff1ac70..05d47cc97
--- a/library/Zend/Form/Exception/UnexpectedValueException.php
+++ b/library/Zend/Form/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Factory.php b/library/Zend/Form/Factory.php
old mode 100755
new mode 100644
index 832f4a12e..56834f9db
--- a/library/Zend/Form/Factory.php
+++ b/library/Zend/Form/Factory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -442,7 +442,7 @@ class Factory
             $hydrator = $this->getHydratorFromName($hydratorOrName);
         }
 
-        if (!$hydrator instanceof Hydrator\HydratorInterface) {
+        if (! isset($hydrator) || !$hydrator instanceof Hydrator\HydratorInterface) {
             throw new Exception\DomainException(sprintf(
                 '%s expects a valid implementation of Zend\Stdlib\Hydrator\HydratorInterface; received "%s"',
                 $method,
diff --git a/library/Zend/Form/Fieldset.php b/library/Zend/Form/Fieldset.php
old mode 100755
new mode 100644
index 5b0f45e54..062254687
--- a/library/Zend/Form/Fieldset.php
+++ b/library/Zend/Form/Fieldset.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -586,7 +586,7 @@ class Fieldset extends Element implements FieldsetInterface
             }
 
             // skip post values for disabled elements, get old value from object
-            if (!$element->hasAttribute('disabled')) {
+            if (!$element->getAttribute('disabled')) {
                 $hydratableData[$name] = $value;
             } elseif (array_key_exists($name, $objectData)) {
                 $hydratableData[$name] = $objectData[$name];
diff --git a/library/Zend/Form/FieldsetInterface.php b/library/Zend/Form/FieldsetInterface.php
old mode 100755
new mode 100644
index f2e16b904..f4adab4f7
--- a/library/Zend/Form/FieldsetInterface.php
+++ b/library/Zend/Form/FieldsetInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/FieldsetPrepareAwareInterface.php b/library/Zend/Form/FieldsetPrepareAwareInterface.php
old mode 100755
new mode 100644
index b1584c810..00008f549
--- a/library/Zend/Form/FieldsetPrepareAwareInterface.php
+++ b/library/Zend/Form/FieldsetPrepareAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/Form.php b/library/Zend/Form/Form.php
old mode 100755
new mode 100644
index 7d4ecae90..2259a0fd2
--- a/library/Zend/Form/Form.php
+++ b/library/Zend/Form/Form.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -129,7 +129,6 @@ class Form extends Fieldset implements FormInterface
      */
     protected $validationGroup;
 
-
     /**
      * Set options for a form. Accepted options are:
      * - prefer_form_input_filter: is form input filter is preferred?
@@ -300,7 +299,10 @@ class Form extends Fieldset implements FormInterface
 
         $this->bindAs = $flags;
         $this->setObject($object);
-        $this->extract();
+
+        $data = $this->extract();
+
+        $this->populateValues($data, true);
 
         return $this;
     }
@@ -480,6 +482,7 @@ class Form extends Fieldset implements FormInterface
 
         if (!is_array($this->data)) {
             $data = $this->extract();
+            $this->populateValues($data, true);
             if (!is_array($data)) {
                 throw new Exception\DomainException(sprintf(
                     '%s is unable to validate as there is no data currently set',
@@ -867,7 +870,24 @@ class Form extends Fieldset implements FormInterface
     }
 
     /**
-     * Recursively extract values for elements and sub-fieldsets, and populate form values
+     * {@inheritDoc}
+     *
+     * @param bool $onlyBase
+     */
+    public function populateValues($data, $onlyBase = false)
+    {
+        if ($onlyBase && $this->baseFieldset !== null) {
+            $name = $this->baseFieldset->getName();
+            if (array_key_exists($name, $data)) {
+                $this->baseFieldset->populateValues($data[$name]);
+            }
+        } else {
+            parent::populateValues($data);
+        }
+    }
+
+    /**
+     * Recursively extract values for elements and sub-fieldsets
      *
      * @return array
      */
@@ -876,10 +896,8 @@ class Form extends Fieldset implements FormInterface
         if (null !== $this->baseFieldset) {
             $name = $this->baseFieldset->getName();
             $values[$name] = $this->baseFieldset->extract();
-            $this->baseFieldset->populateValues($values[$name]);
         } else {
             $values = parent::extract();
-            $this->populateValues($values);
         }
 
         return $values;
diff --git a/library/Zend/Form/FormAbstractServiceFactory.php b/library/Zend/Form/FormAbstractServiceFactory.php
old mode 100755
new mode 100644
index c7c901642..cc66abf8e
--- a/library/Zend/Form/FormAbstractServiceFactory.php
+++ b/library/Zend/Form/FormAbstractServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/FormElementManager.php b/library/Zend/Form/FormElementManager.php
old mode 100755
new mode 100644
index bdea8f74c..34244da48
--- a/library/Zend/Form/FormElementManager.php
+++ b/library/Zend/Form/FormElementManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/FormFactoryAwareInterface.php b/library/Zend/Form/FormFactoryAwareInterface.php
old mode 100755
new mode 100644
index e5e6f5013..3000204f1
--- a/library/Zend/Form/FormFactoryAwareInterface.php
+++ b/library/Zend/Form/FormFactoryAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/FormFactoryAwareTrait.php b/library/Zend/Form/FormFactoryAwareTrait.php
old mode 100755
new mode 100644
index 1684ca1f0..a5cfeb12e
--- a/library/Zend/Form/FormFactoryAwareTrait.php
+++ b/library/Zend/Form/FormFactoryAwareTrait.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Form;
 
-
 trait FormFactoryAwareTrait
 {
     /**
diff --git a/library/Zend/Form/FormInterface.php b/library/Zend/Form/FormInterface.php
old mode 100755
new mode 100644
index 25acfdb10..42337f0ff
--- a/library/Zend/Form/FormInterface.php
+++ b/library/Zend/Form/FormInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/InputFilterProviderFieldset.php b/library/Zend/Form/InputFilterProviderFieldset.php
old mode 100755
new mode 100644
index 6c34f14f9..74b291b18
--- a/library/Zend/Form/InputFilterProviderFieldset.php
+++ b/library/Zend/Form/InputFilterProviderFieldset.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/LabelAwareInterface.php b/library/Zend/Form/LabelAwareInterface.php
old mode 100755
new mode 100644
index 57096d06e..9e3ba8613
--- a/library/Zend/Form/LabelAwareInterface.php
+++ b/library/Zend/Form/LabelAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/LabelAwareTrait.php b/library/Zend/Form/LabelAwareTrait.php
old mode 100755
new mode 100644
index 450603c64..9afaa7df7
--- a/library/Zend/Form/LabelAwareTrait.php
+++ b/library/Zend/Form/LabelAwareTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/README.md b/library/Zend/Form/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Form/View/Helper/AbstractHelper.php b/library/Zend/Form/View/Helper/AbstractHelper.php
old mode 100755
new mode 100644
index c77a99b84..163d04fba
--- a/library/Zend/Form/View/Helper/AbstractHelper.php
+++ b/library/Zend/Form/View/Helper/AbstractHelper.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -183,6 +183,7 @@ abstract class AbstractHelper extends BaseAbstractHelper
     public function setEncoding($encoding)
     {
         $this->getEscapeHtmlHelper()->setEncoding($encoding);
+        $this->getEscapeHtmlAttrHelper()->setEncoding($encoding);
         return $this;
     }
 
diff --git a/library/Zend/Form/View/Helper/Captcha/AbstractWord.php b/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
old mode 100755
new mode 100644
index b27e641f9..10d9032ff
--- a/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
+++ b/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/Captcha/Dumb.php b/library/Zend/Form/View/Helper/Captcha/Dumb.php
old mode 100755
new mode 100644
index 1f49fe21c..d6acd1b3e
--- a/library/Zend/Form/View/Helper/Captcha/Dumb.php
+++ b/library/Zend/Form/View/Helper/Captcha/Dumb.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/Captcha/Figlet.php b/library/Zend/Form/View/Helper/Captcha/Figlet.php
old mode 100755
new mode 100644
index d82731113..a04975759
--- a/library/Zend/Form/View/Helper/Captcha/Figlet.php
+++ b/library/Zend/Form/View/Helper/Captcha/Figlet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/Captcha/Image.php b/library/Zend/Form/View/Helper/Captcha/Image.php
old mode 100755
new mode 100644
index d848fb0ed..f2e6fd059
--- a/library/Zend/Form/View/Helper/Captcha/Image.php
+++ b/library/Zend/Form/View/Helper/Captcha/Image.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php b/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
old mode 100755
new mode 100644
index 7106dbe06..eb7aaa5f4
--- a/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
+++ b/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/File/FormFileApcProgress.php b/library/Zend/Form/View/Helper/File/FormFileApcProgress.php
old mode 100755
new mode 100644
index c2f56074a..737b60532
--- a/library/Zend/Form/View/Helper/File/FormFileApcProgress.php
+++ b/library/Zend/Form/View/Helper/File/FormFileApcProgress.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/File/FormFileSessionProgress.php b/library/Zend/Form/View/Helper/File/FormFileSessionProgress.php
old mode 100755
new mode 100644
index 3eb1d4876..2a02859b7
--- a/library/Zend/Form/View/Helper/File/FormFileSessionProgress.php
+++ b/library/Zend/Form/View/Helper/File/FormFileSessionProgress.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/File/FormFileUploadProgress.php b/library/Zend/Form/View/Helper/File/FormFileUploadProgress.php
old mode 100755
new mode 100644
index cc2107bf5..515d97212
--- a/library/Zend/Form/View/Helper/File/FormFileUploadProgress.php
+++ b/library/Zend/Form/View/Helper/File/FormFileUploadProgress.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -38,11 +38,12 @@ class FormFileUploadProgress extends FormInput
      */
     public function renderHiddenId()
     {
-        $attributes          = array();
-        $attributes['id']    = 'progress_key';
-        $attributes['name']  = $this->getName();
-        $attributes['type']  = 'hidden';
-        $attributes['value'] = $this->getValue();
+        $attributes = array(
+            'id'    => 'progress_key',
+            'name'  => $this->getName(),
+            'type'  => 'hidden',
+            'value' => $this->getValue()
+        );
 
         return sprintf(
             '<input %s%s',
diff --git a/library/Zend/Form/View/Helper/Form.php b/library/Zend/Form/View/Helper/Form.php
old mode 100755
new mode 100644
index 666b968dc..cdecbabb7
--- a/library/Zend/Form/View/Helper/Form.php
+++ b/library/Zend/Form/View/Helper/Form.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -94,9 +94,7 @@ class Form extends AbstractHelper
             $attributes = array_merge($attributes, $formAttributes);
         }
 
-        $tag = sprintf('<form %s>', $this->createAttributesString($attributes));
-
-        return $tag;
+        return sprintf('<form %s>', $this->createAttributesString($attributes));
     }
 
     /**
diff --git a/library/Zend/Form/View/Helper/FormButton.php b/library/Zend/Form/View/Helper/FormButton.php
old mode 100755
new mode 100644
index 743c416ae..19c2b191d
--- a/library/Zend/Form/View/Helper/FormButton.php
+++ b/library/Zend/Form/View/Helper/FormButton.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -79,16 +79,19 @@ class FormButton extends FormInput
         if (null === $buttonContent) {
             $buttonContent = $element->getLabel();
             if (null === $buttonContent) {
-                throw new Exception\DomainException(sprintf(
-                    '%s expects either button content as the second argument, ' .
+                throw new Exception\DomainException(
+                    sprintf(
+                        '%s expects either button content as the second argument, ' .
                         'or that the element provided has a label value; neither found',
-                    __METHOD__
-                ));
+                        __METHOD__
+                    )
+                );
             }
 
             if (null !== ($translator = $this->getTranslator())) {
                 $buttonContent = $translator->translate(
-                    $buttonContent, $this->getTranslatorTextDomain()
+                    $buttonContent,
+                    $this->getTranslatorTextDomain()
                 );
             }
         }
diff --git a/library/Zend/Form/View/Helper/FormCaptcha.php b/library/Zend/Form/View/Helper/FormCaptcha.php
old mode 100755
new mode 100644
index 0ffb6e6d0..7796ebef4
--- a/library/Zend/Form/View/Helper/FormCaptcha.php
+++ b/library/Zend/Form/View/Helper/FormCaptcha.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormCheckbox.php b/library/Zend/Form/View/Helper/FormCheckbox.php
old mode 100755
new mode 100644
index 97a1023c3..e5282e5ec
--- a/library/Zend/Form/View/Helper/FormCheckbox.php
+++ b/library/Zend/Form/View/Helper/FormCheckbox.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormCollection.php b/library/Zend/Form/View/Helper/FormCollection.php
old mode 100755
new mode 100644
index 4a79e8c4e..fd63aa93b
--- a/library/Zend/Form/View/Helper/FormCollection.php
+++ b/library/Zend/Form/View/Helper/FormCollection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormColor.php b/library/Zend/Form/View/Helper/FormColor.php
old mode 100755
new mode 100644
index ebf955fa1..d83dda782
--- a/library/Zend/Form/View/Helper/FormColor.php
+++ b/library/Zend/Form/View/Helper/FormColor.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormDate.php b/library/Zend/Form/View/Helper/FormDate.php
old mode 100755
new mode 100644
index 6e21eb629..8fda43995
--- a/library/Zend/Form/View/Helper/FormDate.php
+++ b/library/Zend/Form/View/Helper/FormDate.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormDateSelect.php b/library/Zend/Form/View/Helper/FormDateSelect.php
old mode 100755
new mode 100644
index bd9e5e34c..be21bbc00
--- a/library/Zend/Form/View/Helper/FormDateSelect.php
+++ b/library/Zend/Form/View/Helper/FormDateSelect.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormDateTime.php b/library/Zend/Form/View/Helper/FormDateTime.php
old mode 100755
new mode 100644
index 4c2b615c6..3bc62e4ec
--- a/library/Zend/Form/View/Helper/FormDateTime.php
+++ b/library/Zend/Form/View/Helper/FormDateTime.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormDateTimeLocal.php b/library/Zend/Form/View/Helper/FormDateTimeLocal.php
old mode 100755
new mode 100644
index d072e8090..520ca1b1d
--- a/library/Zend/Form/View/Helper/FormDateTimeLocal.php
+++ b/library/Zend/Form/View/Helper/FormDateTimeLocal.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormDateTimeSelect.php b/library/Zend/Form/View/Helper/FormDateTimeSelect.php
old mode 100755
new mode 100644
index c5c4042c0..31048b923
--- a/library/Zend/Form/View/Helper/FormDateTimeSelect.php
+++ b/library/Zend/Form/View/Helper/FormDateTimeSelect.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -144,9 +144,8 @@ class FormDateTimeSelect extends FormDateSelectHelper
                 $markup .= $data[$value];
             }
         }
-        $markup = trim($markup);
 
-        return $markup;
+        return trim($markup);
     }
 
     /**
diff --git a/library/Zend/Form/View/Helper/FormElement.php b/library/Zend/Form/View/Helper/FormElement.php
old mode 100755
new mode 100644
index acd5484e9..3dfe221bb
--- a/library/Zend/Form/View/Helper/FormElement.php
+++ b/library/Zend/Form/View/Helper/FormElement.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormElementErrors.php b/library/Zend/Form/View/Helper/FormElementErrors.php
old mode 100755
new mode 100644
index 2e927923f..15fe08ff4
--- a/library/Zend/Form/View/Helper/FormElementErrors.php
+++ b/library/Zend/Form/View/Helper/FormElementErrors.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormEmail.php b/library/Zend/Form/View/Helper/FormEmail.php
old mode 100755
new mode 100644
index e03930ebb..2ffb31429
--- a/library/Zend/Form/View/Helper/FormEmail.php
+++ b/library/Zend/Form/View/Helper/FormEmail.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormFile.php b/library/Zend/Form/View/Helper/FormFile.php
old mode 100755
new mode 100644
index e75b34d8b..6fbdfab6f
--- a/library/Zend/Form/View/Helper/FormFile.php
+++ b/library/Zend/Form/View/Helper/FormFile.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormHidden.php b/library/Zend/Form/View/Helper/FormHidden.php
old mode 100755
new mode 100644
index f478b2a6a..c041ad972
--- a/library/Zend/Form/View/Helper/FormHidden.php
+++ b/library/Zend/Form/View/Helper/FormHidden.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormImage.php b/library/Zend/Form/View/Helper/FormImage.php
old mode 100755
new mode 100644
index e5bc26ce9..7a0577b5d
--- a/library/Zend/Form/View/Helper/FormImage.php
+++ b/library/Zend/Form/View/Helper/FormImage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormInput.php b/library/Zend/Form/View/Helper/FormInput.php
old mode 100755
new mode 100644
index 5a2f5adce..150731c23
--- a/library/Zend/Form/View/Helper/FormInput.php
+++ b/library/Zend/Form/View/Helper/FormInput.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormLabel.php b/library/Zend/Form/View/Helper/FormLabel.php
old mode 100755
new mode 100644
index 1b8cf26b6..b512c5d28
--- a/library/Zend/Form/View/Helper/FormLabel.php
+++ b/library/Zend/Form/View/Helper/FormLabel.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -51,17 +51,17 @@ class FormLabel extends AbstractHelper
         if ($labelContent === null || $position !== null) {
             $label = $element->getLabel();
             if (empty($label)) {
-                throw new Exception\DomainException(sprintf(
-                    '%s expects either label content as the second argument, ' .
+                throw new Exception\DomainException(
+                    sprintf(
+                        '%s expects either label content as the second argument, ' .
                         'or that the element provided has a label attribute; neither found',
-                    __METHOD__
-                ));
+                        __METHOD__
+                    )
+                );
             }
 
             if (null !== ($translator = $this->getTranslator())) {
-                $label = $translator->translate(
-                    $label, $this->getTranslatorTextDomain()
-                );
+                $label = $translator->translate($label, $this->getTranslatorTextDomain());
             }
 
             if (! $element instanceof LabelAwareInterface || ! $element->getLabelOption('disable_html_escape')) {
diff --git a/library/Zend/Form/View/Helper/FormMonth.php b/library/Zend/Form/View/Helper/FormMonth.php
old mode 100755
new mode 100644
index a0881b40a..9d6955bfb
--- a/library/Zend/Form/View/Helper/FormMonth.php
+++ b/library/Zend/Form/View/Helper/FormMonth.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormMonthSelect.php b/library/Zend/Form/View/Helper/FormMonthSelect.php
old mode 100755
new mode 100644
index f3cfa2136..dc0fe3dde
--- a/library/Zend/Form/View/Helper/FormMonthSelect.php
+++ b/library/Zend/Form/View/Helper/FormMonthSelect.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormMultiCheckbox.php b/library/Zend/Form/View/Helper/FormMultiCheckbox.php
old mode 100755
new mode 100644
index 927071c8d..899711933
--- a/library/Zend/Form/View/Helper/FormMultiCheckbox.php
+++ b/library/Zend/Form/View/Helper/FormMultiCheckbox.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -95,7 +95,6 @@ class FormMultiCheckbox extends FormInput
      *
      * @param  ElementInterface $element
      * @throws Exception\InvalidArgumentException
-     * @throws Exception\DomainException
      * @return string
      */
     public function render(ElementInterface $element)
@@ -110,12 +109,6 @@ class FormMultiCheckbox extends FormInput
         $name = static::getName($element);
 
         $options = $element->getValueOptions();
-        if (empty($options)) {
-            throw new Exception\DomainException(sprintf(
-                '%s requires that the element has "value_options"; none found',
-                __METHOD__
-            ));
-        }
 
         $attributes         = $element->getAttributes();
         $attributes['name'] = $name;
@@ -145,8 +138,7 @@ class FormMultiCheckbox extends FormInput
      * @param  array                $attributes
      * @return string
      */
-    protected function renderOptions(MultiCheckboxElement $element, array $options, array $selectedOptions,
-        array $attributes)
+    protected function renderOptions(MultiCheckboxElement $element, array $options, array $selectedOptions, array $attributes)
     {
         $escapeHtmlHelper = $this->getEscapeHtmlHelper();
         $labelHelper      = $this->getLabelHelper();
@@ -223,7 +215,8 @@ class FormMultiCheckbox extends FormInput
 
             if (null !== ($translator = $this->getTranslator())) {
                 $label = $translator->translate(
-                    $label, $this->getTranslatorTextDomain()
+                    $label,
+                    $this->getTranslatorTextDomain()
                 );
             }
 
diff --git a/library/Zend/Form/View/Helper/FormNumber.php b/library/Zend/Form/View/Helper/FormNumber.php
old mode 100755
new mode 100644
index a19c89aff..ba2f53706
--- a/library/Zend/Form/View/Helper/FormNumber.php
+++ b/library/Zend/Form/View/Helper/FormNumber.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormPassword.php b/library/Zend/Form/View/Helper/FormPassword.php
old mode 100755
new mode 100644
index a2683f69c..cbd78228d
--- a/library/Zend/Form/View/Helper/FormPassword.php
+++ b/library/Zend/Form/View/Helper/FormPassword.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormRadio.php b/library/Zend/Form/View/Helper/FormRadio.php
old mode 100755
new mode 100644
index 97405006d..5cb5bb11e
--- a/library/Zend/Form/View/Helper/FormRadio.php
+++ b/library/Zend/Form/View/Helper/FormRadio.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormRange.php b/library/Zend/Form/View/Helper/FormRange.php
old mode 100755
new mode 100644
index e2d7cf68e..b1cbd9dd7
--- a/library/Zend/Form/View/Helper/FormRange.php
+++ b/library/Zend/Form/View/Helper/FormRange.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormReset.php b/library/Zend/Form/View/Helper/FormReset.php
old mode 100755
new mode 100644
index 53e2988b8..22aed0b65
--- a/library/Zend/Form/View/Helper/FormReset.php
+++ b/library/Zend/Form/View/Helper/FormReset.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormRow.php b/library/Zend/Form/View/Helper/FormRow.php
old mode 100755
new mode 100644
index 0a8eb464b..99d3f290e
--- a/library/Zend/Form/View/Helper/FormRow.php
+++ b/library/Zend/Form/View/Helper/FormRow.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,6 +11,7 @@ namespace Zend\Form\View\Helper;
 
 use Zend\Form\Element\Button;
 use Zend\Form\Element\MonthSelect;
+use Zend\Form\Element\Captcha;
 use Zend\Form\ElementInterface;
 use Zend\Form\Exception;
 use Zend\Form\LabelAwareInterface;
@@ -128,9 +129,7 @@ class FormRow extends AbstractHelper
         if (isset($label) && '' !== $label) {
             // Translate the label
             if (null !== ($translator = $this->getTranslator())) {
-                $label = $translator->translate(
-                    $label, $this->getTranslatorTextDomain()
-                );
+                $label = $translator->translate($label, $this->getTranslatorTextDomain());
             }
         }
 
@@ -182,11 +181,13 @@ class FormRow extends AbstractHelper
             if ($type === 'multi_checkbox'
                 || $type === 'radio'
                 || $element instanceof MonthSelect
+                || $element instanceof Captcha
             ) {
                 $markup = sprintf(
                     '<fieldset><legend>%s</legend>%s</fieldset>',
                     $label,
-                    $elementString);
+                    $elementString
+                );
             } else {
                 // Ensure element and label will be separated if element has an `id`-attribute.
                 // If element has label option `always_wrap` it will be nested in any case.
diff --git a/library/Zend/Form/View/Helper/FormSearch.php b/library/Zend/Form/View/Helper/FormSearch.php
old mode 100755
new mode 100644
index 80e08620a..1a824c69a
--- a/library/Zend/Form/View/Helper/FormSearch.php
+++ b/library/Zend/Form/View/Helper/FormSearch.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormSelect.php b/library/Zend/Form/View/Helper/FormSelect.php
old mode 100755
new mode 100644
index 7e1dc411a..e2d99762a
--- a/library/Zend/Form/View/Helper/FormSelect.php
+++ b/library/Zend/Form/View/Helper/FormSelect.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -32,13 +32,14 @@ class FormSelect extends AbstractHelper
      * @var array
      */
     protected $validSelectAttributes = array(
-        'name'      => true,
-        'autofocus' => true,
-        'disabled'  => true,
-        'form'      => true,
-        'multiple'  => true,
-        'required'  => true,
-        'size'      => true
+        'name'         => true,
+        'autocomplete' => true,
+        'autofocus'    => true,
+        'disabled'     => true,
+        'form'         => true,
+        'multiple'     => true,
+        'required'     => true,
+        'size'         => true
     );
 
     /**
@@ -68,7 +69,7 @@ class FormSelect extends AbstractHelper
     );
 
     /**
-     * @var FromHidden|null
+     * @var FormHidden|null
      */
     protected $formHiddenHelper;
 
@@ -208,7 +209,8 @@ class FormSelect extends AbstractHelper
 
             if (null !== ($translator = $this->getTranslator())) {
                 $label = $translator->translate(
-                    $label, $this->getTranslatorTextDomain()
+                    $label,
+                    $this->getTranslatorTextDomain()
                 );
             }
 
diff --git a/library/Zend/Form/View/Helper/FormSubmit.php b/library/Zend/Form/View/Helper/FormSubmit.php
old mode 100755
new mode 100644
index 926028d8c..2dbd43476
--- a/library/Zend/Form/View/Helper/FormSubmit.php
+++ b/library/Zend/Form/View/Helper/FormSubmit.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormTel.php b/library/Zend/Form/View/Helper/FormTel.php
old mode 100755
new mode 100644
index 746f0e156..de1fc356f
--- a/library/Zend/Form/View/Helper/FormTel.php
+++ b/library/Zend/Form/View/Helper/FormTel.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormText.php b/library/Zend/Form/View/Helper/FormText.php
old mode 100755
new mode 100644
index 0e57c0512..2f39a4713
--- a/library/Zend/Form/View/Helper/FormText.php
+++ b/library/Zend/Form/View/Helper/FormText.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormTextarea.php b/library/Zend/Form/View/Helper/FormTextarea.php
old mode 100755
new mode 100644
index 32011b2c5..114a408c4
--- a/library/Zend/Form/View/Helper/FormTextarea.php
+++ b/library/Zend/Form/View/Helper/FormTextarea.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -20,18 +20,19 @@ class FormTextarea extends AbstractHelper
      * @var array
      */
     protected $validTagAttributes = array(
-        'autofocus'   => true,
-        'cols'        => true,
-        'dirname'     => true,
-        'disabled'    => true,
-        'form'        => true,
-        'maxlength'   => true,
-        'name'        => true,
-        'placeholder' => true,
-        'readonly'    => true,
-        'required'    => true,
-        'rows'        => true,
-        'wrap'        => true,
+        'autocomplete' => true,
+        'autofocus'    => true,
+        'cols'         => true,
+        'dirname'      => true,
+        'disabled'     => true,
+        'form'         => true,
+        'maxlength'    => true,
+        'name'         => true,
+        'placeholder'  => true,
+        'readonly'     => true,
+        'required'     => true,
+        'rows'         => true,
+        'wrap'         => true,
     );
 
     /**
diff --git a/library/Zend/Form/View/Helper/FormTime.php b/library/Zend/Form/View/Helper/FormTime.php
old mode 100755
new mode 100644
index cf8fbc328..9f8ce6c91
--- a/library/Zend/Form/View/Helper/FormTime.php
+++ b/library/Zend/Form/View/Helper/FormTime.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormUrl.php b/library/Zend/Form/View/Helper/FormUrl.php
old mode 100755
new mode 100644
index 90df9965b..a386debbd
--- a/library/Zend/Form/View/Helper/FormUrl.php
+++ b/library/Zend/Form/View/Helper/FormUrl.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/Helper/FormWeek.php b/library/Zend/Form/View/Helper/FormWeek.php
old mode 100755
new mode 100644
index 4fe6758c9..3704d9a0c
--- a/library/Zend/Form/View/Helper/FormWeek.php
+++ b/library/Zend/Form/View/Helper/FormWeek.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/View/HelperConfig.php b/library/Zend/Form/View/HelperConfig.php
old mode 100755
new mode 100644
index c9b6f56a6..4a425e2f9
--- a/library/Zend/Form/View/HelperConfig.php
+++ b/library/Zend/Form/View/HelperConfig.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Form/composer.json b/library/Zend/Form/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/AbstractMessage.php b/library/Zend/Http/AbstractMessage.php
old mode 100755
new mode 100644
index 0c607e8a4..0f4f30472
--- a/library/Zend/Http/AbstractMessage.php
+++ b/library/Zend/Http/AbstractMessage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/CONTRIBUTING.md b/library/Zend/Http/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Client.php b/library/Zend/Http/Client.php
old mode 100755
new mode 100644
index 71ff2d490..e204b7345
--- a/library/Zend/Http/Client.php
+++ b/library/Zend/Http/Client.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -54,7 +54,7 @@ class Client implements Stdlib\DispatchableInterface
     protected $request;
 
     /**
-     * @var Client/Adapter
+     * @var Client\Adapter\AdapterInterface
      */
     protected $adapter;
 
@@ -262,7 +262,6 @@ class Client implements Stdlib\DispatchableInterface
         return $this->response;
     }
 
-
     /**
      * Get the last request (as a string)
      *
@@ -864,6 +863,9 @@ class Client implements Stdlib\DispatchableInterface
             // method
             $method = $this->getRequest()->getMethod();
 
+            // this is so the correct Encoding Type is set
+            $this->setMethod($method);
+
             // body
             $body = $this->prepareBody();
 
@@ -939,7 +941,6 @@ class Client implements Stdlib\DispatchableInterface
                     $this->setMethod(Request::METHOD_GET);
                 }
 
-
                 // If we got a well formed absolute URI
                 if (($scheme = substr($location, 0, 6)) &&
                         ($scheme == 'http:/' || $scheme == 'https:')) {
@@ -1369,8 +1370,13 @@ class Client implements Stdlib\DispatchableInterface
             }
         }
         // HTTP connection
-        $this->lastRawRequest = $this->adapter->write($method,
-            $uri, $this->config['httpversion'], $headers, $body);
+        $this->lastRawRequest = $this->adapter->write(
+            $method,
+            $uri,
+            $this->config['httpversion'],
+            $headers,
+            $body
+        );
 
         return $this->adapter->read();
     }
diff --git a/library/Zend/Http/Client/Adapter/AdapterInterface.php b/library/Zend/Http/Client/Adapter/AdapterInterface.php
old mode 100755
new mode 100644
index 9e423ebbe..f6fe0cfb1
--- a/library/Zend/Http/Client/Adapter/AdapterInterface.php
+++ b/library/Zend/Http/Client/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Adapter/Curl.php b/library/Zend/Http/Client/Adapter/Curl.php
old mode 100755
new mode 100644
index f64214406..ccbcfbc5a
--- a/library/Zend/Http/Client/Adapter/Curl.php
+++ b/library/Zend/Http/Client/Adapter/Curl.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php b/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index cedd13806..bf53840d9
--- a/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Adapter/Exception/InitializationException.php b/library/Zend/Http/Client/Adapter/Exception/InitializationException.php
old mode 100755
new mode 100644
index 3b0d3e801..c0c9e0372
--- a/library/Zend/Http/Client/Adapter/Exception/InitializationException.php
+++ b/library/Zend/Http/Client/Adapter/Exception/InitializationException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php b/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index f8c134813..5ba546913
--- a/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php b/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php
old mode 100755
new mode 100644
index b9f97fb81..4fd0cbd0b
--- a/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php
+++ b/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php b/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php
old mode 100755
new mode 100644
index cc8396dfe..e6a9d4f35
--- a/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php b/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php
old mode 100755
new mode 100644
index f205246a1..eb8a8e1f7
--- a/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php
+++ b/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Adapter/Proxy.php b/library/Zend/Http/Client/Adapter/Proxy.php
old mode 100755
new mode 100644
index f66155a53..4b1c69ad0
--- a/library/Zend/Http/Client/Adapter/Proxy.php
+++ b/library/Zend/Http/Client/Adapter/Proxy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Adapter/Socket.php b/library/Zend/Http/Client/Adapter/Socket.php
old mode 100755
new mode 100644
index 010a766c0..aceb54dc3
--- a/library/Zend/Http/Client/Adapter/Socket.php
+++ b/library/Zend/Http/Client/Adapter/Socket.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Adapter/StreamInterface.php b/library/Zend/Http/Client/Adapter/StreamInterface.php
old mode 100755
new mode 100644
index 6dd1a5045..63ca174dc
--- a/library/Zend/Http/Client/Adapter/StreamInterface.php
+++ b/library/Zend/Http/Client/Adapter/StreamInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Adapter/Test.php b/library/Zend/Http/Client/Adapter/Test.php
old mode 100755
new mode 100644
index 0d9b02349..0de14a157
--- a/library/Zend/Http/Client/Adapter/Test.php
+++ b/library/Zend/Http/Client/Adapter/Test.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Exception/ExceptionInterface.php b/library/Zend/Http/Client/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index eeb74f29a..aba1a69a5
--- a/library/Zend/Http/Client/Exception/ExceptionInterface.php
+++ b/library/Zend/Http/Client/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Exception/InvalidArgumentException.php b/library/Zend/Http/Client/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 1e30969b9..bac8ed32f
--- a/library/Zend/Http/Client/Exception/InvalidArgumentException.php
+++ b/library/Zend/Http/Client/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Exception/OutOfRangeException.php b/library/Zend/Http/Client/Exception/OutOfRangeException.php
old mode 100755
new mode 100644
index 21f1730ff..2de55df60
--- a/library/Zend/Http/Client/Exception/OutOfRangeException.php
+++ b/library/Zend/Http/Client/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Client/Exception/RuntimeException.php b/library/Zend/Http/Client/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 430e05001..39010f068
--- a/library/Zend/Http/Client/Exception/RuntimeException.php
+++ b/library/Zend/Http/Client/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/ClientStatic.php b/library/Zend/Http/ClientStatic.php
old mode 100755
new mode 100644
index 020fa07e2..6c8444386
--- a/library/Zend/Http/ClientStatic.php
+++ b/library/Zend/Http/ClientStatic.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Http;
 
-
 /**
  * Http static client
  */
diff --git a/library/Zend/Http/Cookies.php b/library/Zend/Http/Cookies.php
old mode 100755
new mode 100644
index 7d4ac275d..eae2a0a69
--- a/library/Zend/Http/Cookies.php
+++ b/library/Zend/Http/Cookies.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -13,7 +13,6 @@ use ArrayIterator;
 use Zend\Http\Header\SetCookie;
 use Zend\Uri;
 
-
 /**
  * A Zend\Http\Cookies object is designed to contain and maintain HTTP cookies, and should
  * be used along with Zend\Http\Client in order to manage cookies across HTTP requests and
@@ -60,7 +59,7 @@ class Cookies extends Headers
     const COOKIE_STRING_CONCAT_STRICT = 3;
 
     /**
-     * @var \Zend\Http\Cookies
+     * @var array
      */
     protected $cookies = array();
 
@@ -161,9 +160,12 @@ class Cookies extends Headers
      * @throws Exception\InvalidArgumentException if invalid URI specified
      * @return array|string
      */
-    public function getMatchingCookies($uri, $matchSessionCookies = true,
-        $retAs = self::COOKIE_OBJECT, $now = null)
-    {
+    public function getMatchingCookies(
+        $uri,
+        $matchSessionCookies = true,
+        $retAs = self::COOKIE_OBJECT,
+        $now = null
+    ) {
         if (is_string($uri)) {
             $uri = Uri\UriFactory::factory($uri, 'http');
         } elseif (!$uri instanceof Uri\Uri) {
diff --git a/library/Zend/Http/Exception/ExceptionInterface.php b/library/Zend/Http/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index b58caddf8..365c90aa0
--- a/library/Zend/Http/Exception/ExceptionInterface.php
+++ b/library/Zend/Http/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Exception/InvalidArgumentException.php b/library/Zend/Http/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index fb20cde7d..926716933
--- a/library/Zend/Http/Exception/InvalidArgumentException.php
+++ b/library/Zend/Http/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Exception/OutOfRangeException.php b/library/Zend/Http/Exception/OutOfRangeException.php
old mode 100755
new mode 100644
index 5d1b20e33..e3e0fd150
--- a/library/Zend/Http/Exception/OutOfRangeException.php
+++ b/library/Zend/Http/Exception/OutOfRangeException.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Http\Exception;
 
-class OutOfRangeException extends \OutOfRangeException implements
-    ExceptionInterface
+class OutOfRangeException extends \OutOfRangeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Http/Exception/RuntimeException.php b/library/Zend/Http/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 9f1ed68ee..6b924eb7a
--- a/library/Zend/Http/Exception/RuntimeException.php
+++ b/library/Zend/Http/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/AbstractAccept.php b/library/Zend/Http/Header/AbstractAccept.php
old mode 100755
new mode 100644
index ec11a9066..4b9f3bc23
--- a/library/Zend/Http/Header/AbstractAccept.php
+++ b/library/Zend/Http/Header/AbstractAccept.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -53,7 +53,6 @@ abstract class AbstractAccept implements HeaderInterface
      */
     protected $sorted = false;
 
-
     /**
      * Parse a full header line or just the field value part.
      *
@@ -102,7 +101,7 @@ abstract class AbstractAccept implements HeaderInterface
                 || !isset($values[0])
         ) {
             throw new Exception\InvalidArgumentException(
-                    'Invalid header line for ' . $this->getFieldName() . ' header string'
+                'Invalid header line for ' . $this->getFieldName() . ' header string'
             );
         }
 
@@ -182,7 +181,6 @@ abstract class AbstractAccept implements HeaderInterface
         return $params;
     }
 
-
     /**
      * Get field value
      *
@@ -205,7 +203,6 @@ abstract class AbstractAccept implements HeaderInterface
         return implode(', ', $strings);
     }
 
-
     /**
      * Assemble and escape the field value parameters based on RFC 2616 section 2.1
      *
@@ -219,7 +216,8 @@ abstract class AbstractAccept implements HeaderInterface
         $separators = array('(', ')', '<', '>', '@', ',', ';', ':',
                             '/', '[', ']', '?', '=', '{', '}',  ' ',  "\t");
 
-        $escaped = preg_replace_callback('/[[:cntrl:]"\\\\]/', // escape cntrl, ", \
+        $escaped = preg_replace_callback(
+            '/[[:cntrl:]"\\\\]/', // escape cntrl, ", \
             function ($v) {
                 return '\\' . $v[0];
             },
@@ -269,15 +267,14 @@ abstract class AbstractAccept implements HeaderInterface
         }
 
         $assembledString = $this->getFieldValue(
-                                array((object) array('typeString' => $type, 'params' => $params))
-                            );
+            array((object) array('typeString' => $type, 'params' => $params))
+        );
 
         $value = $this->parseFieldValuePart($assembledString);
         $this->addFieldValuePartToQueue($value);
         return $this;
     }
 
-
     /**
      * Does the header have the requested type?
      *
@@ -375,7 +372,6 @@ abstract class AbstractAccept implements HeaderInterface
         return $match1;
     }
 
-
     /**
      * Add a key/value combination to the internal queue
      *
diff --git a/library/Zend/Http/Header/AbstractDate.php b/library/Zend/Http/Header/AbstractDate.php
old mode 100755
new mode 100644
index 5990dc4fa..42bf30dd7
--- a/library/Zend/Http/Header/AbstractDate.php
+++ b/library/Zend/Http/Header/AbstractDate.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/AbstractLocation.php b/library/Zend/Http/Header/AbstractLocation.php
old mode 100755
new mode 100644
index 12088cc9e..ed262c898
--- a/library/Zend/Http/Header/AbstractLocation.php
+++ b/library/Zend/Http/Header/AbstractLocation.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -13,7 +13,6 @@ use Zend\Uri\Exception as UriException;
 use Zend\Uri\UriFactory;
 use Zend\Uri\UriInterface;
 
-
 /**
  * Abstract Location Header
  * Supports headers that have URI as value
@@ -74,9 +73,9 @@ abstract class AbstractLocation implements HeaderInterface
                 $uri = UriFactory::factory($uri);
             } catch (UriException\InvalidUriPartException $e) {
                 throw new Exception\InvalidArgumentException(
-                        sprintf('Invalid URI passed as string (%s)', (string) $uri),
-                        $e->getCode(),
-                        $e
+                    sprintf('Invalid URI passed as string (%s)', (string) $uri),
+                    $e->getCode(),
+                    $e
                 );
             }
         } elseif (!($uri instanceof UriInterface)) {
diff --git a/library/Zend/Http/Header/Accept.php b/library/Zend/Http/Header/Accept.php
old mode 100755
new mode 100644
index 2c344d352..de74a9215
--- a/library/Zend/Http/Header/Accept.php
+++ b/library/Zend/Http/Header/Accept.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Accept/FieldValuePart/AbstractFieldValuePart.php b/library/Zend/Http/Header/Accept/FieldValuePart/AbstractFieldValuePart.php
old mode 100755
new mode 100644
index 1dd1b7ae3..2c1c10961
--- a/library/Zend/Http/Header/Accept/FieldValuePart/AbstractFieldValuePart.php
+++ b/library/Zend/Http/Header/Accept/FieldValuePart/AbstractFieldValuePart.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Accept/FieldValuePart/AcceptFieldValuePart.php b/library/Zend/Http/Header/Accept/FieldValuePart/AcceptFieldValuePart.php
old mode 100755
new mode 100644
index 15e2de99c..e8e2ef1cd
--- a/library/Zend/Http/Header/Accept/FieldValuePart/AcceptFieldValuePart.php
+++ b/library/Zend/Http/Header/Accept/FieldValuePart/AcceptFieldValuePart.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Accept/FieldValuePart/CharsetFieldValuePart.php b/library/Zend/Http/Header/Accept/FieldValuePart/CharsetFieldValuePart.php
old mode 100755
new mode 100644
index 38fb0178e..9956d795a
--- a/library/Zend/Http/Header/Accept/FieldValuePart/CharsetFieldValuePart.php
+++ b/library/Zend/Http/Header/Accept/FieldValuePart/CharsetFieldValuePart.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Accept/FieldValuePart/EncodingFieldValuePart.php b/library/Zend/Http/Header/Accept/FieldValuePart/EncodingFieldValuePart.php
old mode 100755
new mode 100644
index 06e0b76ac..af73becd2
--- a/library/Zend/Http/Header/Accept/FieldValuePart/EncodingFieldValuePart.php
+++ b/library/Zend/Http/Header/Accept/FieldValuePart/EncodingFieldValuePart.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Accept/FieldValuePart/LanguageFieldValuePart.php b/library/Zend/Http/Header/Accept/FieldValuePart/LanguageFieldValuePart.php
old mode 100755
new mode 100644
index a58b232a7..a5b345128
--- a/library/Zend/Http/Header/Accept/FieldValuePart/LanguageFieldValuePart.php
+++ b/library/Zend/Http/Header/Accept/FieldValuePart/LanguageFieldValuePart.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/AcceptCharset.php b/library/Zend/Http/Header/AcceptCharset.php
old mode 100755
new mode 100644
index 5c49c93d2..cd80e7523
--- a/library/Zend/Http/Header/AcceptCharset.php
+++ b/library/Zend/Http/Header/AcceptCharset.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/AcceptEncoding.php b/library/Zend/Http/Header/AcceptEncoding.php
old mode 100755
new mode 100644
index 2b9ee5191..d5bea1ef6
--- a/library/Zend/Http/Header/AcceptEncoding.php
+++ b/library/Zend/Http/Header/AcceptEncoding.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/AcceptLanguage.php b/library/Zend/Http/Header/AcceptLanguage.php
old mode 100755
new mode 100644
index 256c9562e..7c00b2591
--- a/library/Zend/Http/Header/AcceptLanguage.php
+++ b/library/Zend/Http/Header/AcceptLanguage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/AcceptRanges.php b/library/Zend/Http/Header/AcceptRanges.php
old mode 100755
new mode 100644
index f1827c175..b084df1e3
--- a/library/Zend/Http/Header/AcceptRanges.php
+++ b/library/Zend/Http/Header/AcceptRanges.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Age.php b/library/Zend/Http/Header/Age.php
old mode 100755
new mode 100644
index 633614b06..aa8637ee6
--- a/library/Zend/Http/Header/Age.php
+++ b/library/Zend/Http/Header/Age.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Allow.php b/library/Zend/Http/Header/Allow.php
old mode 100755
new mode 100644
index e1f4e75b1..aee66731f
--- a/library/Zend/Http/Header/Allow.php
+++ b/library/Zend/Http/Header/Allow.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/AuthenticationInfo.php b/library/Zend/Http/Header/AuthenticationInfo.php
old mode 100755
new mode 100644
index a35cebc66..73e0044a8
--- a/library/Zend/Http/Header/AuthenticationInfo.php
+++ b/library/Zend/Http/Header/AuthenticationInfo.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Authorization.php b/library/Zend/Http/Header/Authorization.php
old mode 100755
new mode 100644
index 98ee0307b..197eef974
--- a/library/Zend/Http/Header/Authorization.php
+++ b/library/Zend/Http/Header/Authorization.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/CacheControl.php b/library/Zend/Http/Header/CacheControl.php
old mode 100755
new mode 100644
index ef92ecfdf..fa1e429be
--- a/library/Zend/Http/Header/CacheControl.php
+++ b/library/Zend/Http/Header/CacheControl.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Connection.php b/library/Zend/Http/Header/Connection.php
old mode 100755
new mode 100644
index 16cb1258b..45be7259e
--- a/library/Zend/Http/Header/Connection.php
+++ b/library/Zend/Http/Header/Connection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -47,7 +47,6 @@ class Connection implements HeaderInterface
         return $header;
     }
 
-
     /**
      * Set Connection header to define persistent connection
      *
@@ -87,7 +86,6 @@ class Connection implements HeaderInterface
         return $this;
     }
 
-
     /**
      * Connection header name
      *
diff --git a/library/Zend/Http/Header/ContentDisposition.php b/library/Zend/Http/Header/ContentDisposition.php
old mode 100755
new mode 100644
index 60b1f7a57..1c24f7a65
--- a/library/Zend/Http/Header/ContentDisposition.php
+++ b/library/Zend/Http/Header/ContentDisposition.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/ContentEncoding.php b/library/Zend/Http/Header/ContentEncoding.php
old mode 100755
new mode 100644
index b3a99478a..c166b66a8
--- a/library/Zend/Http/Header/ContentEncoding.php
+++ b/library/Zend/Http/Header/ContentEncoding.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/ContentLanguage.php b/library/Zend/Http/Header/ContentLanguage.php
old mode 100755
new mode 100644
index d0250ccd0..104911f09
--- a/library/Zend/Http/Header/ContentLanguage.php
+++ b/library/Zend/Http/Header/ContentLanguage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/ContentLength.php b/library/Zend/Http/Header/ContentLength.php
old mode 100755
new mode 100644
index e4c89862a..62e5bde0c
--- a/library/Zend/Http/Header/ContentLength.php
+++ b/library/Zend/Http/Header/ContentLength.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/ContentLocation.php b/library/Zend/Http/Header/ContentLocation.php
old mode 100755
new mode 100644
index 018761d2b..5238e36dc
--- a/library/Zend/Http/Header/ContentLocation.php
+++ b/library/Zend/Http/Header/ContentLocation.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/ContentMD5.php b/library/Zend/Http/Header/ContentMD5.php
old mode 100755
new mode 100644
index a120319a2..581de8157
--- a/library/Zend/Http/Header/ContentMD5.php
+++ b/library/Zend/Http/Header/ContentMD5.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/ContentRange.php b/library/Zend/Http/Header/ContentRange.php
old mode 100755
new mode 100644
index 4c3f473d3..100eedd65
--- a/library/Zend/Http/Header/ContentRange.php
+++ b/library/Zend/Http/Header/ContentRange.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/ContentSecurityPolicy.php b/library/Zend/Http/Header/ContentSecurityPolicy.php
old mode 100755
new mode 100644
index 5ddb53359..85f1cff0e
--- a/library/Zend/Http/Header/ContentSecurityPolicy.php
+++ b/library/Zend/Http/Header/ContentSecurityPolicy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/ContentTransferEncoding.php b/library/Zend/Http/Header/ContentTransferEncoding.php
old mode 100755
new mode 100644
index 6e44a9ad7..ec72a2169
--- a/library/Zend/Http/Header/ContentTransferEncoding.php
+++ b/library/Zend/Http/Header/ContentTransferEncoding.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/ContentType.php b/library/Zend/Http/Header/ContentType.php
old mode 100755
new mode 100644
index df6795495..dad12d4a6
--- a/library/Zend/Http/Header/ContentType.php
+++ b/library/Zend/Http/Header/ContentType.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Cookie.php b/library/Zend/Http/Header/Cookie.php
old mode 100755
new mode 100644
index d26ae0041..558c5150a
--- a/library/Zend/Http/Header/Cookie.php
+++ b/library/Zend/Http/Header/Cookie.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Date.php b/library/Zend/Http/Header/Date.php
old mode 100755
new mode 100644
index f310da109..7b260664e
--- a/library/Zend/Http/Header/Date.php
+++ b/library/Zend/Http/Header/Date.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Etag.php b/library/Zend/Http/Header/Etag.php
old mode 100755
new mode 100644
index 94acb8e4c..169bfb85b
--- a/library/Zend/Http/Header/Etag.php
+++ b/library/Zend/Http/Header/Etag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Exception/DomainException.php b/library/Zend/Http/Header/Exception/DomainException.php
old mode 100755
new mode 100644
index dc3f03f8f..c826e642a
--- a/library/Zend/Http/Header/Exception/DomainException.php
+++ b/library/Zend/Http/Header/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Exception/ExceptionInterface.php b/library/Zend/Http/Header/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index c106c2d2f..c4d106981
--- a/library/Zend/Http/Header/Exception/ExceptionInterface.php
+++ b/library/Zend/Http/Header/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Exception/InvalidArgumentException.php b/library/Zend/Http/Header/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index aaf366e37..06aa79fd9
--- a/library/Zend/Http/Header/Exception/InvalidArgumentException.php
+++ b/library/Zend/Http/Header/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Exception/RuntimeException.php b/library/Zend/Http/Header/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 097b38191..467d626dc
--- a/library/Zend/Http/Header/Exception/RuntimeException.php
+++ b/library/Zend/Http/Header/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Expect.php b/library/Zend/Http/Header/Expect.php
old mode 100755
new mode 100644
index 4e2bc54ee..87dea578a
--- a/library/Zend/Http/Header/Expect.php
+++ b/library/Zend/Http/Header/Expect.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Expires.php b/library/Zend/Http/Header/Expires.php
old mode 100755
new mode 100644
index 82e8d89c4..ff2de5c82
--- a/library/Zend/Http/Header/Expires.php
+++ b/library/Zend/Http/Header/Expires.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/From.php b/library/Zend/Http/Header/From.php
old mode 100755
new mode 100644
index 95a007b94..0089227b2
--- a/library/Zend/Http/Header/From.php
+++ b/library/Zend/Http/Header/From.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/GenericHeader.php b/library/Zend/Http/Header/GenericHeader.php
old mode 100755
new mode 100644
index 81fa5217b..3ad6d71ab
--- a/library/Zend/Http/Header/GenericHeader.php
+++ b/library/Zend/Http/Header/GenericHeader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/GenericMultiHeader.php b/library/Zend/Http/Header/GenericMultiHeader.php
old mode 100755
new mode 100644
index 62e1c2711..90c1f9668
--- a/library/Zend/Http/Header/GenericMultiHeader.php
+++ b/library/Zend/Http/Header/GenericMultiHeader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/HeaderInterface.php b/library/Zend/Http/Header/HeaderInterface.php
old mode 100755
new mode 100644
index 1cd2e4654..ba285f37d
--- a/library/Zend/Http/Header/HeaderInterface.php
+++ b/library/Zend/Http/Header/HeaderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Host.php b/library/Zend/Http/Header/Host.php
old mode 100755
new mode 100644
index 904579df1..2446d155a
--- a/library/Zend/Http/Header/Host.php
+++ b/library/Zend/Http/Header/Host.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/IfMatch.php b/library/Zend/Http/Header/IfMatch.php
old mode 100755
new mode 100644
index a190ea770..adb5e8afc
--- a/library/Zend/Http/Header/IfMatch.php
+++ b/library/Zend/Http/Header/IfMatch.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/IfModifiedSince.php b/library/Zend/Http/Header/IfModifiedSince.php
old mode 100755
new mode 100644
index d8d9f9a62..329fbc52c
--- a/library/Zend/Http/Header/IfModifiedSince.php
+++ b/library/Zend/Http/Header/IfModifiedSince.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/IfNoneMatch.php b/library/Zend/Http/Header/IfNoneMatch.php
old mode 100755
new mode 100644
index 06f632766..8ce5b15ea
--- a/library/Zend/Http/Header/IfNoneMatch.php
+++ b/library/Zend/Http/Header/IfNoneMatch.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/IfRange.php b/library/Zend/Http/Header/IfRange.php
old mode 100755
new mode 100644
index ed7f78b8e..3f763d32f
--- a/library/Zend/Http/Header/IfRange.php
+++ b/library/Zend/Http/Header/IfRange.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/IfUnmodifiedSince.php b/library/Zend/Http/Header/IfUnmodifiedSince.php
old mode 100755
new mode 100644
index 2615596af..4a1b35c82
--- a/library/Zend/Http/Header/IfUnmodifiedSince.php
+++ b/library/Zend/Http/Header/IfUnmodifiedSince.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/KeepAlive.php b/library/Zend/Http/Header/KeepAlive.php
old mode 100755
new mode 100644
index 5178f84bd..86f9dc727
--- a/library/Zend/Http/Header/KeepAlive.php
+++ b/library/Zend/Http/Header/KeepAlive.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/LastModified.php b/library/Zend/Http/Header/LastModified.php
old mode 100755
new mode 100644
index d9ea8bdb6..8f30f57b5
--- a/library/Zend/Http/Header/LastModified.php
+++ b/library/Zend/Http/Header/LastModified.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Location.php b/library/Zend/Http/Header/Location.php
old mode 100755
new mode 100644
index 8d391ebf5..5fa93f1e7
--- a/library/Zend/Http/Header/Location.php
+++ b/library/Zend/Http/Header/Location.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Http\Header;
 
-
 /**
  * Location Header
  *
diff --git a/library/Zend/Http/Header/MaxForwards.php b/library/Zend/Http/Header/MaxForwards.php
old mode 100755
new mode 100644
index 99e5a8953..ac2988718
--- a/library/Zend/Http/Header/MaxForwards.php
+++ b/library/Zend/Http/Header/MaxForwards.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/MultipleHeaderInterface.php b/library/Zend/Http/Header/MultipleHeaderInterface.php
old mode 100755
new mode 100644
index 3034f7b4a..b6b5246cd
--- a/library/Zend/Http/Header/MultipleHeaderInterface.php
+++ b/library/Zend/Http/Header/MultipleHeaderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Origin.php b/library/Zend/Http/Header/Origin.php
old mode 100755
new mode 100644
index 5f88a3340..d95d56fa6
--- a/library/Zend/Http/Header/Origin.php
+++ b/library/Zend/Http/Header/Origin.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Pragma.php b/library/Zend/Http/Header/Pragma.php
old mode 100755
new mode 100644
index e193b98c6..f7198577d
--- a/library/Zend/Http/Header/Pragma.php
+++ b/library/Zend/Http/Header/Pragma.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/ProxyAuthenticate.php b/library/Zend/Http/Header/ProxyAuthenticate.php
old mode 100755
new mode 100644
index c233e7ad3..292c4ba71
--- a/library/Zend/Http/Header/ProxyAuthenticate.php
+++ b/library/Zend/Http/Header/ProxyAuthenticate.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/ProxyAuthorization.php b/library/Zend/Http/Header/ProxyAuthorization.php
old mode 100755
new mode 100644
index 321411a5e..b0d5738ab
--- a/library/Zend/Http/Header/ProxyAuthorization.php
+++ b/library/Zend/Http/Header/ProxyAuthorization.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Range.php b/library/Zend/Http/Header/Range.php
old mode 100755
new mode 100644
index b18cea4e0..103b7b49e
--- a/library/Zend/Http/Header/Range.php
+++ b/library/Zend/Http/Header/Range.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Referer.php b/library/Zend/Http/Header/Referer.php
old mode 100755
new mode 100644
index cde2f8615..8b89cf4b1
--- a/library/Zend/Http/Header/Referer.php
+++ b/library/Zend/Http/Header/Referer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Refresh.php b/library/Zend/Http/Header/Refresh.php
old mode 100755
new mode 100644
index 557924c1d..f887325ff
--- a/library/Zend/Http/Header/Refresh.php
+++ b/library/Zend/Http/Header/Refresh.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/RetryAfter.php b/library/Zend/Http/Header/RetryAfter.php
old mode 100755
new mode 100644
index cdd239aa4..6f526b3ba
--- a/library/Zend/Http/Header/RetryAfter.php
+++ b/library/Zend/Http/Header/RetryAfter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Server.php b/library/Zend/Http/Header/Server.php
old mode 100755
new mode 100644
index 1cf38b196..bf07f0e44
--- a/library/Zend/Http/Header/Server.php
+++ b/library/Zend/Http/Header/Server.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/SetCookie.php b/library/Zend/Http/Header/SetCookie.php
old mode 100755
new mode 100644
index 6b2514ea2..a1dec80e7
--- a/library/Zend/Http/Header/SetCookie.php
+++ b/library/Zend/Http/Header/SetCookie.php
@@ -3,12 +3,13 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Http\Header;
 
+use DateTime;
 use Zend\Uri\UriFactory;
 
 /**
@@ -113,7 +114,7 @@ class SetCookie implements MultipleHeaderInterface
                     }
 
                     // First K=V pair is always the cookie name and value
-                    if ($header->getName() === NULL) {
+                    if ($header->getName() === null) {
                         $header->setName($headerKey);
                         $header->setValue(urldecode($headerValue));
                         continue;
@@ -121,13 +122,27 @@ class SetCookie implements MultipleHeaderInterface
 
                     // Process the remaining elements
                     switch (str_replace(array('-', '_'), '', strtolower($headerKey))) {
-                        case 'expires' : $header->setExpires($headerValue); break;
-                        case 'domain'  : $header->setDomain($headerValue); break;
-                        case 'path'    : $header->setPath($headerValue); break;
-                        case 'secure'  : $header->setSecure(true); break;
-                        case 'httponly': $header->setHttponly(true); break;
-                        case 'version' : $header->setVersion((int) $headerValue); break;
-                        case 'maxage'  : $header->setMaxAge((int) $headerValue); break;
+                        case 'expires':
+                            $header->setExpires($headerValue);
+                            break;
+                        case 'domain':
+                            $header->setDomain($headerValue);
+                            break;
+                        case 'path':
+                            $header->setPath($headerValue);
+                            break;
+                        case 'secure':
+                            $header->setSecure(true);
+                            break;
+                        case 'httponly':
+                            $header->setHttponly(true);
+                            break;
+                        case 'version':
+                            $header->setVersion((int) $headerValue);
+                            break;
+                        case 'maxage':
+                            $header->setMaxAge((int) $headerValue);
+                            break;
                         default:
                             // Intentionally omitted
                     }
@@ -165,16 +180,15 @@ class SetCookie implements MultipleHeaderInterface
      *
      * @todo Add validation of each one of the parameters (legal domain, etc.)
      *
-     * @param   string      $name
-     * @param   string      $value
-     * @param   int|string  $expires
-     * @param   string      $path
-     * @param   string      $domain
-     * @param   bool        $secure
-     * @param   bool        $httponly
-     * @param   string      $maxAge
-     * @param   int         $version
-     * @return  SetCookie
+     * @param   string              $name
+     * @param   string              $value
+     * @param   int|string|DateTime $expires
+     * @param   string              $path
+     * @param   string              $domain
+     * @param   bool                $secure
+     * @param   bool                $httponly
+     * @param   string              $maxAge
+     * @param   int                 $version
      */
     public function __construct($name = null, $value = null, $expires = null, $path = null, $domain = null, $secure = false, $httponly = false, $maxAge = null, $version = null)
     {
@@ -210,7 +224,7 @@ class SetCookie implements MultipleHeaderInterface
         }
 
         $value = urlencode($this->getValue());
-        if ( $this->hasQuoteFieldValue() ) {
+        if ($this->hasQuoteFieldValue()) {
             $value = '"'. $value . '"';
         }
 
@@ -342,9 +356,13 @@ class SetCookie implements MultipleHeaderInterface
     }
 
     /**
-     * @param  int|string $expires
+     * Set Expires
+     *
+     * @param int|string|DateTime $expires
+     *
+     * @return self
+     *
      * @throws Exception\InvalidArgumentException
-     * @return SetCookie
      */
     public function setExpires($expires)
     {
@@ -353,14 +371,19 @@ class SetCookie implements MultipleHeaderInterface
             return $this;
         }
 
+        if ($expires instanceof DateTime) {
+            $expires = $expires->format(DateTime::COOKIE);
+        }
+
         $tsExpires = $expires;
+
         if (is_string($expires)) {
             $tsExpires = strtotime($expires);
 
             // if $tsExpires is invalid and PHP is compiled as 32bit. Check if it fail reason is the 2038 bug
             if (!is_int($tsExpires) && PHP_INT_SIZE === 4) {
-                $dateTime = new \DateTime($expires);
-                if ( $dateTime->format('Y') > 2038) {
+                $dateTime = new DateTime($expires);
+                if ($dateTime->format('Y') > 2038) {
                     $tsExpires = PHP_INT_MAX;
                 }
             }
@@ -371,6 +394,7 @@ class SetCookie implements MultipleHeaderInterface
         }
 
         $this->expires = $tsExpires;
+
         return $this;
     }
 
@@ -542,7 +566,7 @@ class SetCookie implements MultipleHeaderInterface
      */
     public function match($uri, $matchSessionCookies = true, $now = null)
     {
-        if (is_string ($uri)) {
+        if (is_string($uri)) {
             $uri = UriFactory::factory($uri);
         }
 
diff --git a/library/Zend/Http/Header/TE.php b/library/Zend/Http/Header/TE.php
old mode 100755
new mode 100644
index baf8175ca..55178a977
--- a/library/Zend/Http/Header/TE.php
+++ b/library/Zend/Http/Header/TE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Trailer.php b/library/Zend/Http/Header/Trailer.php
old mode 100755
new mode 100644
index 6e032b334..0fcba569e
--- a/library/Zend/Http/Header/Trailer.php
+++ b/library/Zend/Http/Header/Trailer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/TransferEncoding.php b/library/Zend/Http/Header/TransferEncoding.php
old mode 100755
new mode 100644
index 8f4380d8d..17606e3a5
--- a/library/Zend/Http/Header/TransferEncoding.php
+++ b/library/Zend/Http/Header/TransferEncoding.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Upgrade.php b/library/Zend/Http/Header/Upgrade.php
old mode 100755
new mode 100644
index b133c6595..162251e13
--- a/library/Zend/Http/Header/Upgrade.php
+++ b/library/Zend/Http/Header/Upgrade.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/UserAgent.php b/library/Zend/Http/Header/UserAgent.php
old mode 100755
new mode 100644
index 16a02087b..65941f80b
--- a/library/Zend/Http/Header/UserAgent.php
+++ b/library/Zend/Http/Header/UserAgent.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Vary.php b/library/Zend/Http/Header/Vary.php
old mode 100755
new mode 100644
index 86c944c78..f80cb34c7
--- a/library/Zend/Http/Header/Vary.php
+++ b/library/Zend/Http/Header/Vary.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Via.php b/library/Zend/Http/Header/Via.php
old mode 100755
new mode 100644
index aba2a00d9..f8004331e
--- a/library/Zend/Http/Header/Via.php
+++ b/library/Zend/Http/Header/Via.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/WWWAuthenticate.php b/library/Zend/Http/Header/WWWAuthenticate.php
old mode 100755
new mode 100644
index bec6574d7..11de97af8
--- a/library/Zend/Http/Header/WWWAuthenticate.php
+++ b/library/Zend/Http/Header/WWWAuthenticate.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Header/Warning.php b/library/Zend/Http/Header/Warning.php
old mode 100755
new mode 100644
index e0b869973..b94b09d35
--- a/library/Zend/Http/Header/Warning.php
+++ b/library/Zend/Http/Header/Warning.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/HeaderLoader.php b/library/Zend/Http/HeaderLoader.php
old mode 100755
new mode 100644
index af617d670..ffca6362c
--- a/library/Zend/Http/HeaderLoader.php
+++ b/library/Zend/Http/HeaderLoader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Headers.php b/library/Zend/Http/Headers.php
old mode 100755
new mode 100644
index 348b437ea..0ed582fd6
--- a/library/Zend/Http/Headers.php
+++ b/library/Zend/Http/Headers.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/PhpEnvironment/RemoteAddress.php b/library/Zend/Http/PhpEnvironment/RemoteAddress.php
old mode 100755
new mode 100644
index 077768ab8..4406ece47
--- a/library/Zend/Http/PhpEnvironment/RemoteAddress.php
+++ b/library/Zend/Http/PhpEnvironment/RemoteAddress.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -150,7 +150,6 @@ class RemoteAddress
         return $ip;
     }
 
-
     /**
      * Normalize a header string
      *
diff --git a/library/Zend/Http/PhpEnvironment/Request.php b/library/Zend/Http/PhpEnvironment/Request.php
old mode 100755
new mode 100644
index 4ed9f05fb..aedf90f89
--- a/library/Zend/Http/PhpEnvironment/Request.php
+++ b/library/Zend/Http/PhpEnvironment/Request.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -216,21 +216,19 @@ class Request extends HttpRequest
         $headers = array();
 
         foreach ($server as $key => $value) {
-            if ($value && strpos($key, 'HTTP_') === 0) {
-                if (strpos($key, 'HTTP_COOKIE') === 0) {
-                    // Cookies are handled using the $_COOKIE superglobal
-                    continue;
-                }
-                $name = strtr(substr($key, 5), '_', ' ');
-                $name = strtr(ucwords(strtolower($name)), ' ', '-');
-            } elseif ($value && strpos($key, 'CONTENT_') === 0) {
-                $name = substr($key, 8); // Content-
-                $name = 'Content-' . (($name == 'MD5') ? $name : ucfirst(strtolower($name)));
-            } else {
-                continue;
-            }
+            if ($value || (!is_array($value) && strlen($value))) {
+                if (strpos($key, 'HTTP_') === 0) {
+                    if (strpos($key, 'HTTP_COOKIE') === 0) {
+                        // Cookies are handled using the $_COOKIE superglobal
+                        continue;
+                    }
 
-            $headers[$name] = $value;
+                    $headers[strtr(ucwords(strtolower(strtr(substr($key, 5), '_', ' '))), ' ', '-')] = $value;
+                } elseif (strpos($key, 'CONTENT_') === 0) {
+                    $name = substr($key, 8); // Remove "Content-"
+                    $headers['Content-' . (($name == 'MD5') ? $name : ucfirst(strtolower($name)))] = $value;
+                }
+            }
         }
 
         $this->getHeaders()->addHeaders($headers);
@@ -251,7 +249,7 @@ class Request extends HttpRequest
         $uri = new HttpUri();
 
         // URI scheme
-        if ((!empty($this->serverParams['HTTPS']) && $this->serverParams['HTTPS'] !== 'off')
+        if ((!empty($this->serverParams['HTTPS']) && strtolower($this->serverParams['HTTPS']) !== 'off')
             || (!empty($this->serverParams['HTTP_X_FORWARDED_PROTO']) && $this->serverParams['HTTP_X_FORWARDED_PROTO'] == 'https')
         ) {
             $scheme = 'https';
diff --git a/library/Zend/Http/PhpEnvironment/Response.php b/library/Zend/Http/PhpEnvironment/Response.php
old mode 100755
new mode 100644
index 1ffbdb1e2..1a3dc5ab1
--- a/library/Zend/Http/PhpEnvironment/Response.php
+++ b/library/Zend/Http/PhpEnvironment/Response.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/README.md b/library/Zend/Http/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Http/Request.php b/library/Zend/Http/Request.php
old mode 100755
new mode 100644
index 71d36805f..9e53ac2ec
--- a/library/Zend/Http/Request.php
+++ b/library/Zend/Http/Request.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -279,7 +279,7 @@ class Request extends AbstractMessage implements RequestInterface
      * Return the Cookie header, this is the same as calling $request->getHeaders()->get('Cookie');
      *
      * @convenience $request->getHeaders()->get('Cookie');
-     * @return Header\Cookie
+     * @return Header\Cookie|bool
      */
     public function getCookie()
     {
diff --git a/library/Zend/Http/Response.php b/library/Zend/Http/Response.php
old mode 100755
new mode 100644
index e485ff644..4ff8b99b1
--- a/library/Zend/Http/Response.php
+++ b/library/Zend/Http/Response.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/Response/Stream.php b/library/Zend/Http/Response/Stream.php
old mode 100755
new mode 100644
index bb2c310f4..cc74cdc27
--- a/library/Zend/Http/Response/Stream.php
+++ b/library/Zend/Http/Response/Stream.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Http/composer.json b/library/Zend/Http/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/I18n/CONTRIBUTING.md b/library/Zend/I18n/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/I18n/Exception/ExceptionInterface.php b/library/Zend/I18n/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index f6a7a0fb0..6c6cfcdff
--- a/library/Zend/I18n/Exception/ExceptionInterface.php
+++ b/library/Zend/I18n/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Exception/ExtensionNotLoadedException.php b/library/Zend/I18n/Exception/ExtensionNotLoadedException.php
old mode 100755
new mode 100644
index 1b5f8b671..735116f94
--- a/library/Zend/I18n/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/I18n/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,7 +11,6 @@ namespace Zend\I18n\Exception;
 
 use DomainException;
 
-class ExtensionNotLoadedException extends DomainException implements
-    ExceptionInterface
+class ExtensionNotLoadedException extends DomainException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/I18n/Exception/InvalidArgumentException.php b/library/Zend/I18n/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 229ccc284..22c68475d
--- a/library/Zend/I18n/Exception/InvalidArgumentException.php
+++ b/library/Zend/I18n/Exception/InvalidArgumentException.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\I18n\Exception;
 
-class InvalidArgumentException extends \InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/I18n/Exception/OutOfBoundsException.php b/library/Zend/I18n/Exception/OutOfBoundsException.php
old mode 100755
new mode 100644
index fe696ffa9..46f5b2456
--- a/library/Zend/I18n/Exception/OutOfBoundsException.php
+++ b/library/Zend/I18n/Exception/OutOfBoundsException.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\I18n\Exception;
 
-class OutOfBoundsException extends \OutOfBoundsException implements
-    ExceptionInterface
+class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/I18n/Exception/ParseException.php b/library/Zend/I18n/Exception/ParseException.php
old mode 100755
new mode 100644
index 7f82ace06..e97878d94
--- a/library/Zend/I18n/Exception/ParseException.php
+++ b/library/Zend/I18n/Exception/ParseException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Exception/RangeException.php b/library/Zend/I18n/Exception/RangeException.php
old mode 100755
new mode 100644
index 021673f20..e7e8c457f
--- a/library/Zend/I18n/Exception/RangeException.php
+++ b/library/Zend/I18n/Exception/RangeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Exception/RuntimeException.php b/library/Zend/I18n/Exception/RuntimeException.php
old mode 100755
new mode 100644
index f7f37366e..b420a51ca
--- a/library/Zend/I18n/Exception/RuntimeException.php
+++ b/library/Zend/I18n/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Filter/AbstractLocale.php b/library/Zend/I18n/Filter/AbstractLocale.php
old mode 100755
new mode 100644
index 14b3c11fa..ffff1b1d3
--- a/library/Zend/I18n/Filter/AbstractLocale.php
+++ b/library/Zend/I18n/Filter/AbstractLocale.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Filter/Alnum.php b/library/Zend/I18n/Filter/Alnum.php
old mode 100755
new mode 100644
index 563b30f98..15085c97e
--- a/library/Zend/I18n/Filter/Alnum.php
+++ b/library/Zend/I18n/Filter/Alnum.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Filter/Alpha.php b/library/Zend/I18n/Filter/Alpha.php
old mode 100755
new mode 100644
index d7b0f951c..ad468f536
--- a/library/Zend/I18n/Filter/Alpha.php
+++ b/library/Zend/I18n/Filter/Alpha.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Filter/NumberFormat.php b/library/Zend/I18n/Filter/NumberFormat.php
old mode 100755
new mode 100644
index c6b31956d..9c53c7524
--- a/library/Zend/I18n/Filter/NumberFormat.php
+++ b/library/Zend/I18n/Filter/NumberFormat.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Filter/NumberParse.php b/library/Zend/I18n/Filter/NumberParse.php
old mode 100755
new mode 100644
index 5f4775a0c..6f1328e40
--- a/library/Zend/I18n/Filter/NumberParse.php
+++ b/library/Zend/I18n/Filter/NumberParse.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -131,7 +131,6 @@ class NumberParse extends AbstractLocale
         return $this->formatter;
     }
 
-
     /**
      * Defined by Zend\Filter\FilterInterface
      *
diff --git a/library/Zend/I18n/README.md b/library/Zend/I18n/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/I18n/Translator/Loader/AbstractFileLoader.php b/library/Zend/I18n/Translator/Loader/AbstractFileLoader.php
old mode 100755
new mode 100644
index 698725156..285273262
--- a/library/Zend/I18n/Translator/Loader/AbstractFileLoader.php
+++ b/library/Zend/I18n/Translator/Loader/AbstractFileLoader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Translator/Loader/FileLoaderInterface.php b/library/Zend/I18n/Translator/Loader/FileLoaderInterface.php
old mode 100755
new mode 100644
index f21125e93..e387aaea4
--- a/library/Zend/I18n/Translator/Loader/FileLoaderInterface.php
+++ b/library/Zend/I18n/Translator/Loader/FileLoaderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Translator/Loader/Gettext.php b/library/Zend/I18n/Translator/Loader/Gettext.php
old mode 100755
new mode 100644
index 764fe0053..d64827a58
--- a/library/Zend/I18n/Translator/Loader/Gettext.php
+++ b/library/Zend/I18n/Translator/Loader/Gettext.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -128,7 +128,9 @@ class Gettext extends AbstractFileLoader
                     array_shift($originalString);
 
                     foreach ($originalString as $string) {
-                        $textDomain[$string] = '';
+                        if (! isset($textDomain[$string])) {
+                            $textDomain[$string] = '';
+                        }
                     }
                 } else {
                     $textDomain[$originalString[0]] = $translationString[0];
diff --git a/library/Zend/I18n/Translator/Loader/Ini.php b/library/Zend/I18n/Translator/Loader/Ini.php
old mode 100755
new mode 100644
index 49ff0d9ec..fcbd058c7
--- a/library/Zend/I18n/Translator/Loader/Ini.php
+++ b/library/Zend/I18n/Translator/Loader/Ini.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Translator/Loader/PhpArray.php b/library/Zend/I18n/Translator/Loader/PhpArray.php
old mode 100755
new mode 100644
index f46061b57..10fdab879
--- a/library/Zend/I18n/Translator/Loader/PhpArray.php
+++ b/library/Zend/I18n/Translator/Loader/PhpArray.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Translator/Loader/PhpMemoryArray.php b/library/Zend/I18n/Translator/Loader/PhpMemoryArray.php
old mode 100755
new mode 100644
index f38ab30c6..dc9b9e387
--- a/library/Zend/I18n/Translator/Loader/PhpMemoryArray.php
+++ b/library/Zend/I18n/Translator/Loader/PhpMemoryArray.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -40,23 +40,20 @@ class PhpMemoryArray implements RemoteLoaderInterface
     public function load($locale, $textDomain)
     {
         if (!is_array($this->messages)) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                'Expected an array, but received %s',
-                gettype($this->messages)
-            ));
+            throw new Exception\InvalidArgumentException(
+                sprintf('Expected an array, but received %s', gettype($this->messages))
+            );
         }
 
         if (!isset($this->messages[$textDomain])) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                'Expected textdomain "%s" to be an array, but it is not set',
-                $textDomain)
+            throw new Exception\InvalidArgumentException(
+                sprintf('Expected textdomain "%s" to be an array, but it is not set', $textDomain)
             );
         }
 
         if (!isset($this->messages[$textDomain][$locale])) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                'Expected locale "%s" to be an array, but it is not set',
-                $locale)
+            throw new Exception\InvalidArgumentException(
+                sprintf('Expected locale "%s" to be an array, but it is not set', $locale)
             );
         }
 
diff --git a/library/Zend/I18n/Translator/Loader/RemoteLoaderInterface.php b/library/Zend/I18n/Translator/Loader/RemoteLoaderInterface.php
old mode 100755
new mode 100644
index 59b0046d6..8ed1d8fb6
--- a/library/Zend/I18n/Translator/Loader/RemoteLoaderInterface.php
+++ b/library/Zend/I18n/Translator/Loader/RemoteLoaderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Translator/LoaderPluginManager.php b/library/Zend/I18n/Translator/LoaderPluginManager.php
old mode 100755
new mode 100644
index 4ce796635..9ecdbb100
--- a/library/Zend/I18n/Translator/LoaderPluginManager.php
+++ b/library/Zend/I18n/Translator/LoaderPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Translator/Plural/Parser.php b/library/Zend/I18n/Translator/Plural/Parser.php
old mode 100755
new mode 100644
index d3e872e3c..863834678
--- a/library/Zend/I18n/Translator/Plural/Parser.php
+++ b/library/Zend/I18n/Translator/Plural/Parser.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -222,7 +222,7 @@ class Parser
      * Parse a string.
      *
      * @param  string $string
-     * @return array
+     * @return Symbol
      */
     public function parse($string)
     {
@@ -264,10 +264,9 @@ class Parser
     public function advance($id = null)
     {
         if ($id !== null && $this->currentToken->id !== $id) {
-            throw new Exception\ParseException(sprintf(
-                'Expected token with id %s but received %s',
-                $id, $this->currentToken->id
-            ));
+            throw new Exception\ParseException(
+                sprintf('Expected token with id %s but received %s', $id, $this->currentToken->id)
+            );
         }
 
         $this->currentToken = $this->getNextToken();
diff --git a/library/Zend/I18n/Translator/Plural/Rule.php b/library/Zend/I18n/Translator/Plural/Rule.php
old mode 100755
new mode 100644
index 98e29cf60..5427fce8e
--- a/library/Zend/I18n/Translator/Plural/Rule.php
+++ b/library/Zend/I18n/Translator/Plural/Rule.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -62,10 +62,9 @@ class Rule
         $result = $this->evaluateAstPart($this->ast, abs((int) $number));
 
         if ($result < 0 || $result >= $this->numPlurals) {
-            throw new Exception\RangeException(sprintf(
-                'Calculated result %s is between 0 and %d',
-                $result, ($this->numPlurals - 1)
-            ));
+            throw new Exception\RangeException(
+                sprintf('Calculated result %s is between 0 and %d', $result, ($this->numPlurals - 1))
+            );
         }
 
         return $result;
diff --git a/library/Zend/I18n/Translator/Plural/Symbol.php b/library/Zend/I18n/Translator/Plural/Symbol.php
old mode 100755
new mode 100644
index 31d6606c7..7b33419ea
--- a/library/Zend/I18n/Translator/Plural/Symbol.php
+++ b/library/Zend/I18n/Translator/Plural/Symbol.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -132,9 +132,7 @@ class Symbol
     public function getNullDenotation()
     {
         if ($this->nullDenotationGetter === null) {
-            throw new Exception\ParseException(sprintf(
-                'Syntax error: %s', $this->id
-            ));
+            throw new Exception\ParseException(sprintf('Syntax error: %s', $this->id));
         }
 
         /** @var callable $function  */
@@ -152,9 +150,7 @@ class Symbol
     public function getLeftDenotation($left)
     {
         if ($this->leftDenotationGetter === null) {
-            throw new Exception\ParseException(sprintf(
-                'Unknown operator: %s', $this->id
-            ));
+            throw new Exception\ParseException(sprintf('Unknown operator: %s', $this->id));
         }
 
         /** @var callable $function  */
diff --git a/library/Zend/I18n/Translator/TextDomain.php b/library/Zend/I18n/Translator/TextDomain.php
old mode 100755
new mode 100644
index 5c9607e8c..ee746ba17
--- a/library/Zend/I18n/Translator/TextDomain.php
+++ b/library/Zend/I18n/Translator/TextDomain.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Translator/Translator.php b/library/Zend/I18n/Translator/Translator.php
old mode 100755
new mode 100644
index 2bfb54220..7f11a63d6
--- a/library/Zend/I18n/Translator/Translator.php
+++ b/library/Zend/I18n/Translator/Translator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -408,9 +408,9 @@ class Translator implements TranslatorInterface
                       ->evaluate($number);
 
         if (!isset($translation[$index])) {
-            throw new Exception\OutOfBoundsException(sprintf(
-                'Provided index %d does not exist in plural array', $index
-            ));
+            throw new Exception\OutOfBoundsException(
+                sprintf('Provided index %d does not exist in plural array', $index)
+            );
         }
 
         return $translation[$index];
diff --git a/library/Zend/I18n/Translator/TranslatorAwareInterface.php b/library/Zend/I18n/Translator/TranslatorAwareInterface.php
old mode 100755
new mode 100644
index 1b4cbce73..aaebf6164
--- a/library/Zend/I18n/Translator/TranslatorAwareInterface.php
+++ b/library/Zend/I18n/Translator/TranslatorAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Translator/TranslatorAwareTrait.php b/library/Zend/I18n/Translator/TranslatorAwareTrait.php
old mode 100755
new mode 100644
index f223e4a62..d4d4e7531
--- a/library/Zend/I18n/Translator/TranslatorAwareTrait.php
+++ b/library/Zend/I18n/Translator/TranslatorAwareTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Translator/TranslatorInterface.php b/library/Zend/I18n/Translator/TranslatorInterface.php
old mode 100755
new mode 100644
index b7f1bb564..43986b6b1
--- a/library/Zend/I18n/Translator/TranslatorInterface.php
+++ b/library/Zend/I18n/Translator/TranslatorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Translator/TranslatorServiceFactory.php b/library/Zend/I18n/Translator/TranslatorServiceFactory.php
old mode 100755
new mode 100644
index 8a14ffed6..427df4240
--- a/library/Zend/I18n/Translator/TranslatorServiceFactory.php
+++ b/library/Zend/I18n/Translator/TranslatorServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/Alnum.php b/library/Zend/I18n/Validator/Alnum.php
old mode 100755
new mode 100644
index f983a642f..162fd86be
--- a/library/Zend/I18n/Validator/Alnum.php
+++ b/library/Zend/I18n/Validator/Alnum.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/Alpha.php b/library/Zend/I18n/Validator/Alpha.php
old mode 100755
new mode 100644
index c79729933..2e136cd32
--- a/library/Zend/I18n/Validator/Alpha.php
+++ b/library/Zend/I18n/Validator/Alpha.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/DateTime.php b/library/Zend/I18n/Validator/DateTime.php
old mode 100755
new mode 100644
index 73f00981a..f67886b24
--- a/library/Zend/I18n/Validator/DateTime.php
+++ b/library/Zend/I18n/Validator/DateTime.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -12,6 +12,7 @@ namespace Zend\I18n\Validator;
 use Locale;
 use IntlDateFormatter;
 use Traversable;
+use IntlException;
 use Zend\I18n\Exception as I18nException;
 use Zend\Validator\AbstractValidator;
 use Zend\Validator\Exception as ValidatorException;
@@ -263,15 +264,26 @@ class DateTime extends AbstractValidator
         }
 
         $this->setValue($value);
-        $formatter = $this->getIntlDateFormatter();
 
-        if (intl_is_failure($formatter->getErrorCode())) {
-            throw new ValidatorException\InvalidArgumentException($formatter->getErrorMessage());
+        try {
+            $formatter = $this->getIntlDateFormatter();
+
+            if (intl_is_failure($formatter->getErrorCode())) {
+                throw new ValidatorException\InvalidArgumentException($formatter->getErrorMessage());
+            }
+        } catch (IntlException $intlException) {
+            throw new ValidatorException\InvalidArgumentException($e->getMessage(), 0, $intlException);
         }
 
-        $timestamp = $formatter->parse($value);
 
-        if (intl_is_failure($formatter->getErrorCode()) || $timestamp === false) {
+        try {
+            $timestamp = $formatter->parse($value);
+
+            if (intl_is_failure($formatter->getErrorCode()) || $timestamp === false) {
+                $this->error(self::INVALID_DATETIME);
+                return false;
+            }
+        } catch (IntlException $intlException) {
             $this->error(self::INVALID_DATETIME);
             return false;
         }
diff --git a/library/Zend/I18n/Validator/Float.php b/library/Zend/I18n/Validator/Float.php
old mode 100755
new mode 100644
index af1460898..b52aa3962
--- a/library/Zend/I18n/Validator/Float.php
+++ b/library/Zend/I18n/Validator/Float.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -12,6 +12,7 @@ namespace Zend\I18n\Validator;
 use Locale;
 use NumberFormatter;
 use Traversable;
+use IntlException;
 use Zend\I18n\Exception as I18nException;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Stdlib\StringUtils;
@@ -122,8 +123,12 @@ class Float extends AbstractValidator
         // Need to check if this is scientific formatted string. If not, switch to decimal.
         $formatter = new NumberFormatter($this->getLocale(), NumberFormatter::SCIENTIFIC);
 
-        if (intl_is_failure($formatter->getErrorCode())) {
-            throw new Exception\InvalidArgumentException($formatter->getErrorMessage());
+        try {
+            if (intl_is_failure($formatter->getErrorCode())) {
+                throw new Exception\InvalidArgumentException($formatter->getErrorMessage());
+            }
+        } catch (IntlException $intlException) {
+            throw new Exception\InvalidArgumentException($e->getMessage(), 0, $intlException);
         }
 
         if (StringUtils::hasPcreUnicodeSupport()) {
@@ -162,6 +167,8 @@ class Float extends AbstractValidator
 
         //We have seperators, and they are flipped. i.e. 2.000,000 for en-US
         if ($groupSeparatorPosition && $decSeparatorPosition && $groupSeparatorPosition > $decSeparatorPosition) {
+            $this->error(self::NOT_FLOAT);
+
             return false;
         }
 
@@ -237,6 +244,8 @@ class Float extends AbstractValidator
             return true;
         }
 
+        $this->error(self::NOT_FLOAT);
+
         return false;
     }
 }
diff --git a/library/Zend/I18n/Validator/Int.php b/library/Zend/I18n/Validator/Int.php
old mode 100755
new mode 100644
index c6f90ca81..7f8df04b9
--- a/library/Zend/I18n/Validator/Int.php
+++ b/library/Zend/I18n/Validator/Int.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -12,11 +12,13 @@ namespace Zend\I18n\Validator;
 use Locale;
 use NumberFormatter;
 use Traversable;
+use IntlException;
 use Zend\I18n\Exception as I18nException;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Validator\AbstractValidator;
 use Zend\Validator\Exception;
 
+
 class Int extends AbstractValidator
 {
     const INVALID = 'intInvalid';
@@ -107,13 +109,22 @@ class Int extends AbstractValidator
         $this->setValue($value);
 
         $locale = $this->getLocale();
-        $format = new NumberFormatter($locale, NumberFormatter::DECIMAL);
-        if (intl_is_failure($format->getErrorCode())) {
-            throw new Exception\InvalidArgumentException("Invalid locale string given");
+        try {
+            $format = new NumberFormatter($locale, NumberFormatter::DECIMAL);
+            if (intl_is_failure($format->getErrorCode())) {
+                throw new Exception\InvalidArgumentException("Invalid locale string given");
+            }
+        } catch (IntlException $intlException) {
+            throw new Exception\InvalidArgumentException("Invalid locale string given", 0, $intlException);
         }
 
-        $parsedInt = $format->parse($value, NumberFormatter::TYPE_INT64);
-        if (intl_is_failure($format->getErrorCode())) {
+        try {
+            $parsedInt = $format->parse($value, NumberFormatter::TYPE_INT64);
+            if (intl_is_failure($format->getErrorCode())) {
+                $this->error(self::NOT_INT);
+                return false;
+            }
+        } catch (IntlException $intlException) {
             $this->error(self::NOT_INT);
             return false;
         }
diff --git a/library/Zend/I18n/Validator/PhoneNumber.php b/library/Zend/I18n/Validator/PhoneNumber.php
old mode 100755
new mode 100644
index 37fe6d407..3af31a2b8
--- a/library/Zend/I18n/Validator/PhoneNumber.php
+++ b/library/Zend/I18n/Validator/PhoneNumber.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AC.php b/library/Zend/I18n/Validator/PhoneNumber/AC.php
old mode 100755
new mode 100644
index a8e32bfaa..d1356fee6
--- a/library/Zend/I18n/Validator/PhoneNumber/AC.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AC.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AD.php b/library/Zend/I18n/Validator/PhoneNumber/AD.php
old mode 100755
new mode 100644
index 54ccdbb06..e9369ba72
--- a/library/Zend/I18n/Validator/PhoneNumber/AD.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AD.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AE.php b/library/Zend/I18n/Validator/PhoneNumber/AE.php
old mode 100755
new mode 100644
index 8cacd8c07..45f8ea3cd
--- a/library/Zend/I18n/Validator/PhoneNumber/AE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AF.php b/library/Zend/I18n/Validator/PhoneNumber/AF.php
old mode 100755
new mode 100644
index c4a25e332..bbbdb2daf
--- a/library/Zend/I18n/Validator/PhoneNumber/AF.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AF.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AG.php b/library/Zend/I18n/Validator/PhoneNumber/AG.php
old mode 100755
new mode 100644
index f3f62c883..99c074cfb
--- a/library/Zend/I18n/Validator/PhoneNumber/AG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AI.php b/library/Zend/I18n/Validator/PhoneNumber/AI.php
old mode 100755
new mode 100644
index 4d5c2f2d0..e086c43e2
--- a/library/Zend/I18n/Validator/PhoneNumber/AI.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AI.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AL.php b/library/Zend/I18n/Validator/PhoneNumber/AL.php
old mode 100755
new mode 100644
index 765acf2ec..a80de5f27
--- a/library/Zend/I18n/Validator/PhoneNumber/AL.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AL.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AM.php b/library/Zend/I18n/Validator/PhoneNumber/AM.php
old mode 100755
new mode 100644
index af34426b6..03b04fb8a
--- a/library/Zend/I18n/Validator/PhoneNumber/AM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AO.php b/library/Zend/I18n/Validator/PhoneNumber/AO.php
old mode 100755
new mode 100644
index a9c8632ee..6817767c1
--- a/library/Zend/I18n/Validator/PhoneNumber/AO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AR.php b/library/Zend/I18n/Validator/PhoneNumber/AR.php
old mode 100755
new mode 100644
index 2cdb5efb8..b61e9476c
--- a/library/Zend/I18n/Validator/PhoneNumber/AR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AS.php b/library/Zend/I18n/Validator/PhoneNumber/AS.php
old mode 100755
new mode 100644
index 21686cbac..da5300b91
--- a/library/Zend/I18n/Validator/PhoneNumber/AS.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AS.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AT.php b/library/Zend/I18n/Validator/PhoneNumber/AT.php
old mode 100755
new mode 100644
index e79f2b23c..9bdcd3fa1
--- a/library/Zend/I18n/Validator/PhoneNumber/AT.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AT.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AU.php b/library/Zend/I18n/Validator/PhoneNumber/AU.php
old mode 100755
new mode 100644
index 129c543a1..5e5c46d23
--- a/library/Zend/I18n/Validator/PhoneNumber/AU.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AU.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AW.php b/library/Zend/I18n/Validator/PhoneNumber/AW.php
old mode 100755
new mode 100644
index a5493c5fc..f1b927fc8
--- a/library/Zend/I18n/Validator/PhoneNumber/AW.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AW.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AX.php b/library/Zend/I18n/Validator/PhoneNumber/AX.php
old mode 100755
new mode 100644
index 36b90a0ac..2223a7fb3
--- a/library/Zend/I18n/Validator/PhoneNumber/AX.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AX.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/AZ.php b/library/Zend/I18n/Validator/PhoneNumber/AZ.php
old mode 100755
new mode 100644
index f62ef58eb..ad8e82394
--- a/library/Zend/I18n/Validator/PhoneNumber/AZ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/AZ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BA.php b/library/Zend/I18n/Validator/PhoneNumber/BA.php
old mode 100755
new mode 100644
index aacdbc9e0..e7908dd3a
--- a/library/Zend/I18n/Validator/PhoneNumber/BA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BB.php b/library/Zend/I18n/Validator/PhoneNumber/BB.php
old mode 100755
new mode 100644
index eff89300b..961750c2c
--- a/library/Zend/I18n/Validator/PhoneNumber/BB.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BB.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BD.php b/library/Zend/I18n/Validator/PhoneNumber/BD.php
old mode 100755
new mode 100644
index 9924303c8..9a6b8a18d
--- a/library/Zend/I18n/Validator/PhoneNumber/BD.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BD.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BE.php b/library/Zend/I18n/Validator/PhoneNumber/BE.php
old mode 100755
new mode 100644
index ae0020a41..72022bc94
--- a/library/Zend/I18n/Validator/PhoneNumber/BE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BF.php b/library/Zend/I18n/Validator/PhoneNumber/BF.php
old mode 100755
new mode 100644
index 2d9d9a580..9b287fcdd
--- a/library/Zend/I18n/Validator/PhoneNumber/BF.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BF.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BG.php b/library/Zend/I18n/Validator/PhoneNumber/BG.php
old mode 100755
new mode 100644
index 4e8c4fcbd..70cdc86a1
--- a/library/Zend/I18n/Validator/PhoneNumber/BG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BH.php b/library/Zend/I18n/Validator/PhoneNumber/BH.php
old mode 100755
new mode 100644
index 755ff41e9..86dd502ad
--- a/library/Zend/I18n/Validator/PhoneNumber/BH.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BH.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BI.php b/library/Zend/I18n/Validator/PhoneNumber/BI.php
old mode 100755
new mode 100644
index d71589d0b..7a29f820b
--- a/library/Zend/I18n/Validator/PhoneNumber/BI.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BI.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BJ.php b/library/Zend/I18n/Validator/PhoneNumber/BJ.php
old mode 100755
new mode 100644
index d45f86293..0b6b7f609
--- a/library/Zend/I18n/Validator/PhoneNumber/BJ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BJ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BL.php b/library/Zend/I18n/Validator/PhoneNumber/BL.php
old mode 100755
new mode 100644
index 7a65486cc..fa7d83ad1
--- a/library/Zend/I18n/Validator/PhoneNumber/BL.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BL.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BM.php b/library/Zend/I18n/Validator/PhoneNumber/BM.php
old mode 100755
new mode 100644
index 9db45422b..c52128767
--- a/library/Zend/I18n/Validator/PhoneNumber/BM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BN.php b/library/Zend/I18n/Validator/PhoneNumber/BN.php
old mode 100755
new mode 100644
index 0dabeae00..b49f67d05
--- a/library/Zend/I18n/Validator/PhoneNumber/BN.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BN.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BO.php b/library/Zend/I18n/Validator/PhoneNumber/BO.php
old mode 100755
new mode 100644
index a81a711b8..b7eddf86b
--- a/library/Zend/I18n/Validator/PhoneNumber/BO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BQ.php b/library/Zend/I18n/Validator/PhoneNumber/BQ.php
old mode 100755
new mode 100644
index ec2473933..5b91802d8
--- a/library/Zend/I18n/Validator/PhoneNumber/BQ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BQ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BR.php b/library/Zend/I18n/Validator/PhoneNumber/BR.php
old mode 100755
new mode 100644
index 00d334c17..7d623e6b9
--- a/library/Zend/I18n/Validator/PhoneNumber/BR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BS.php b/library/Zend/I18n/Validator/PhoneNumber/BS.php
old mode 100755
new mode 100644
index 55a9d552b..238c7d16f
--- a/library/Zend/I18n/Validator/PhoneNumber/BS.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BS.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BT.php b/library/Zend/I18n/Validator/PhoneNumber/BT.php
old mode 100755
new mode 100644
index f6e49d4a2..19022abcd
--- a/library/Zend/I18n/Validator/PhoneNumber/BT.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BT.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BW.php b/library/Zend/I18n/Validator/PhoneNumber/BW.php
old mode 100755
new mode 100644
index 1cac6f552..208ea9cfb
--- a/library/Zend/I18n/Validator/PhoneNumber/BW.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BW.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BY.php b/library/Zend/I18n/Validator/PhoneNumber/BY.php
old mode 100755
new mode 100644
index 288b0d00e..6c06aa365
--- a/library/Zend/I18n/Validator/PhoneNumber/BY.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BY.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/BZ.php b/library/Zend/I18n/Validator/PhoneNumber/BZ.php
old mode 100755
new mode 100644
index 713e28fdd..047562aa3
--- a/library/Zend/I18n/Validator/PhoneNumber/BZ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/BZ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CA.php b/library/Zend/I18n/Validator/PhoneNumber/CA.php
old mode 100755
new mode 100644
index 0d7388e4c..e184b7133
--- a/library/Zend/I18n/Validator/PhoneNumber/CA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CC.php b/library/Zend/I18n/Validator/PhoneNumber/CC.php
old mode 100755
new mode 100644
index d5565fccf..c37dac8cd
--- a/library/Zend/I18n/Validator/PhoneNumber/CC.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CC.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CD.php b/library/Zend/I18n/Validator/PhoneNumber/CD.php
old mode 100755
new mode 100644
index f0589c91c..cc3278e1b
--- a/library/Zend/I18n/Validator/PhoneNumber/CD.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CD.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CF.php b/library/Zend/I18n/Validator/PhoneNumber/CF.php
old mode 100755
new mode 100644
index 2ccb05cff..29c28e45f
--- a/library/Zend/I18n/Validator/PhoneNumber/CF.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CF.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CG.php b/library/Zend/I18n/Validator/PhoneNumber/CG.php
old mode 100755
new mode 100644
index dadad9ff4..f036b8136
--- a/library/Zend/I18n/Validator/PhoneNumber/CG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CH.php b/library/Zend/I18n/Validator/PhoneNumber/CH.php
old mode 100755
new mode 100644
index a16c372ab..c3e34cbcf
--- a/library/Zend/I18n/Validator/PhoneNumber/CH.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CH.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CI.php b/library/Zend/I18n/Validator/PhoneNumber/CI.php
old mode 100755
new mode 100644
index c688aa2b3..2dc7092e8
--- a/library/Zend/I18n/Validator/PhoneNumber/CI.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CI.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CK.php b/library/Zend/I18n/Validator/PhoneNumber/CK.php
old mode 100755
new mode 100644
index 932f83fcb..1c2871ed5
--- a/library/Zend/I18n/Validator/PhoneNumber/CK.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CK.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CL.php b/library/Zend/I18n/Validator/PhoneNumber/CL.php
old mode 100755
new mode 100644
index 8cccec24d..0c2362fda
--- a/library/Zend/I18n/Validator/PhoneNumber/CL.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CL.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CM.php b/library/Zend/I18n/Validator/PhoneNumber/CM.php
old mode 100755
new mode 100644
index b3249d9a6..1c2e0188c
--- a/library/Zend/I18n/Validator/PhoneNumber/CM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CN.php b/library/Zend/I18n/Validator/PhoneNumber/CN.php
old mode 100755
new mode 100644
index 28ed30d09..e936fab25
--- a/library/Zend/I18n/Validator/PhoneNumber/CN.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CN.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CO.php b/library/Zend/I18n/Validator/PhoneNumber/CO.php
old mode 100755
new mode 100644
index bb37839a6..2f67c08c1
--- a/library/Zend/I18n/Validator/PhoneNumber/CO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CR.php b/library/Zend/I18n/Validator/PhoneNumber/CR.php
old mode 100755
new mode 100644
index dd31fc8c5..354bbbb23
--- a/library/Zend/I18n/Validator/PhoneNumber/CR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CU.php b/library/Zend/I18n/Validator/PhoneNumber/CU.php
old mode 100755
new mode 100644
index 8b57518fa..9686c1a5b
--- a/library/Zend/I18n/Validator/PhoneNumber/CU.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CU.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CV.php b/library/Zend/I18n/Validator/PhoneNumber/CV.php
old mode 100755
new mode 100644
index e0fbd208a..eb4574b21
--- a/library/Zend/I18n/Validator/PhoneNumber/CV.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CV.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CW.php b/library/Zend/I18n/Validator/PhoneNumber/CW.php
old mode 100755
new mode 100644
index f98f61243..837226580
--- a/library/Zend/I18n/Validator/PhoneNumber/CW.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CW.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CX.php b/library/Zend/I18n/Validator/PhoneNumber/CX.php
old mode 100755
new mode 100644
index f8b783d1e..c0780f489
--- a/library/Zend/I18n/Validator/PhoneNumber/CX.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CX.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CY.php b/library/Zend/I18n/Validator/PhoneNumber/CY.php
old mode 100755
new mode 100644
index d31c642cf..3a62a9e21
--- a/library/Zend/I18n/Validator/PhoneNumber/CY.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CY.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/CZ.php b/library/Zend/I18n/Validator/PhoneNumber/CZ.php
old mode 100755
new mode 100644
index 0522f3a2f..a4752b3e1
--- a/library/Zend/I18n/Validator/PhoneNumber/CZ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/CZ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/DE.php b/library/Zend/I18n/Validator/PhoneNumber/DE.php
old mode 100755
new mode 100644
index c2e33cfe6..9e3858326
--- a/library/Zend/I18n/Validator/PhoneNumber/DE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/DE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/DJ.php b/library/Zend/I18n/Validator/PhoneNumber/DJ.php
old mode 100755
new mode 100644
index 4d67877a5..2f1c7df00
--- a/library/Zend/I18n/Validator/PhoneNumber/DJ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/DJ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/DK.php b/library/Zend/I18n/Validator/PhoneNumber/DK.php
old mode 100755
new mode 100644
index 7ca1c02ab..a3493b254
--- a/library/Zend/I18n/Validator/PhoneNumber/DK.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/DK.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/DM.php b/library/Zend/I18n/Validator/PhoneNumber/DM.php
old mode 100755
new mode 100644
index 46fb12cba..74cca0ab7
--- a/library/Zend/I18n/Validator/PhoneNumber/DM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/DM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/DO.php b/library/Zend/I18n/Validator/PhoneNumber/DO.php
old mode 100755
new mode 100644
index 8ad41576e..412ad19c9
--- a/library/Zend/I18n/Validator/PhoneNumber/DO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/DO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/DZ.php b/library/Zend/I18n/Validator/PhoneNumber/DZ.php
old mode 100755
new mode 100644
index dc76f783a..46e941d52
--- a/library/Zend/I18n/Validator/PhoneNumber/DZ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/DZ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/EC.php b/library/Zend/I18n/Validator/PhoneNumber/EC.php
old mode 100755
new mode 100644
index e059b3e85..2e929bd61
--- a/library/Zend/I18n/Validator/PhoneNumber/EC.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/EC.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/EE.php b/library/Zend/I18n/Validator/PhoneNumber/EE.php
old mode 100755
new mode 100644
index 43184e269..d09f3081a
--- a/library/Zend/I18n/Validator/PhoneNumber/EE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/EE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/EG.php b/library/Zend/I18n/Validator/PhoneNumber/EG.php
old mode 100755
new mode 100644
index 513700455..d26829a70
--- a/library/Zend/I18n/Validator/PhoneNumber/EG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/EG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/EH.php b/library/Zend/I18n/Validator/PhoneNumber/EH.php
old mode 100755
new mode 100644
index 61fa02545..a328ffcc3
--- a/library/Zend/I18n/Validator/PhoneNumber/EH.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/EH.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/ER.php b/library/Zend/I18n/Validator/PhoneNumber/ER.php
old mode 100755
new mode 100644
index 561f303ab..919acf5d0
--- a/library/Zend/I18n/Validator/PhoneNumber/ER.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/ER.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/ES.php b/library/Zend/I18n/Validator/PhoneNumber/ES.php
old mode 100755
new mode 100644
index c9640759f..5387b25fb
--- a/library/Zend/I18n/Validator/PhoneNumber/ES.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/ES.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/ET.php b/library/Zend/I18n/Validator/PhoneNumber/ET.php
old mode 100755
new mode 100644
index 8601f0099..f87979b5e
--- a/library/Zend/I18n/Validator/PhoneNumber/ET.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/ET.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/FI.php b/library/Zend/I18n/Validator/PhoneNumber/FI.php
old mode 100755
new mode 100644
index 3450c5aed..ecfa89b61
--- a/library/Zend/I18n/Validator/PhoneNumber/FI.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/FI.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/FJ.php b/library/Zend/I18n/Validator/PhoneNumber/FJ.php
old mode 100755
new mode 100644
index 4d6cf27ca..da6105a0d
--- a/library/Zend/I18n/Validator/PhoneNumber/FJ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/FJ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/FK.php b/library/Zend/I18n/Validator/PhoneNumber/FK.php
old mode 100755
new mode 100644
index fb92b5b3b..b826575e9
--- a/library/Zend/I18n/Validator/PhoneNumber/FK.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/FK.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/FM.php b/library/Zend/I18n/Validator/PhoneNumber/FM.php
old mode 100755
new mode 100644
index 05b987ff0..f16972bc0
--- a/library/Zend/I18n/Validator/PhoneNumber/FM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/FM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/FO.php b/library/Zend/I18n/Validator/PhoneNumber/FO.php
old mode 100755
new mode 100644
index 175587aaf..8f402e425
--- a/library/Zend/I18n/Validator/PhoneNumber/FO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/FO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/FR.php b/library/Zend/I18n/Validator/PhoneNumber/FR.php
old mode 100755
new mode 100644
index fdbadcd34..b14e32afd
--- a/library/Zend/I18n/Validator/PhoneNumber/FR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/FR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GA.php b/library/Zend/I18n/Validator/PhoneNumber/GA.php
old mode 100755
new mode 100644
index 89efc1a7e..46ad3fe60
--- a/library/Zend/I18n/Validator/PhoneNumber/GA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GB.php b/library/Zend/I18n/Validator/PhoneNumber/GB.php
old mode 100755
new mode 100644
index c79d084ce..ccebd249a
--- a/library/Zend/I18n/Validator/PhoneNumber/GB.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GB.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GD.php b/library/Zend/I18n/Validator/PhoneNumber/GD.php
old mode 100755
new mode 100644
index 5402120e7..79d8b665f
--- a/library/Zend/I18n/Validator/PhoneNumber/GD.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GD.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GE.php b/library/Zend/I18n/Validator/PhoneNumber/GE.php
old mode 100755
new mode 100644
index 8574f7fe1..fac5a7703
--- a/library/Zend/I18n/Validator/PhoneNumber/GE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GF.php b/library/Zend/I18n/Validator/PhoneNumber/GF.php
old mode 100755
new mode 100644
index 2cf36618d..8a2d790db
--- a/library/Zend/I18n/Validator/PhoneNumber/GF.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GF.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GG.php b/library/Zend/I18n/Validator/PhoneNumber/GG.php
old mode 100755
new mode 100644
index ed5414759..067acc378
--- a/library/Zend/I18n/Validator/PhoneNumber/GG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GH.php b/library/Zend/I18n/Validator/PhoneNumber/GH.php
old mode 100755
new mode 100644
index cd575022d..7f7e363d4
--- a/library/Zend/I18n/Validator/PhoneNumber/GH.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GH.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GI.php b/library/Zend/I18n/Validator/PhoneNumber/GI.php
old mode 100755
new mode 100644
index 6847168be..561620e9b
--- a/library/Zend/I18n/Validator/PhoneNumber/GI.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GI.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GL.php b/library/Zend/I18n/Validator/PhoneNumber/GL.php
old mode 100755
new mode 100644
index 074467e1c..c429cd4e6
--- a/library/Zend/I18n/Validator/PhoneNumber/GL.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GL.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GM.php b/library/Zend/I18n/Validator/PhoneNumber/GM.php
old mode 100755
new mode 100644
index d4b834bdc..637a496c6
--- a/library/Zend/I18n/Validator/PhoneNumber/GM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GN.php b/library/Zend/I18n/Validator/PhoneNumber/GN.php
old mode 100755
new mode 100644
index d1df586c3..df126258b
--- a/library/Zend/I18n/Validator/PhoneNumber/GN.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GN.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GP.php b/library/Zend/I18n/Validator/PhoneNumber/GP.php
old mode 100755
new mode 100644
index 75ab3436c..2efcda498
--- a/library/Zend/I18n/Validator/PhoneNumber/GP.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GP.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GQ.php b/library/Zend/I18n/Validator/PhoneNumber/GQ.php
old mode 100755
new mode 100644
index df5d25311..77fe07cc1
--- a/library/Zend/I18n/Validator/PhoneNumber/GQ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GQ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GR.php b/library/Zend/I18n/Validator/PhoneNumber/GR.php
old mode 100755
new mode 100644
index f279291ac..ecb5dafd1
--- a/library/Zend/I18n/Validator/PhoneNumber/GR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GT.php b/library/Zend/I18n/Validator/PhoneNumber/GT.php
old mode 100755
new mode 100644
index f417e17a6..25010c61b
--- a/library/Zend/I18n/Validator/PhoneNumber/GT.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GT.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GU.php b/library/Zend/I18n/Validator/PhoneNumber/GU.php
old mode 100755
new mode 100644
index f897375f9..466d7bc18
--- a/library/Zend/I18n/Validator/PhoneNumber/GU.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GU.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GW.php b/library/Zend/I18n/Validator/PhoneNumber/GW.php
old mode 100755
new mode 100644
index 661a13e03..7f251ad9f
--- a/library/Zend/I18n/Validator/PhoneNumber/GW.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GW.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/GY.php b/library/Zend/I18n/Validator/PhoneNumber/GY.php
old mode 100755
new mode 100644
index 1d97f5138..d485d2e08
--- a/library/Zend/I18n/Validator/PhoneNumber/GY.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/GY.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/HK.php b/library/Zend/I18n/Validator/PhoneNumber/HK.php
old mode 100755
new mode 100644
index 4d8ad36b0..66acea94e
--- a/library/Zend/I18n/Validator/PhoneNumber/HK.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/HK.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/HN.php b/library/Zend/I18n/Validator/PhoneNumber/HN.php
old mode 100755
new mode 100644
index d6737460a..2645c73cc
--- a/library/Zend/I18n/Validator/PhoneNumber/HN.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/HN.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/HR.php b/library/Zend/I18n/Validator/PhoneNumber/HR.php
old mode 100755
new mode 100644
index a4c032f81..1dfe30cf0
--- a/library/Zend/I18n/Validator/PhoneNumber/HR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/HR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/HT.php b/library/Zend/I18n/Validator/PhoneNumber/HT.php
old mode 100755
new mode 100644
index 90abff576..e9371388c
--- a/library/Zend/I18n/Validator/PhoneNumber/HT.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/HT.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/HU.php b/library/Zend/I18n/Validator/PhoneNumber/HU.php
old mode 100755
new mode 100644
index c1d266156..400a29dbe
--- a/library/Zend/I18n/Validator/PhoneNumber/HU.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/HU.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/ID.php b/library/Zend/I18n/Validator/PhoneNumber/ID.php
old mode 100755
new mode 100644
index 05f70715b..b22157f6f
--- a/library/Zend/I18n/Validator/PhoneNumber/ID.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/ID.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/IE.php b/library/Zend/I18n/Validator/PhoneNumber/IE.php
old mode 100755
new mode 100644
index 416da0544..75a9ddf78
--- a/library/Zend/I18n/Validator/PhoneNumber/IE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/IE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/IL.php b/library/Zend/I18n/Validator/PhoneNumber/IL.php
old mode 100755
new mode 100644
index 293a3fa61..286fca8c1
--- a/library/Zend/I18n/Validator/PhoneNumber/IL.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/IL.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/IM.php b/library/Zend/I18n/Validator/PhoneNumber/IM.php
old mode 100755
new mode 100644
index d36f15a29..910d465ca
--- a/library/Zend/I18n/Validator/PhoneNumber/IM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/IM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/IN.php b/library/Zend/I18n/Validator/PhoneNumber/IN.php
old mode 100755
new mode 100644
index 1968e8f9a..440addf0e
--- a/library/Zend/I18n/Validator/PhoneNumber/IN.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/IN.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/IO.php b/library/Zend/I18n/Validator/PhoneNumber/IO.php
old mode 100755
new mode 100644
index 1b1d63bd3..6375b3372
--- a/library/Zend/I18n/Validator/PhoneNumber/IO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/IO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/IQ.php b/library/Zend/I18n/Validator/PhoneNumber/IQ.php
old mode 100755
new mode 100644
index e660e2748..912c3194c
--- a/library/Zend/I18n/Validator/PhoneNumber/IQ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/IQ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/IR.php b/library/Zend/I18n/Validator/PhoneNumber/IR.php
old mode 100755
new mode 100644
index 6ca5e96ac..7743e69e6
--- a/library/Zend/I18n/Validator/PhoneNumber/IR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/IR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/IS.php b/library/Zend/I18n/Validator/PhoneNumber/IS.php
old mode 100755
new mode 100644
index 517e49fa8..0f1874d4b
--- a/library/Zend/I18n/Validator/PhoneNumber/IS.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/IS.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/IT.php b/library/Zend/I18n/Validator/PhoneNumber/IT.php
old mode 100755
new mode 100644
index 9274de6a0..b6f16be62
--- a/library/Zend/I18n/Validator/PhoneNumber/IT.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/IT.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/JE.php b/library/Zend/I18n/Validator/PhoneNumber/JE.php
old mode 100755
new mode 100644
index 71f2f6984..fb4d5604b
--- a/library/Zend/I18n/Validator/PhoneNumber/JE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/JE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/JM.php b/library/Zend/I18n/Validator/PhoneNumber/JM.php
old mode 100755
new mode 100644
index d70e08ebd..b602a498f
--- a/library/Zend/I18n/Validator/PhoneNumber/JM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/JM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/JO.php b/library/Zend/I18n/Validator/PhoneNumber/JO.php
old mode 100755
new mode 100644
index efd7f97ed..c1bd3b985
--- a/library/Zend/I18n/Validator/PhoneNumber/JO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/JO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/JP.php b/library/Zend/I18n/Validator/PhoneNumber/JP.php
old mode 100755
new mode 100644
index 31d8ab5a4..85619eba5
--- a/library/Zend/I18n/Validator/PhoneNumber/JP.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/JP.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/KE.php b/library/Zend/I18n/Validator/PhoneNumber/KE.php
old mode 100755
new mode 100644
index 49f198d6a..704fab02c
--- a/library/Zend/I18n/Validator/PhoneNumber/KE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/KE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/KG.php b/library/Zend/I18n/Validator/PhoneNumber/KG.php
old mode 100755
new mode 100644
index 25820b21d..6f08e5331
--- a/library/Zend/I18n/Validator/PhoneNumber/KG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/KG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/KH.php b/library/Zend/I18n/Validator/PhoneNumber/KH.php
old mode 100755
new mode 100644
index ebd1b0c9e..aba42b4ca
--- a/library/Zend/I18n/Validator/PhoneNumber/KH.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/KH.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/KI.php b/library/Zend/I18n/Validator/PhoneNumber/KI.php
old mode 100755
new mode 100644
index 3b9b43fb5..2fde2e2e9
--- a/library/Zend/I18n/Validator/PhoneNumber/KI.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/KI.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/KM.php b/library/Zend/I18n/Validator/PhoneNumber/KM.php
old mode 100755
new mode 100644
index 97c0af26a..7c2fe27c6
--- a/library/Zend/I18n/Validator/PhoneNumber/KM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/KM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/KN.php b/library/Zend/I18n/Validator/PhoneNumber/KN.php
old mode 100755
new mode 100644
index 6f54c236c..0ca61108c
--- a/library/Zend/I18n/Validator/PhoneNumber/KN.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/KN.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/KP.php b/library/Zend/I18n/Validator/PhoneNumber/KP.php
old mode 100755
new mode 100644
index c005ef8e7..f99646714
--- a/library/Zend/I18n/Validator/PhoneNumber/KP.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/KP.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/KR.php b/library/Zend/I18n/Validator/PhoneNumber/KR.php
old mode 100755
new mode 100644
index 3c3363399..d94c4e0d1
--- a/library/Zend/I18n/Validator/PhoneNumber/KR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/KR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/KW.php b/library/Zend/I18n/Validator/PhoneNumber/KW.php
old mode 100755
new mode 100644
index ad19cafcb..68b8a6f14
--- a/library/Zend/I18n/Validator/PhoneNumber/KW.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/KW.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/KY.php b/library/Zend/I18n/Validator/PhoneNumber/KY.php
old mode 100755
new mode 100644
index ea8b6fe18..1dd837981
--- a/library/Zend/I18n/Validator/PhoneNumber/KY.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/KY.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/KZ.php b/library/Zend/I18n/Validator/PhoneNumber/KZ.php
old mode 100755
new mode 100644
index 0ba5df161..30e98e9d6
--- a/library/Zend/I18n/Validator/PhoneNumber/KZ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/KZ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/LA.php b/library/Zend/I18n/Validator/PhoneNumber/LA.php
old mode 100755
new mode 100644
index 618b55d56..b861bd135
--- a/library/Zend/I18n/Validator/PhoneNumber/LA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/LA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/LB.php b/library/Zend/I18n/Validator/PhoneNumber/LB.php
old mode 100755
new mode 100644
index 52a081997..25c0e803b
--- a/library/Zend/I18n/Validator/PhoneNumber/LB.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/LB.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/LC.php b/library/Zend/I18n/Validator/PhoneNumber/LC.php
old mode 100755
new mode 100644
index 8bd033c64..f943a618d
--- a/library/Zend/I18n/Validator/PhoneNumber/LC.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/LC.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/LI.php b/library/Zend/I18n/Validator/PhoneNumber/LI.php
old mode 100755
new mode 100644
index bf27ab78d..1342dea8d
--- a/library/Zend/I18n/Validator/PhoneNumber/LI.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/LI.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/LK.php b/library/Zend/I18n/Validator/PhoneNumber/LK.php
old mode 100755
new mode 100644
index 739737f55..7f7bfaacc
--- a/library/Zend/I18n/Validator/PhoneNumber/LK.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/LK.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/LR.php b/library/Zend/I18n/Validator/PhoneNumber/LR.php
old mode 100755
new mode 100644
index 6547a6c71..16bc19e3c
--- a/library/Zend/I18n/Validator/PhoneNumber/LR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/LR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/LS.php b/library/Zend/I18n/Validator/PhoneNumber/LS.php
old mode 100755
new mode 100644
index f5073759f..1951870a4
--- a/library/Zend/I18n/Validator/PhoneNumber/LS.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/LS.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/LT.php b/library/Zend/I18n/Validator/PhoneNumber/LT.php
old mode 100755
new mode 100644
index b054f55ef..9f7fca06b
--- a/library/Zend/I18n/Validator/PhoneNumber/LT.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/LT.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/LU.php b/library/Zend/I18n/Validator/PhoneNumber/LU.php
old mode 100755
new mode 100644
index aee8dc9fa..a41eec60a
--- a/library/Zend/I18n/Validator/PhoneNumber/LU.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/LU.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/LV.php b/library/Zend/I18n/Validator/PhoneNumber/LV.php
old mode 100755
new mode 100644
index 9d73e5152..02596f673
--- a/library/Zend/I18n/Validator/PhoneNumber/LV.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/LV.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/LY.php b/library/Zend/I18n/Validator/PhoneNumber/LY.php
old mode 100755
new mode 100644
index 0855a57a3..3afc6a38f
--- a/library/Zend/I18n/Validator/PhoneNumber/LY.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/LY.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MA.php b/library/Zend/I18n/Validator/PhoneNumber/MA.php
old mode 100755
new mode 100644
index 7e887cfab..d1bf3da53
--- a/library/Zend/I18n/Validator/PhoneNumber/MA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MC.php b/library/Zend/I18n/Validator/PhoneNumber/MC.php
old mode 100755
new mode 100644
index c2212dcd7..11f305b15
--- a/library/Zend/I18n/Validator/PhoneNumber/MC.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MC.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MD.php b/library/Zend/I18n/Validator/PhoneNumber/MD.php
old mode 100755
new mode 100644
index 7c490dee6..d1a257bd9
--- a/library/Zend/I18n/Validator/PhoneNumber/MD.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MD.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/ME.php b/library/Zend/I18n/Validator/PhoneNumber/ME.php
old mode 100755
new mode 100644
index fbc80ff77..bae5d5753
--- a/library/Zend/I18n/Validator/PhoneNumber/ME.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/ME.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MF.php b/library/Zend/I18n/Validator/PhoneNumber/MF.php
old mode 100755
new mode 100644
index 55dd233e3..c72d36dba
--- a/library/Zend/I18n/Validator/PhoneNumber/MF.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MF.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MG.php b/library/Zend/I18n/Validator/PhoneNumber/MG.php
old mode 100755
new mode 100644
index 5a26015bb..8b16a3a19
--- a/library/Zend/I18n/Validator/PhoneNumber/MG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MH.php b/library/Zend/I18n/Validator/PhoneNumber/MH.php
old mode 100755
new mode 100644
index b4a462cb5..d42cade31
--- a/library/Zend/I18n/Validator/PhoneNumber/MH.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MH.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MK.php b/library/Zend/I18n/Validator/PhoneNumber/MK.php
old mode 100755
new mode 100644
index 5fe3a4f9c..f3509851f
--- a/library/Zend/I18n/Validator/PhoneNumber/MK.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MK.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/ML.php b/library/Zend/I18n/Validator/PhoneNumber/ML.php
old mode 100755
new mode 100644
index fef638844..36f117296
--- a/library/Zend/I18n/Validator/PhoneNumber/ML.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/ML.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MM.php b/library/Zend/I18n/Validator/PhoneNumber/MM.php
old mode 100755
new mode 100644
index 282bccb11..41182b1b7
--- a/library/Zend/I18n/Validator/PhoneNumber/MM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MN.php b/library/Zend/I18n/Validator/PhoneNumber/MN.php
old mode 100755
new mode 100644
index 33e5258ac..2c947a861
--- a/library/Zend/I18n/Validator/PhoneNumber/MN.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MN.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MO.php b/library/Zend/I18n/Validator/PhoneNumber/MO.php
old mode 100755
new mode 100644
index 1dbd32af8..66a033d96
--- a/library/Zend/I18n/Validator/PhoneNumber/MO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MP.php b/library/Zend/I18n/Validator/PhoneNumber/MP.php
old mode 100755
new mode 100644
index aa93d4560..9125a20a4
--- a/library/Zend/I18n/Validator/PhoneNumber/MP.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MP.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MQ.php b/library/Zend/I18n/Validator/PhoneNumber/MQ.php
old mode 100755
new mode 100644
index 1224eb1d9..873de0702
--- a/library/Zend/I18n/Validator/PhoneNumber/MQ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MQ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MR.php b/library/Zend/I18n/Validator/PhoneNumber/MR.php
old mode 100755
new mode 100644
index 1a8e84c2a..fb1b5294f
--- a/library/Zend/I18n/Validator/PhoneNumber/MR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MS.php b/library/Zend/I18n/Validator/PhoneNumber/MS.php
old mode 100755
new mode 100644
index 1587038d8..ab3bf7c41
--- a/library/Zend/I18n/Validator/PhoneNumber/MS.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MS.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MT.php b/library/Zend/I18n/Validator/PhoneNumber/MT.php
old mode 100755
new mode 100644
index 320a3015d..ced6e51ea
--- a/library/Zend/I18n/Validator/PhoneNumber/MT.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MT.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MU.php b/library/Zend/I18n/Validator/PhoneNumber/MU.php
old mode 100755
new mode 100644
index 1884219db..4fc5cadec
--- a/library/Zend/I18n/Validator/PhoneNumber/MU.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MU.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MV.php b/library/Zend/I18n/Validator/PhoneNumber/MV.php
old mode 100755
new mode 100644
index fd58c0a61..0203235fc
--- a/library/Zend/I18n/Validator/PhoneNumber/MV.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MV.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MW.php b/library/Zend/I18n/Validator/PhoneNumber/MW.php
old mode 100755
new mode 100644
index 193fcec45..ce7afec0c
--- a/library/Zend/I18n/Validator/PhoneNumber/MW.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MW.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MX.php b/library/Zend/I18n/Validator/PhoneNumber/MX.php
old mode 100755
new mode 100644
index fe04bb4b5..30ccaa308
--- a/library/Zend/I18n/Validator/PhoneNumber/MX.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MX.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MY.php b/library/Zend/I18n/Validator/PhoneNumber/MY.php
old mode 100755
new mode 100644
index 09a5cc4c7..4c8a13e7c
--- a/library/Zend/I18n/Validator/PhoneNumber/MY.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MY.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/MZ.php b/library/Zend/I18n/Validator/PhoneNumber/MZ.php
old mode 100755
new mode 100644
index dc3c66d19..7322f5d85
--- a/library/Zend/I18n/Validator/PhoneNumber/MZ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/MZ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NA.php b/library/Zend/I18n/Validator/PhoneNumber/NA.php
old mode 100755
new mode 100644
index ca55c4d85..cf590936a
--- a/library/Zend/I18n/Validator/PhoneNumber/NA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NC.php b/library/Zend/I18n/Validator/PhoneNumber/NC.php
old mode 100755
new mode 100644
index 000d5de25..2f0f9d8fd
--- a/library/Zend/I18n/Validator/PhoneNumber/NC.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NC.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NE.php b/library/Zend/I18n/Validator/PhoneNumber/NE.php
old mode 100755
new mode 100644
index 447ceaf9c..fe593e955
--- a/library/Zend/I18n/Validator/PhoneNumber/NE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NF.php b/library/Zend/I18n/Validator/PhoneNumber/NF.php
old mode 100755
new mode 100644
index 5cc97acbb..9d174161d
--- a/library/Zend/I18n/Validator/PhoneNumber/NF.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NF.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NG.php b/library/Zend/I18n/Validator/PhoneNumber/NG.php
old mode 100755
new mode 100644
index 2e892aff2..30dad5596
--- a/library/Zend/I18n/Validator/PhoneNumber/NG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NI.php b/library/Zend/I18n/Validator/PhoneNumber/NI.php
old mode 100755
new mode 100644
index 4d0ea370c..1a6dc26b3
--- a/library/Zend/I18n/Validator/PhoneNumber/NI.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NI.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NL.php b/library/Zend/I18n/Validator/PhoneNumber/NL.php
old mode 100755
new mode 100644
index 770efefc4..2d1c32a13
--- a/library/Zend/I18n/Validator/PhoneNumber/NL.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NL.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NO.php b/library/Zend/I18n/Validator/PhoneNumber/NO.php
old mode 100755
new mode 100644
index 9a35d2cb6..16e727d38
--- a/library/Zend/I18n/Validator/PhoneNumber/NO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NP.php b/library/Zend/I18n/Validator/PhoneNumber/NP.php
old mode 100755
new mode 100644
index 3e50c534c..167eb5cf2
--- a/library/Zend/I18n/Validator/PhoneNumber/NP.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NP.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NR.php b/library/Zend/I18n/Validator/PhoneNumber/NR.php
old mode 100755
new mode 100644
index 584755f44..20a8f665b
--- a/library/Zend/I18n/Validator/PhoneNumber/NR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NU.php b/library/Zend/I18n/Validator/PhoneNumber/NU.php
old mode 100755
new mode 100644
index d215c2e7e..0f1a7587d
--- a/library/Zend/I18n/Validator/PhoneNumber/NU.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NU.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/NZ.php b/library/Zend/I18n/Validator/PhoneNumber/NZ.php
old mode 100755
new mode 100644
index 35b2dfbf0..d1694483d
--- a/library/Zend/I18n/Validator/PhoneNumber/NZ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/NZ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/OM.php b/library/Zend/I18n/Validator/PhoneNumber/OM.php
old mode 100755
new mode 100644
index 079f91282..67e165245
--- a/library/Zend/I18n/Validator/PhoneNumber/OM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/OM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PA.php b/library/Zend/I18n/Validator/PhoneNumber/PA.php
old mode 100755
new mode 100644
index e12308bb9..23736a5b4
--- a/library/Zend/I18n/Validator/PhoneNumber/PA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PE.php b/library/Zend/I18n/Validator/PhoneNumber/PE.php
old mode 100755
new mode 100644
index 677e9e77a..55952bdc5
--- a/library/Zend/I18n/Validator/PhoneNumber/PE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PF.php b/library/Zend/I18n/Validator/PhoneNumber/PF.php
old mode 100755
new mode 100644
index b145f73ee..16eafa34a
--- a/library/Zend/I18n/Validator/PhoneNumber/PF.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PF.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PG.php b/library/Zend/I18n/Validator/PhoneNumber/PG.php
old mode 100755
new mode 100644
index 9b670bca8..838271329
--- a/library/Zend/I18n/Validator/PhoneNumber/PG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PH.php b/library/Zend/I18n/Validator/PhoneNumber/PH.php
old mode 100755
new mode 100644
index 63c83e677..017f1a8ca
--- a/library/Zend/I18n/Validator/PhoneNumber/PH.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PH.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PK.php b/library/Zend/I18n/Validator/PhoneNumber/PK.php
old mode 100755
new mode 100644
index 8bc537ddc..9f3de733e
--- a/library/Zend/I18n/Validator/PhoneNumber/PK.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PK.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PL.php b/library/Zend/I18n/Validator/PhoneNumber/PL.php
old mode 100755
new mode 100644
index 727adf867..8c6357839
--- a/library/Zend/I18n/Validator/PhoneNumber/PL.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PL.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PM.php b/library/Zend/I18n/Validator/PhoneNumber/PM.php
old mode 100755
new mode 100644
index c47eae2bc..256026510
--- a/library/Zend/I18n/Validator/PhoneNumber/PM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PR.php b/library/Zend/I18n/Validator/PhoneNumber/PR.php
old mode 100755
new mode 100644
index f0cb29d06..c13d9e137
--- a/library/Zend/I18n/Validator/PhoneNumber/PR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PS.php b/library/Zend/I18n/Validator/PhoneNumber/PS.php
old mode 100755
new mode 100644
index 7e98744f6..2897f8202
--- a/library/Zend/I18n/Validator/PhoneNumber/PS.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PS.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PT.php b/library/Zend/I18n/Validator/PhoneNumber/PT.php
old mode 100755
new mode 100644
index 01ca67344..ee18cfb47
--- a/library/Zend/I18n/Validator/PhoneNumber/PT.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PT.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PW.php b/library/Zend/I18n/Validator/PhoneNumber/PW.php
old mode 100755
new mode 100644
index dbb7e2a32..d1fc49871
--- a/library/Zend/I18n/Validator/PhoneNumber/PW.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PW.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/PY.php b/library/Zend/I18n/Validator/PhoneNumber/PY.php
old mode 100755
new mode 100644
index 7fd69d0f7..99aec6192
--- a/library/Zend/I18n/Validator/PhoneNumber/PY.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/PY.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/QA.php b/library/Zend/I18n/Validator/PhoneNumber/QA.php
old mode 100755
new mode 100644
index 3d139c1b7..7ffff430f
--- a/library/Zend/I18n/Validator/PhoneNumber/QA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/QA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/RE.php b/library/Zend/I18n/Validator/PhoneNumber/RE.php
old mode 100755
new mode 100644
index 5281602b3..45022369c
--- a/library/Zend/I18n/Validator/PhoneNumber/RE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/RE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/RO.php b/library/Zend/I18n/Validator/PhoneNumber/RO.php
old mode 100755
new mode 100644
index b51f28fcc..b0fcd0d17
--- a/library/Zend/I18n/Validator/PhoneNumber/RO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/RO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/RS.php b/library/Zend/I18n/Validator/PhoneNumber/RS.php
old mode 100755
new mode 100644
index 35c2eeff9..f37422d25
--- a/library/Zend/I18n/Validator/PhoneNumber/RS.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/RS.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/RU.php b/library/Zend/I18n/Validator/PhoneNumber/RU.php
old mode 100755
new mode 100644
index 6a4e91cae..c90aaf6c7
--- a/library/Zend/I18n/Validator/PhoneNumber/RU.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/RU.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/RW.php b/library/Zend/I18n/Validator/PhoneNumber/RW.php
old mode 100755
new mode 100644
index c75e3e2ac..8dc2b389a
--- a/library/Zend/I18n/Validator/PhoneNumber/RW.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/RW.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SA.php b/library/Zend/I18n/Validator/PhoneNumber/SA.php
old mode 100755
new mode 100644
index 375f84bef..2bc0b9c8e
--- a/library/Zend/I18n/Validator/PhoneNumber/SA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SB.php b/library/Zend/I18n/Validator/PhoneNumber/SB.php
old mode 100755
new mode 100644
index ea1098691..909f49b8a
--- a/library/Zend/I18n/Validator/PhoneNumber/SB.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SB.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SC.php b/library/Zend/I18n/Validator/PhoneNumber/SC.php
old mode 100755
new mode 100644
index 3127bc4c7..7d347da3d
--- a/library/Zend/I18n/Validator/PhoneNumber/SC.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SC.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SD.php b/library/Zend/I18n/Validator/PhoneNumber/SD.php
old mode 100755
new mode 100644
index ac1258093..264e99404
--- a/library/Zend/I18n/Validator/PhoneNumber/SD.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SD.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SE.php b/library/Zend/I18n/Validator/PhoneNumber/SE.php
old mode 100755
new mode 100644
index 1019aa411..b5dc73a9e
--- a/library/Zend/I18n/Validator/PhoneNumber/SE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SG.php b/library/Zend/I18n/Validator/PhoneNumber/SG.php
old mode 100755
new mode 100644
index 8bfd363e1..e729579d1
--- a/library/Zend/I18n/Validator/PhoneNumber/SG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SH.php b/library/Zend/I18n/Validator/PhoneNumber/SH.php
old mode 100755
new mode 100644
index 789f0d807..970c20714
--- a/library/Zend/I18n/Validator/PhoneNumber/SH.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SH.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SI.php b/library/Zend/I18n/Validator/PhoneNumber/SI.php
old mode 100755
new mode 100644
index ff155ebaf..e291c0c6d
--- a/library/Zend/I18n/Validator/PhoneNumber/SI.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SI.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SJ.php b/library/Zend/I18n/Validator/PhoneNumber/SJ.php
old mode 100755
new mode 100644
index 32ebd5ccd..8b298fba7
--- a/library/Zend/I18n/Validator/PhoneNumber/SJ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SJ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SK.php b/library/Zend/I18n/Validator/PhoneNumber/SK.php
old mode 100755
new mode 100644
index 0f5ac7d57..40d6f0ce8
--- a/library/Zend/I18n/Validator/PhoneNumber/SK.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SK.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SL.php b/library/Zend/I18n/Validator/PhoneNumber/SL.php
old mode 100755
new mode 100644
index 021a8c317..7ca542ca9
--- a/library/Zend/I18n/Validator/PhoneNumber/SL.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SL.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SM.php b/library/Zend/I18n/Validator/PhoneNumber/SM.php
old mode 100755
new mode 100644
index 31ecb9a38..372f0b808
--- a/library/Zend/I18n/Validator/PhoneNumber/SM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SN.php b/library/Zend/I18n/Validator/PhoneNumber/SN.php
old mode 100755
new mode 100644
index b1cb398ef..896ce54bc
--- a/library/Zend/I18n/Validator/PhoneNumber/SN.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SN.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SO.php b/library/Zend/I18n/Validator/PhoneNumber/SO.php
old mode 100755
new mode 100644
index a8400a35e..1d442519f
--- a/library/Zend/I18n/Validator/PhoneNumber/SO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SR.php b/library/Zend/I18n/Validator/PhoneNumber/SR.php
old mode 100755
new mode 100644
index 73468fc83..f7f3f13e2
--- a/library/Zend/I18n/Validator/PhoneNumber/SR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SS.php b/library/Zend/I18n/Validator/PhoneNumber/SS.php
old mode 100755
new mode 100644
index e1055dbf8..8e8eb691b
--- a/library/Zend/I18n/Validator/PhoneNumber/SS.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SS.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/ST.php b/library/Zend/I18n/Validator/PhoneNumber/ST.php
old mode 100755
new mode 100644
index e6204120f..332f980f0
--- a/library/Zend/I18n/Validator/PhoneNumber/ST.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/ST.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SV.php b/library/Zend/I18n/Validator/PhoneNumber/SV.php
old mode 100755
new mode 100644
index 2f0e5f18d..9fac35253
--- a/library/Zend/I18n/Validator/PhoneNumber/SV.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SV.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SX.php b/library/Zend/I18n/Validator/PhoneNumber/SX.php
old mode 100755
new mode 100644
index 1a58b86ad..122b7f380
--- a/library/Zend/I18n/Validator/PhoneNumber/SX.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SX.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SY.php b/library/Zend/I18n/Validator/PhoneNumber/SY.php
old mode 100755
new mode 100644
index 2036019cf..cfb7af6f5
--- a/library/Zend/I18n/Validator/PhoneNumber/SY.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SY.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/SZ.php b/library/Zend/I18n/Validator/PhoneNumber/SZ.php
old mode 100755
new mode 100644
index 1200fe57d..2fa267263
--- a/library/Zend/I18n/Validator/PhoneNumber/SZ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/SZ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TC.php b/library/Zend/I18n/Validator/PhoneNumber/TC.php
old mode 100755
new mode 100644
index a111f2e18..3cd78dc1c
--- a/library/Zend/I18n/Validator/PhoneNumber/TC.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TC.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TD.php b/library/Zend/I18n/Validator/PhoneNumber/TD.php
old mode 100755
new mode 100644
index 832f9f835..ffa54afdb
--- a/library/Zend/I18n/Validator/PhoneNumber/TD.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TD.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TG.php b/library/Zend/I18n/Validator/PhoneNumber/TG.php
old mode 100755
new mode 100644
index efbff3a55..ebf28dd79
--- a/library/Zend/I18n/Validator/PhoneNumber/TG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TH.php b/library/Zend/I18n/Validator/PhoneNumber/TH.php
old mode 100755
new mode 100644
index 2b546e314..b3d50d631
--- a/library/Zend/I18n/Validator/PhoneNumber/TH.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TH.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TJ.php b/library/Zend/I18n/Validator/PhoneNumber/TJ.php
old mode 100755
new mode 100644
index 1542a109c..c95bcc50d
--- a/library/Zend/I18n/Validator/PhoneNumber/TJ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TJ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TK.php b/library/Zend/I18n/Validator/PhoneNumber/TK.php
old mode 100755
new mode 100644
index ffbac87c0..93387430f
--- a/library/Zend/I18n/Validator/PhoneNumber/TK.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TK.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TL.php b/library/Zend/I18n/Validator/PhoneNumber/TL.php
old mode 100755
new mode 100644
index b316d81bf..00980a84b
--- a/library/Zend/I18n/Validator/PhoneNumber/TL.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TL.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TM.php b/library/Zend/I18n/Validator/PhoneNumber/TM.php
old mode 100755
new mode 100644
index 94f7f38c6..a57bf6adb
--- a/library/Zend/I18n/Validator/PhoneNumber/TM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TN.php b/library/Zend/I18n/Validator/PhoneNumber/TN.php
old mode 100755
new mode 100644
index a974e155e..858c67637
--- a/library/Zend/I18n/Validator/PhoneNumber/TN.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TN.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TO.php b/library/Zend/I18n/Validator/PhoneNumber/TO.php
old mode 100755
new mode 100644
index 4c76aa718..e60e0c7ca
--- a/library/Zend/I18n/Validator/PhoneNumber/TO.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TO.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TR.php b/library/Zend/I18n/Validator/PhoneNumber/TR.php
old mode 100755
new mode 100644
index d0b4bf799..196a38529
--- a/library/Zend/I18n/Validator/PhoneNumber/TR.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TR.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TT.php b/library/Zend/I18n/Validator/PhoneNumber/TT.php
old mode 100755
new mode 100644
index 663c946eb..6ad19f141
--- a/library/Zend/I18n/Validator/PhoneNumber/TT.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TT.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TV.php b/library/Zend/I18n/Validator/PhoneNumber/TV.php
old mode 100755
new mode 100644
index aa34f107f..153a69813
--- a/library/Zend/I18n/Validator/PhoneNumber/TV.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TV.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TW.php b/library/Zend/I18n/Validator/PhoneNumber/TW.php
old mode 100755
new mode 100644
index 1bdc22827..fa69626f7
--- a/library/Zend/I18n/Validator/PhoneNumber/TW.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TW.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/TZ.php b/library/Zend/I18n/Validator/PhoneNumber/TZ.php
old mode 100755
new mode 100644
index 9f11578c5..d03db84e1
--- a/library/Zend/I18n/Validator/PhoneNumber/TZ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/TZ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/UA.php b/library/Zend/I18n/Validator/PhoneNumber/UA.php
old mode 100755
new mode 100644
index 3c4ea482c..4dc1de69e
--- a/library/Zend/I18n/Validator/PhoneNumber/UA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/UA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/UG.php b/library/Zend/I18n/Validator/PhoneNumber/UG.php
old mode 100755
new mode 100644
index 30ae376af..7780758e6
--- a/library/Zend/I18n/Validator/PhoneNumber/UG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/UG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/US.php b/library/Zend/I18n/Validator/PhoneNumber/US.php
old mode 100755
new mode 100644
index ef0f7b5d2..b4bcbc953
--- a/library/Zend/I18n/Validator/PhoneNumber/US.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/US.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/UY.php b/library/Zend/I18n/Validator/PhoneNumber/UY.php
old mode 100755
new mode 100644
index 991caec3f..1cc5cee54
--- a/library/Zend/I18n/Validator/PhoneNumber/UY.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/UY.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/UZ.php b/library/Zend/I18n/Validator/PhoneNumber/UZ.php
old mode 100755
new mode 100644
index 6e3a5c7df..d4de70639
--- a/library/Zend/I18n/Validator/PhoneNumber/UZ.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/UZ.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/VA.php b/library/Zend/I18n/Validator/PhoneNumber/VA.php
old mode 100755
new mode 100644
index 365826d1f..8811f5c34
--- a/library/Zend/I18n/Validator/PhoneNumber/VA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/VA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/VC.php b/library/Zend/I18n/Validator/PhoneNumber/VC.php
old mode 100755
new mode 100644
index fc911554f..3ff352e22
--- a/library/Zend/I18n/Validator/PhoneNumber/VC.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/VC.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/VE.php b/library/Zend/I18n/Validator/PhoneNumber/VE.php
old mode 100755
new mode 100644
index 6a064f8ac..3a155ef78
--- a/library/Zend/I18n/Validator/PhoneNumber/VE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/VE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/VG.php b/library/Zend/I18n/Validator/PhoneNumber/VG.php
old mode 100755
new mode 100644
index 604e063ad..e5c44aa3d
--- a/library/Zend/I18n/Validator/PhoneNumber/VG.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/VG.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/VI.php b/library/Zend/I18n/Validator/PhoneNumber/VI.php
old mode 100755
new mode 100644
index a1f8010dd..6a23bdb7c
--- a/library/Zend/I18n/Validator/PhoneNumber/VI.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/VI.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/VN.php b/library/Zend/I18n/Validator/PhoneNumber/VN.php
old mode 100755
new mode 100644
index ea46f114e..005770913
--- a/library/Zend/I18n/Validator/PhoneNumber/VN.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/VN.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/VU.php b/library/Zend/I18n/Validator/PhoneNumber/VU.php
old mode 100755
new mode 100644
index 7ba438b8f..9dc42aaaf
--- a/library/Zend/I18n/Validator/PhoneNumber/VU.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/VU.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/WF.php b/library/Zend/I18n/Validator/PhoneNumber/WF.php
old mode 100755
new mode 100644
index 8dd7c1a41..63981b80b
--- a/library/Zend/I18n/Validator/PhoneNumber/WF.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/WF.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/WS.php b/library/Zend/I18n/Validator/PhoneNumber/WS.php
old mode 100755
new mode 100644
index 3d0a9de36..a4ffd0a8a
--- a/library/Zend/I18n/Validator/PhoneNumber/WS.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/WS.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/YE.php b/library/Zend/I18n/Validator/PhoneNumber/YE.php
old mode 100755
new mode 100644
index a09d92f02..6a37c42d0
--- a/library/Zend/I18n/Validator/PhoneNumber/YE.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/YE.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/YT.php b/library/Zend/I18n/Validator/PhoneNumber/YT.php
old mode 100755
new mode 100644
index 416090e9e..43e0bf415
--- a/library/Zend/I18n/Validator/PhoneNumber/YT.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/YT.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/ZA.php b/library/Zend/I18n/Validator/PhoneNumber/ZA.php
old mode 100755
new mode 100644
index e53ffcf3e..be812ec86
--- a/library/Zend/I18n/Validator/PhoneNumber/ZA.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/ZA.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/ZM.php b/library/Zend/I18n/Validator/PhoneNumber/ZM.php
old mode 100755
new mode 100644
index 149d85490..39f951700
--- a/library/Zend/I18n/Validator/PhoneNumber/ZM.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/ZM.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PhoneNumber/ZW.php b/library/Zend/I18n/Validator/PhoneNumber/ZW.php
old mode 100755
new mode 100644
index 6818e7222..332cf55f6
--- a/library/Zend/I18n/Validator/PhoneNumber/ZW.php
+++ b/library/Zend/I18n/Validator/PhoneNumber/ZW.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/Validator/PostCode.php b/library/Zend/I18n/Validator/PostCode.php
old mode 100755
new mode 100644
index a1ab059cb..da532bb86
--- a/library/Zend/I18n/Validator/PostCode.php
+++ b/library/Zend/I18n/Validator/PostCode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php b/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
old mode 100755
new mode 100644
index 87639702b..61b3a32ee
--- a/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
+++ b/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/View/Helper/CurrencyFormat.php b/library/Zend/I18n/View/Helper/CurrencyFormat.php
old mode 100755
new mode 100644
index e2c7d83c2..ddad245d7
--- a/library/Zend/I18n/View/Helper/CurrencyFormat.php
+++ b/library/Zend/I18n/View/Helper/CurrencyFormat.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -81,8 +81,8 @@ class CurrencyFormat extends AbstractHelper
         $number,
         $currencyCode = null,
         $showDecimals = null,
-        $locale       = null,
-        $pattern      = null
+        $locale = null,
+        $pattern = null
     ) {
         if (null === $locale) {
             $locale = $this->getLocale();
@@ -136,9 +136,7 @@ class CurrencyFormat extends AbstractHelper
             $this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 0);
         }
 
-        return $this->formatters[$formatterId]->formatCurrency(
-            $number, $currencyCode
-        );
+        return $this->formatters[$formatterId]->formatCurrency($number, $currencyCode);
     }
 
     /**
@@ -163,7 +161,6 @@ class CurrencyFormat extends AbstractHelper
         return $this->currencyCode;
     }
 
-
     /**
      * Set the currency pattern
      *
diff --git a/library/Zend/I18n/View/Helper/DateFormat.php b/library/Zend/I18n/View/Helper/DateFormat.php
old mode 100755
new mode 100644
index 0323435ba..026cdd9a6
--- a/library/Zend/I18n/View/Helper/DateFormat.php
+++ b/library/Zend/I18n/View/Helper/DateFormat.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -68,8 +68,8 @@ class DateFormat extends AbstractHelper
         $date,
         $dateType = IntlDateFormatter::NONE,
         $timeType = IntlDateFormatter::NONE,
-        $locale   = null,
-        $pattern  = null
+        $locale = null,
+        $pattern = null
     ) {
         if ($locale === null) {
             $locale = $this->getLocale();
diff --git a/library/Zend/I18n/View/Helper/NumberFormat.php b/library/Zend/I18n/View/Helper/NumberFormat.php
old mode 100755
new mode 100644
index eb6301a8a..b944b1ae3
--- a/library/Zend/I18n/View/Helper/NumberFormat.php
+++ b/library/Zend/I18n/View/Helper/NumberFormat.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -80,9 +80,9 @@ class NumberFormat extends AbstractHelper
     public function __invoke(
         $number,
         $formatStyle = null,
-        $formatType  = null,
-        $locale      = null,
-        $decimals    = null
+        $formatType = null,
+        $locale = null,
+        $decimals = null
     ) {
         if (null === $locale) {
             $locale = $this->getLocale();
diff --git a/library/Zend/I18n/View/Helper/Plural.php b/library/Zend/I18n/View/Helper/Plural.php
old mode 100755
new mode 100644
index f550101a6..3bb31ba7e
--- a/library/Zend/I18n/View/Helper/Plural.php
+++ b/library/Zend/I18n/View/Helper/Plural.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/View/Helper/Translate.php b/library/Zend/I18n/View/Helper/Translate.php
old mode 100755
new mode 100644
index 5b7a50834..bfd9d20a8
--- a/library/Zend/I18n/View/Helper/Translate.php
+++ b/library/Zend/I18n/View/Helper/Translate.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/View/Helper/TranslatePlural.php b/library/Zend/I18n/View/Helper/TranslatePlural.php
old mode 100755
new mode 100644
index 9c46853f6..eee3efeae
--- a/library/Zend/I18n/View/Helper/TranslatePlural.php
+++ b/library/Zend/I18n/View/Helper/TranslatePlural.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/View/HelperConfig.php b/library/Zend/I18n/View/HelperConfig.php
old mode 100755
new mode 100644
index e7ac22df2..714b13150
--- a/library/Zend/I18n/View/HelperConfig.php
+++ b/library/Zend/I18n/View/HelperConfig.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/I18n/composer.json b/library/Zend/I18n/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/InputFilter/ArrayInput.php b/library/Zend/InputFilter/ArrayInput.php
old mode 100755
new mode 100644
index 2036c63f2..4d1dc7b43
--- a/library/Zend/InputFilter/ArrayInput.php
+++ b/library/Zend/InputFilter/ArrayInput.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/BaseInputFilter.php b/library/Zend/InputFilter/BaseInputFilter.php
old mode 100755
new mode 100644
index 5dd4320b8..13dd90017
--- a/library/Zend/InputFilter/BaseInputFilter.php
+++ b/library/Zend/InputFilter/BaseInputFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -245,7 +245,7 @@ class BaseInputFilter implements
                 && $input->isRequired()
                 && $input->allowEmpty()
             ) {
-                if (!($input instanceOf EmptyContextInterface && $input->continueIfEmpty())) {
+                if (!($input instanceof EmptyContextInterface && $input->continueIfEmpty())) {
                     $this->validInputs[$name] = $input;
                     continue;
                 }
diff --git a/library/Zend/InputFilter/CONTRIBUTING.md b/library/Zend/InputFilter/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/InputFilter/CollectionInputFilter.php b/library/Zend/InputFilter/CollectionInputFilter.php
old mode 100755
new mode 100644
index 9775d1c1a..1e2f1daeb
--- a/library/Zend/InputFilter/CollectionInputFilter.php
+++ b/library/Zend/InputFilter/CollectionInputFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/EmptyContextInterface.php b/library/Zend/InputFilter/EmptyContextInterface.php
old mode 100755
new mode 100644
index 0a2270d7f..3c1411290
--- a/library/Zend/InputFilter/EmptyContextInterface.php
+++ b/library/Zend/InputFilter/EmptyContextInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/Exception/ExceptionInterface.php b/library/Zend/InputFilter/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index cca907e4c..25dc0f931
--- a/library/Zend/InputFilter/Exception/ExceptionInterface.php
+++ b/library/Zend/InputFilter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/Exception/InvalidArgumentException.php b/library/Zend/InputFilter/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 7677836b4..2be90530c
--- a/library/Zend/InputFilter/Exception/InvalidArgumentException.php
+++ b/library/Zend/InputFilter/Exception/InvalidArgumentException.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\InputFilter\Exception;
 
-class InvalidArgumentException extends \InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/InputFilter/Exception/RuntimeException.php b/library/Zend/InputFilter/Exception/RuntimeException.php
old mode 100755
new mode 100644
index edfdf80f0..b882163de
--- a/library/Zend/InputFilter/Exception/RuntimeException.php
+++ b/library/Zend/InputFilter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/Factory.php b/library/Zend/InputFilter/Factory.php
old mode 100755
new mode 100644
index 8b66af224..ff1796512
--- a/library/Zend/InputFilter/Factory.php
+++ b/library/Zend/InputFilter/Factory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/FileInput.php b/library/Zend/InputFilter/FileInput.php
old mode 100755
new mode 100644
index 41d2e4934..223d7cb90
--- a/library/Zend/InputFilter/FileInput.php
+++ b/library/Zend/InputFilter/FileInput.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/Input.php b/library/Zend/InputFilter/Input.php
old mode 100755
new mode 100644
index a5da2ab2e..a5dae88f0
--- a/library/Zend/InputFilter/Input.php
+++ b/library/Zend/InputFilter/Input.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/InputFilter.php b/library/Zend/InputFilter/InputFilter.php
old mode 100755
new mode 100644
index 29073e912..931316402
--- a/library/Zend/InputFilter/InputFilter.php
+++ b/library/Zend/InputFilter/InputFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/InputFilterAwareInterface.php b/library/Zend/InputFilter/InputFilterAwareInterface.php
old mode 100755
new mode 100644
index bf4f20115..fcbf887e9
--- a/library/Zend/InputFilter/InputFilterAwareInterface.php
+++ b/library/Zend/InputFilter/InputFilterAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/InputFilterAwareTrait.php b/library/Zend/InputFilter/InputFilterAwareTrait.php
old mode 100755
new mode 100644
index cab399e44..a7670f749
--- a/library/Zend/InputFilter/InputFilterAwareTrait.php
+++ b/library/Zend/InputFilter/InputFilterAwareTrait.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\InputFilter;
 
-
 trait InputFilterAwareTrait
 {
     /**
diff --git a/library/Zend/InputFilter/InputFilterInterface.php b/library/Zend/InputFilter/InputFilterInterface.php
old mode 100755
new mode 100644
index 41bbfcfb4..d1df06150
--- a/library/Zend/InputFilter/InputFilterInterface.php
+++ b/library/Zend/InputFilter/InputFilterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/InputFilterPluginManager.php b/library/Zend/InputFilter/InputFilterPluginManager.php
old mode 100755
new mode 100644
index bd1e7dadc..562b7cf7a
--- a/library/Zend/InputFilter/InputFilterPluginManager.php
+++ b/library/Zend/InputFilter/InputFilterPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/InputFilterProviderInterface.php b/library/Zend/InputFilter/InputFilterProviderInterface.php
old mode 100755
new mode 100644
index 3b57cc8be..f6073faf8
--- a/library/Zend/InputFilter/InputFilterProviderInterface.php
+++ b/library/Zend/InputFilter/InputFilterProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/InputInterface.php b/library/Zend/InputFilter/InputInterface.php
old mode 100755
new mode 100644
index 856376542..134b06d81
--- a/library/Zend/InputFilter/InputInterface.php
+++ b/library/Zend/InputFilter/InputInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/InputProviderInterface.php b/library/Zend/InputFilter/InputProviderInterface.php
old mode 100755
new mode 100644
index f5298a195..79aca5652
--- a/library/Zend/InputFilter/InputProviderInterface.php
+++ b/library/Zend/InputFilter/InputProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/README.md b/library/Zend/InputFilter/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/InputFilter/ReplaceableInputInterface.php b/library/Zend/InputFilter/ReplaceableInputInterface.php
old mode 100755
new mode 100644
index ecaf46abb..02e5c0950
--- a/library/Zend/InputFilter/ReplaceableInputInterface.php
+++ b/library/Zend/InputFilter/ReplaceableInputInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/UnknownInputsCapableInterface.php b/library/Zend/InputFilter/UnknownInputsCapableInterface.php
old mode 100755
new mode 100644
index 1890307be..0c34bc738
--- a/library/Zend/InputFilter/UnknownInputsCapableInterface.php
+++ b/library/Zend/InputFilter/UnknownInputsCapableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/InputFilter/composer.json b/library/Zend/InputFilter/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Json/CONTRIBUTING.md b/library/Zend/Json/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Json/Decoder.php b/library/Zend/Json/Decoder.php
old mode 100755
new mode 100644
index e064e6fa1..15937da2f
--- a/library/Zend/Json/Decoder.php
+++ b/library/Zend/Json/Decoder.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -265,7 +265,7 @@ class Decoder
                 throw new RuntimeException('Missing ":" in object encoding: ' . $this->source);
             }
 
-            $tok = $this->_getNextToken();
+            $this->_getNextToken();
             $members[$key] = $this->_decodeValue();
             $tok = $this->token;
 
@@ -334,24 +334,17 @@ class Decoder
         return $result;
     }
 
-
     /**
      * Removes whitespace characters from the source input
      */
     protected function _eatWhitespace()
     {
-        if (preg_match(
-                '/([\t\b\f\n\r ])*/s',
-                $this->source,
-                $matches,
-                PREG_OFFSET_CAPTURE,
-                $this->offset)
+        if (preg_match('/([\t\b\f\n\r ])*/s', $this->source, $matches, PREG_OFFSET_CAPTURE, $this->offset)
             && $matches[0][1] == $this->offset) {
             $this->offset += strlen($matches[0][0]);
         }
     }
 
-
     /**
      * Retrieves the next token from the source stream
      *
@@ -375,8 +368,8 @@ class Decoder
 
         switch ($str{$i}) {
             case '{':
-               $this->token = self::LBRACE;
-               break;
+                $this->token = self::LBRACE;
+                break;
             case '}':
                 $this->token = self::RBRACE;
                 break;
@@ -392,7 +385,7 @@ class Decoder
             case ':':
                 $this->token = self::COLON;
                 break;
-            case  '"':
+            case '"':
                 $result = '';
                 do {
                     $i++;
@@ -409,31 +402,31 @@ class Decoder
                         }
                         $chr = $str{$i};
                         switch ($chr) {
-                            case '"' :
+                            case '"':
                                 $result .= '"';
                                 break;
                             case '\\':
                                 $result .= '\\';
                                 break;
-                            case '/' :
+                            case '/':
                                 $result .= '/';
                                 break;
-                            case 'b' :
+                            case 'b':
                                 $result .= "\x08";
                                 break;
-                            case 'f' :
+                            case 'f':
                                 $result .= "\x0c";
                                 break;
-                            case 'n' :
+                            case 'n':
                                 $result .= "\x0a";
                                 break;
-                            case 'r' :
+                            case 'r':
                                 $result .= "\x0d";
                                 break;
-                            case 't' :
+                            case 't':
                                 $result .= "\x09";
                                 break;
-                            case '\'' :
+                            case '\'':
                                 $result .= '\'';
                                 break;
                             default:
@@ -468,7 +461,7 @@ class Decoder
                 if (($i+ 3) < $strLength && substr($str, $start, 4) == "null") {
                     $this->token = self::DATUM;
                 }
-                $this->tokenValue = NULL;
+                $this->tokenValue = null;
                 $i += 3;
                 break;
         }
@@ -480,8 +473,7 @@ class Decoder
 
         $chr = $str{$i};
         if ($chr == '-' || $chr == '.' || ($chr >= '0' && $chr <= '9')) {
-            if (preg_match('/-?([0-9])*(\.[0-9]*)?((e|E)((-|\+)?)[0-9]+)?/s',
-                $str, $matches, PREG_OFFSET_CAPTURE, $start) && $matches[0][1] == $start) {
+            if (preg_match('/-?([0-9])*(\.[0-9]*)?((e|E)((-|\+)?)[0-9]+)?/s', $str, $matches, PREG_OFFSET_CAPTURE, $start) && $matches[0][1] == $start) {
                 $datum = $matches[0][0];
 
                 if (is_numeric($datum)) {
diff --git a/library/Zend/Json/Encoder.php b/library/Zend/Json/Encoder.php
old mode 100755
new mode 100644
index 0d8d35527..82929e44c
--- a/library/Zend/Json/Encoder.php
+++ b/library/Zend/Json/Encoder.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -95,7 +95,6 @@ class Encoder
         return $this->_encodeDatum($value);
     }
 
-
     /**
      * Encode an object to JSON by encoding each of the public properties
      *
@@ -129,7 +128,7 @@ class Encoder
         $props = '';
 
         if (method_exists($value, 'toJson')) {
-            $props =',' . preg_replace("/^\{(.*)\}$/","\\1", $value->toJson());
+            $props = ',' . preg_replace("/^\{(.*)\}$/", "\\1", $value->toJson());
         } else {
             if ($value instanceof IteratorAggregate) {
                 $propCollection = $value->getIterator();
@@ -155,7 +154,6 @@ class Encoder
             . $props . '}';
     }
 
-
     /**
      * Determine if an object has been serialized already
      *
@@ -171,7 +169,6 @@ class Encoder
         return false;
     }
 
-
     /**
      * JSON encode an array value
      *
@@ -215,7 +212,6 @@ class Encoder
         return $result;
     }
 
-
     /**
      * JSON encode a basic data type (string, number, boolean, null)
      *
@@ -241,7 +237,6 @@ class Encoder
         return $result;
     }
 
-
     /**
      * JSON encode a string value by escaping characters as necessary
      *
@@ -265,7 +260,6 @@ class Encoder
         return '"' . $string . '"';
     }
 
-
     /**
      * Encode the constants associated with the ReflectionClass
      * parameter. The encoding format is based on the class2 format
@@ -290,7 +284,6 @@ class Encoder
         return $result . "}";
     }
 
-
     /**
      * Encode the public methods of the ReflectionClass in the
      * class2 format
@@ -353,7 +346,6 @@ class Encoder
         return $result . "}";
     }
 
-
     /**
      * Encode the public properties of the ReflectionClass in the class2
      * format.
@@ -367,7 +359,6 @@ class Encoder
         $properties = $cls->getProperties();
         $propValues = get_class_vars($cls->getName());
         $result = "variables:{";
-        $cnt = 0;
 
         $tmpArray = array();
         foreach ($properties as $prop) {
@@ -410,7 +401,6 @@ class Encoder
                 . self::_encodeVariables($cls)    .'});';
     }
 
-
     /**
      * Encode several classes at once
      *
@@ -471,9 +461,12 @@ class Encoder
                 case (($ordVarC & 0xF0) == 0xE0):
                     // characters U-00000800 - U-0000FFFF, mask 1110XXXX
                     // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $char = pack('C*', $ordVarC,
-                                 ord($value[$i + 1]),
-                                 ord($value[$i + 2]));
+                    $char = pack(
+                        'C*',
+                        $ordVarC,
+                        ord($value[$i + 1]),
+                        ord($value[$i + 2])
+                    );
                     $i += 2;
                     $utf16 = self::_utf82utf16($char);
                     $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -482,10 +475,13 @@ class Encoder
                 case (($ordVarC & 0xF8) == 0xF0):
                     // characters U-00010000 - U-001FFFFF, mask 11110XXX
                     // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $char = pack('C*', $ordVarC,
-                                 ord($value[$i + 1]),
-                                 ord($value[$i + 2]),
-                                 ord($value[$i + 3]));
+                    $char = pack(
+                        'C*',
+                        $ordVarC,
+                        ord($value[$i + 1]),
+                        ord($value[$i + 2]),
+                        ord($value[$i + 3])
+                    );
                     $i += 3;
                     $utf16 = self::_utf82utf16($char);
                     $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -494,11 +490,14 @@ class Encoder
                 case (($ordVarC & 0xFC) == 0xF8):
                     // characters U-00200000 - U-03FFFFFF, mask 111110XX
                     // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $char = pack('C*', $ordVarC,
-                                 ord($value[$i + 1]),
-                                 ord($value[$i + 2]),
-                                 ord($value[$i + 3]),
-                                 ord($value[$i + 4]));
+                    $char = pack(
+                        'C*',
+                        $ordVarC,
+                        ord($value[$i + 1]),
+                        ord($value[$i + 2]),
+                        ord($value[$i + 3]),
+                        ord($value[$i + 4])
+                    );
                     $i += 4;
                     $utf16 = self::_utf82utf16($char);
                     $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -507,12 +506,15 @@ class Encoder
                 case (($ordVarC & 0xFE) == 0xFC):
                     // characters U-04000000 - U-7FFFFFFF, mask 1111110X
                     // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                    $char = pack('C*', $ordVarC,
-                                 ord($value[$i + 1]),
-                                 ord($value[$i + 2]),
-                                 ord($value[$i + 3]),
-                                 ord($value[$i + 4]),
-                                 ord($value[$i + 5]));
+                    $char = pack(
+                        'C*',
+                        $ordVarC,
+                        ord($value[$i + 1]),
+                        ord($value[$i + 2]),
+                        ord($value[$i + 3]),
+                        ord($value[$i + 4]),
+                        ord($value[$i + 5])
+                    );
                     $i += 5;
                     $utf16 = self::_utf82utf16($char);
                     $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -552,17 +554,12 @@ class Encoder
             case 2:
                 // return a UTF-16 character from a 2-byte UTF-8 char
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
+                return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
 
             case 3:
                 // return a UTF-16 character from a 3-byte UTF-8 char
                 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
+                return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
         }
 
         // ignoring UTF-32 for now, sorry
diff --git a/library/Zend/Json/Exception/BadMethodCallException.php b/library/Zend/Json/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 6f2ace0d3..ef32d84d7
--- a/library/Zend/Json/Exception/BadMethodCallException.php
+++ b/library/Zend/Json/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Exception/ExceptionInterface.php b/library/Zend/Json/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index e087d9b25..2e5ee94f5
--- a/library/Zend/Json/Exception/ExceptionInterface.php
+++ b/library/Zend/Json/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Exception/InvalidArgumentException.php b/library/Zend/Json/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index e7e8b5aeb..3863261dc
--- a/library/Zend/Json/Exception/InvalidArgumentException.php
+++ b/library/Zend/Json/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Exception/RecursionException.php b/library/Zend/Json/Exception/RecursionException.php
old mode 100755
new mode 100644
index c40ec5715..e6fd545b6
--- a/library/Zend/Json/Exception/RecursionException.php
+++ b/library/Zend/Json/Exception/RecursionException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Exception/RuntimeException.php b/library/Zend/Json/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 653814975..a74268ee0
--- a/library/Zend/Json/Exception/RuntimeException.php
+++ b/library/Zend/Json/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Expr.php b/library/Zend/Json/Expr.php
old mode 100755
new mode 100644
index c112de7fc..683127c36
--- a/library/Zend/Json/Expr.php
+++ b/library/Zend/Json/Expr.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Json.php b/library/Zend/Json/Json.php
old mode 100755
new mode 100644
index ec74d1994..41512460a
--- a/library/Zend/Json/Json.php
+++ b/library/Zend/Json/Json.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -160,7 +160,9 @@ class Json
      * @return mixed
      */
     protected static function _recursiveJsonExprFinder(
-        &$value, array &$javascriptExpressions, $currentKey = null
+        &$value,
+        array &$javascriptExpressions,
+        $currentKey = null
     ) {
         if ($value instanceof Expr) {
             // TODO: Optimize with ascii keys, if performance is bad
diff --git a/library/Zend/Json/README.md b/library/Zend/Json/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Json/Server/Cache.php b/library/Zend/Json/Server/Cache.php
old mode 100755
new mode 100644
index 720c2d326..7f86331ad
--- a/library/Zend/Json/Server/Cache.php
+++ b/library/Zend/Json/Server/Cache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Client.php b/library/Zend/Json/Server/Client.php
old mode 100755
new mode 100644
index 2b35be0e8..174cdc7b1
--- a/library/Zend/Json/Server/Client.php
+++ b/library/Zend/Json/Server/Client.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Error.php b/library/Zend/Json/Server/Error.php
old mode 100755
new mode 100644
index 34a7e53da..ed1bbca77
--- a/library/Zend/Json/Server/Error.php
+++ b/library/Zend/Json/Server/Error.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Exception/ErrorException.php b/library/Zend/Json/Server/Exception/ErrorException.php
old mode 100755
new mode 100644
index 39bb6c74d..d6676d42d
--- a/library/Zend/Json/Server/Exception/ErrorException.php
+++ b/library/Zend/Json/Server/Exception/ErrorException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Exception/ExceptionInterface.php b/library/Zend/Json/Server/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index b8e777e5d..5efc62e84
--- a/library/Zend/Json/Server/Exception/ExceptionInterface.php
+++ b/library/Zend/Json/Server/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Exception/HttpException.php b/library/Zend/Json/Server/Exception/HttpException.php
old mode 100755
new mode 100644
index 193c51c89..2b794dbf6
--- a/library/Zend/Json/Server/Exception/HttpException.php
+++ b/library/Zend/Json/Server/Exception/HttpException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Exception/InvalidArgumentException.php b/library/Zend/Json/Server/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 3ccd8fd42..199eb1eef
--- a/library/Zend/Json/Server/Exception/InvalidArgumentException.php
+++ b/library/Zend/Json/Server/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Exception/RuntimeException.php b/library/Zend/Json/Server/Exception/RuntimeException.php
old mode 100755
new mode 100644
index d3ed46510..68ded9279
--- a/library/Zend/Json/Server/Exception/RuntimeException.php
+++ b/library/Zend/Json/Server/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Request.php b/library/Zend/Json/Server/Request.php
old mode 100755
new mode 100644
index e9d31ec5c..cb57e4f49
--- a/library/Zend/Json/Server/Request.php
+++ b/library/Zend/Json/Server/Request.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Request/Http.php b/library/Zend/Json/Server/Request/Http.php
old mode 100755
new mode 100644
index 1cc43efb0..b1b864d56
--- a/library/Zend/Json/Server/Request/Http.php
+++ b/library/Zend/Json/Server/Request/Http.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Response.php b/library/Zend/Json/Server/Response.php
old mode 100755
new mode 100644
index 074f39a16..c53cac96d
--- a/library/Zend/Json/Server/Response.php
+++ b/library/Zend/Json/Server/Response.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Response/Http.php b/library/Zend/Json/Server/Response/Http.php
old mode 100755
new mode 100644
index 71b2d1a02..de21723f6
--- a/library/Zend/Json/Server/Response/Http.php
+++ b/library/Zend/Json/Server/Response/Http.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Server.php b/library/Zend/Json/Server/Server.php
old mode 100755
new mode 100644
index cef0ef718..c5076e622
--- a/library/Zend/Json/Server/Server.php
+++ b/library/Zend/Json/Server/Server.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Smd.php b/library/Zend/Json/Server/Smd.php
old mode 100755
new mode 100644
index c04c44064..5abd8ac68
--- a/library/Zend/Json/Server/Smd.php
+++ b/library/Zend/Json/Server/Smd.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/Server/Smd/Service.php b/library/Zend/Json/Server/Smd/Service.php
old mode 100755
new mode 100644
index fa78393c4..bea17c21c
--- a/library/Zend/Json/Server/Smd/Service.php
+++ b/library/Zend/Json/Server/Smd/Service.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Json/composer.json b/library/Zend/Json/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Ldap/Attribute.php b/library/Zend/Ldap/Attribute.php
old mode 100755
new mode 100644
index e49b628a4..9ff7e8dfc
--- a/library/Zend/Ldap/Attribute.php
+++ b/library/Zend/Ldap/Attribute.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/CONTRIBUTING.md b/library/Zend/Ldap/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Ldap/Collection.php b/library/Zend/Ldap/Collection.php
old mode 100755
new mode 100644
index a460d2693..2e7f30888
--- a/library/Zend/Ldap/Collection.php
+++ b/library/Zend/Ldap/Collection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Collection/DefaultIterator.php b/library/Zend/Ldap/Collection/DefaultIterator.php
old mode 100755
new mode 100644
index 1a30db54b..5876f390c
--- a/library/Zend/Ldap/Collection/DefaultIterator.php
+++ b/library/Zend/Ldap/Collection/DefaultIterator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Converter/Converter.php b/library/Zend/Ldap/Converter/Converter.php
old mode 100755
new mode 100644
index 8932343b0..4347ba28c
--- a/library/Zend/Ldap/Converter/Converter.php
+++ b/library/Zend/Ldap/Converter/Converter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -66,7 +66,6 @@ class Converter
         return $string;
     }
 
-
     /**
      * Convert any value to an LDAP-compatible value.
      *
diff --git a/library/Zend/Ldap/Converter/Exception/ConverterException.php b/library/Zend/Ldap/Converter/Exception/ConverterException.php
old mode 100755
new mode 100644
index eae8f5dfe..6226da94a
--- a/library/Zend/Ldap/Converter/Exception/ConverterException.php
+++ b/library/Zend/Ldap/Converter/Exception/ConverterException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php b/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 39d9cdff7..a15874747
--- a/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php
+++ b/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php b/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index f54cc47df..a1cd35600
--- a/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php b/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index 9a13f4515..78456f49d
--- a/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php
+++ b/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Dn.php b/library/Zend/Ldap/Dn.php
old mode 100755
new mode 100644
index 0ca0721fb..0809a15ce
--- a/library/Zend/Ldap/Dn.php
+++ b/library/Zend/Ldap/Dn.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Exception/BadMethodCallException.php b/library/Zend/Ldap/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index c028787f6..74ac7243b
--- a/library/Zend/Ldap/Exception/BadMethodCallException.php
+++ b/library/Zend/Ldap/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Exception/ExceptionInterface.php b/library/Zend/Ldap/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 8d5ed4b43..9c03b13ef
--- a/library/Zend/Ldap/Exception/ExceptionInterface.php
+++ b/library/Zend/Ldap/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Exception/InvalidArgumentException.php b/library/Zend/Ldap/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index e1b7f3063..cf8e371ad
--- a/library/Zend/Ldap/Exception/InvalidArgumentException.php
+++ b/library/Zend/Ldap/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Exception/LdapException.php b/library/Zend/Ldap/Exception/LdapException.php
old mode 100755
new mode 100644
index 848007953..48838bdc1
--- a/library/Zend/Ldap/Exception/LdapException.php
+++ b/library/Zend/Ldap/Exception/LdapException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Filter.php b/library/Zend/Ldap/Filter.php
old mode 100755
new mode 100644
index ac79bd49b..98c674467
--- a/library/Zend/Ldap/Filter.php
+++ b/library/Zend/Ldap/Filter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Filter/AbstractFilter.php b/library/Zend/Ldap/Filter/AbstractFilter.php
old mode 100755
new mode 100644
index 89f063e01..5a079c870
--- a/library/Zend/Ldap/Filter/AbstractFilter.php
+++ b/library/Zend/Ldap/Filter/AbstractFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Filter/AbstractLogicalFilter.php b/library/Zend/Ldap/Filter/AbstractLogicalFilter.php
old mode 100755
new mode 100644
index f04cd641b..b83200d90
--- a/library/Zend/Ldap/Filter/AbstractLogicalFilter.php
+++ b/library/Zend/Ldap/Filter/AbstractLogicalFilter.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Ldap\Filter;
 
-
 /**
  * Zend\Ldap\Filter\AbstractLogicalFilter provides a base implementation for a grouping filter.
  */
diff --git a/library/Zend/Ldap/Filter/AndFilter.php b/library/Zend/Ldap/Filter/AndFilter.php
old mode 100755
new mode 100644
index beeb4ce21..af8593957
--- a/library/Zend/Ldap/Filter/AndFilter.php
+++ b/library/Zend/Ldap/Filter/AndFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php b/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index f5ff231ff..42413306a
--- a/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php
+++ b/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Filter/Exception/FilterException.php b/library/Zend/Ldap/Filter/Exception/FilterException.php
old mode 100755
new mode 100644
index 0ed114218..81398e5e3
--- a/library/Zend/Ldap/Filter/Exception/FilterException.php
+++ b/library/Zend/Ldap/Filter/Exception/FilterException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Filter/MaskFilter.php b/library/Zend/Ldap/Filter/MaskFilter.php
old mode 100755
new mode 100644
index 89b5059c5..64566ab87
--- a/library/Zend/Ldap/Filter/MaskFilter.php
+++ b/library/Zend/Ldap/Filter/MaskFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Filter/NotFilter.php b/library/Zend/Ldap/Filter/NotFilter.php
old mode 100755
new mode 100644
index b2a236018..775933745
--- a/library/Zend/Ldap/Filter/NotFilter.php
+++ b/library/Zend/Ldap/Filter/NotFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Filter/OrFilter.php b/library/Zend/Ldap/Filter/OrFilter.php
old mode 100755
new mode 100644
index 215a51f47..d7727815b
--- a/library/Zend/Ldap/Filter/OrFilter.php
+++ b/library/Zend/Ldap/Filter/OrFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Filter/StringFilter.php b/library/Zend/Ldap/Filter/StringFilter.php
old mode 100755
new mode 100644
index 9f98cf8eb..3d6bbcd64
--- a/library/Zend/Ldap/Filter/StringFilter.php
+++ b/library/Zend/Ldap/Filter/StringFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Ldap.php b/library/Zend/Ldap/Ldap.php
old mode 100755
new mode 100644
index e935481ae..f4d036fc0
--- a/library/Zend/Ldap/Ldap.php
+++ b/library/Zend/Ldap/Ldap.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Ldif/Encoder.php b/library/Zend/Ldap/Ldif/Encoder.php
old mode 100755
new mode 100644
index 02fa92b2c..6e2184eeb
--- a/library/Zend/Ldap/Ldif/Encoder.php
+++ b/library/Zend/Ldap/Ldif/Encoder.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node.php b/library/Zend/Ldap/Node.php
old mode 100755
new mode 100644
index 01e9dc829..1cd3920e6
--- a/library/Zend/Ldap/Node.php
+++ b/library/Zend/Ldap/Node.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/AbstractNode.php b/library/Zend/Ldap/Node/AbstractNode.php
old mode 100755
new mode 100644
index 5e14c97ff..322c89b06
--- a/library/Zend/Ldap/Node/AbstractNode.php
+++ b/library/Zend/Ldap/Node/AbstractNode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/ChildrenIterator.php b/library/Zend/Ldap/Node/ChildrenIterator.php
old mode 100755
new mode 100644
index 1b6a361db..7c4eaa407
--- a/library/Zend/Ldap/Node/ChildrenIterator.php
+++ b/library/Zend/Ldap/Node/ChildrenIterator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/Collection.php b/library/Zend/Ldap/Node/Collection.php
old mode 100755
new mode 100644
index 5185a636c..42f1712a3
--- a/library/Zend/Ldap/Node/Collection.php
+++ b/library/Zend/Ldap/Node/Collection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/RootDse.php b/library/Zend/Ldap/Node/RootDse.php
old mode 100755
new mode 100644
index 213df1ddb..255f28783
--- a/library/Zend/Ldap/Node/RootDse.php
+++ b/library/Zend/Ldap/Node/RootDse.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php b/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
old mode 100755
new mode 100644
index b786b09e3..52d13f810
--- a/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
+++ b/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/RootDse/OpenLdap.php b/library/Zend/Ldap/Node/RootDse/OpenLdap.php
old mode 100755
new mode 100644
index 2c765fc6b..67128817b
--- a/library/Zend/Ldap/Node/RootDse/OpenLdap.php
+++ b/library/Zend/Ldap/Node/RootDse/OpenLdap.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/RootDse/eDirectory.php b/library/Zend/Ldap/Node/RootDse/eDirectory.php
old mode 100755
new mode 100644
index eb96ac2b4..9855f7813
--- a/library/Zend/Ldap/Node/RootDse/eDirectory.php
+++ b/library/Zend/Ldap/Node/RootDse/eDirectory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/Schema.php b/library/Zend/Ldap/Node/Schema.php
old mode 100755
new mode 100644
index 20d2b0cc2..329432243
--- a/library/Zend/Ldap/Node/Schema.php
+++ b/library/Zend/Ldap/Node/Schema.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/Schema/AbstractItem.php b/library/Zend/Ldap/Node/Schema/AbstractItem.php
old mode 100755
new mode 100644
index 5f5e16484..635a146a1
--- a/library/Zend/Ldap/Node/Schema/AbstractItem.php
+++ b/library/Zend/Ldap/Node/Schema/AbstractItem.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/Schema/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
old mode 100755
new mode 100644
index 946ab5135..a3a4ab8a8
--- a/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
+++ b/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
old mode 100755
new mode 100644
index 859adcce3..770a97821
--- a/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
+++ b/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php b/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php
old mode 100755
new mode 100644
index 83ad8f2f0..6bc49164b
--- a/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php
+++ b/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php b/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
old mode 100755
new mode 100644
index d71924b14..78226cda0
--- a/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
+++ b/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
old mode 100755
new mode 100644
index 6327942f9..95e0dcc05
--- a/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
+++ b/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php b/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
old mode 100755
new mode 100644
index 0a317f265..fd5e08a25
--- a/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
+++ b/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php b/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
old mode 100755
new mode 100644
index 0f5a88efc..a39f3d364
--- a/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
+++ b/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -31,7 +31,6 @@ class OpenLdap extends Schema\AbstractItem implements ObjectClassInterface
      */
     protected $inheritedMay = null;
 
-
     /**
      * Gets the objectClass name
      *
diff --git a/library/Zend/Ldap/Node/Schema/OpenLdap.php b/library/Zend/Ldap/Node/Schema/OpenLdap.php
old mode 100755
new mode 100644
index a22fdcf08..6fc2b8108
--- a/library/Zend/Ldap/Node/Schema/OpenLdap.php
+++ b/library/Zend/Ldap/Node/Schema/OpenLdap.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Ldap/README.md b/library/Zend/Ldap/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Ldap/composer.json b/library/Zend/Ldap/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Loader/AutoloaderFactory.php b/library/Zend/Loader/AutoloaderFactory.php
old mode 100755
new mode 100644
index be282072a..bd456c58a
--- a/library/Zend/Loader/AutoloaderFactory.php
+++ b/library/Zend/Loader/AutoloaderFactory.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Loader;
 
-use ReflectionClass;
 use Traversable;
 
 if (class_exists('Zend\Loader\AutoloaderFactory')) {
@@ -87,7 +86,7 @@ abstract class AutoloaderFactory
                     );
                 }
 
-                if (!static::isSubclassOf($class, 'Zend\Loader\SplAutoloader')) {
+                if (!is_subclass_of($class, 'Zend\Loader\SplAutoloader')) {
                     require_once 'Exception/InvalidArgumentException.php';
                     throw new Exception\InvalidArgumentException(
                         sprintf('Autoloader class %s must implement Zend\\Loader\\SplAutoloader', $class)
@@ -186,7 +185,7 @@ abstract class AutoloaderFactory
         if (!class_exists(static::STANDARD_AUTOLOADER)) {
             // Extract the filename from the classname
             $stdAutoloader = substr(strrchr(static::STANDARD_AUTOLOADER, '\\'), 1);
-            require_once __DIR__ . "/$stdAutoloader.php";
+            require_once __DIR__ . "/AutoloaderFactory.php";
         }
         $loader = new StandardAutoloader();
         static::$standardAutoloader = $loader;
@@ -199,22 +198,14 @@ abstract class AutoloaderFactory
      * @see https://bugs.php.net/bug.php?id=53727
      * @see https://github.com/zendframework/zf2/pull/1807
      *
+     * @deprecated since zf 2.3 requires PHP >= 5.3.23
+     *
      * @param  string $className
      * @param  string $type
      * @return bool
      */
     protected static function isSubclassOf($className, $type)
     {
-        if (is_subclass_of($className, $type)) {
-            return true;
-        }
-        if (PHP_VERSION_ID >= 50307) {
-            return false;
-        }
-        if (!interface_exists($type)) {
-            return false;
-        }
-        $r = new ReflectionClass($className);
-        return $r->implementsInterface($type);
+        return is_subclass_of($className, $type);
     }
 }
diff --git a/library/Zend/Loader/CONTRIBUTING.md b/library/Zend/Loader/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Loader/ClassMapAutoloader.php b/library/Zend/Loader/ClassMapAutoloader.php
old mode 100755
new mode 100644
index 58b6378db..4d848bf3f
--- a/library/Zend/Loader/ClassMapAutoloader.php
+++ b/library/Zend/Loader/ClassMapAutoloader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -197,7 +197,7 @@ class ClassMapAutoloader implements SplAutoloader
      */
     public static function realPharPath($path)
     {
-        if (!preg_match('|^phar:(/{2,3})|',$path, $match)) {
+        if (!preg_match('|^phar:(/{2,3})|', $path, $match)) {
             return;
         }
 
diff --git a/library/Zend/Loader/Exception/BadMethodCallException.php b/library/Zend/Loader/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 3ae448817..9d9391155
--- a/library/Zend/Loader/Exception/BadMethodCallException.php
+++ b/library/Zend/Loader/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/Exception/DomainException.php b/library/Zend/Loader/Exception/DomainException.php
old mode 100755
new mode 100644
index 4f888e84a..338355711
--- a/library/Zend/Loader/Exception/DomainException.php
+++ b/library/Zend/Loader/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/Exception/ExceptionInterface.php b/library/Zend/Loader/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 5c68d37f3..5c6218269
--- a/library/Zend/Loader/Exception/ExceptionInterface.php
+++ b/library/Zend/Loader/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/Exception/InvalidArgumentException.php b/library/Zend/Loader/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 5018380c5..beb5c0876
--- a/library/Zend/Loader/Exception/InvalidArgumentException.php
+++ b/library/Zend/Loader/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,7 +11,6 @@ namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-class InvalidArgumentException extends \InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Loader/Exception/InvalidPathException.php b/library/Zend/Loader/Exception/InvalidPathException.php
old mode 100755
new mode 100644
index dcbbcc0a3..3c93cec49
--- a/library/Zend/Loader/Exception/InvalidPathException.php
+++ b/library/Zend/Loader/Exception/InvalidPathException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/Exception/MissingResourceNamespaceException.php b/library/Zend/Loader/Exception/MissingResourceNamespaceException.php
old mode 100755
new mode 100644
index 58cda79c4..bef0a2957
--- a/library/Zend/Loader/Exception/MissingResourceNamespaceException.php
+++ b/library/Zend/Loader/Exception/MissingResourceNamespaceException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,7 +11,6 @@ namespace Zend\Loader\Exception;
 
 require_once __DIR__ . '/ExceptionInterface.php';
 
-class MissingResourceNamespaceException extends \Exception implements
-    ExceptionInterface
+class MissingResourceNamespaceException extends \Exception implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Loader/Exception/PluginLoaderException.php b/library/Zend/Loader/Exception/PluginLoaderException.php
old mode 100755
new mode 100644
index 49f393a7c..e7603f73e
--- a/library/Zend/Loader/Exception/PluginLoaderException.php
+++ b/library/Zend/Loader/Exception/PluginLoaderException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/Exception/RuntimeException.php b/library/Zend/Loader/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 2bb4e1bc2..6476cad0e
--- a/library/Zend/Loader/Exception/RuntimeException.php
+++ b/library/Zend/Loader/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/Exception/SecurityException.php b/library/Zend/Loader/Exception/SecurityException.php
old mode 100755
new mode 100644
index dbbaecbd6..7ea1ad46a
--- a/library/Zend/Loader/Exception/SecurityException.php
+++ b/library/Zend/Loader/Exception/SecurityException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/ModuleAutoloader.php b/library/Zend/Loader/ModuleAutoloader.php
old mode 100755
new mode 100644
index 2aa6938ba..773f3dc7a
--- a/library/Zend/Loader/ModuleAutoloader.php
+++ b/library/Zend/Loader/ModuleAutoloader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -159,7 +159,7 @@ class ModuleAutoloader implements SplAutoloader
                     continue;
                 }
 
-                $moduleNameBuffer = str_replace($namespace . "\\", "", $moduleName );
+                $moduleNameBuffer = str_replace($namespace . "\\", "", $moduleName);
                 $path .= DIRECTORY_SEPARATOR . $moduleNameBuffer . DIRECTORY_SEPARATOR;
 
                 $classLoaded = $this->loadModuleFromDir($path, $class);
@@ -174,7 +174,6 @@ class ModuleAutoloader implements SplAutoloader
             }
         }
 
-
         $moduleClassPath   = str_replace('\\', DIRECTORY_SEPARATOR, $moduleName);
 
         $pharSuffixPattern = null;
@@ -369,7 +368,7 @@ class ModuleAutoloader implements SplAutoloader
             ));
         }
         if ($moduleName) {
-            if (in_array( substr($moduleName, -2), array('\\*', '\\%'))) {
+            if (in_array(substr($moduleName, -2), array('\\*', '\\%'))) {
                 $this->namespacedPaths[substr($moduleName, 0, -2)] = static::normalizePath($path);
             } else {
                 $this->explicitPaths[$moduleName] = static::normalizePath($path);
diff --git a/library/Zend/Loader/PluginClassLoader.php b/library/Zend/Loader/PluginClassLoader.php
old mode 100755
new mode 100644
index 637014444..0fbf2111f
--- a/library/Zend/Loader/PluginClassLoader.php
+++ b/library/Zend/Loader/PluginClassLoader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/PluginClassLocator.php b/library/Zend/Loader/PluginClassLocator.php
old mode 100755
new mode 100644
index e141586c0..91ed0dde1
--- a/library/Zend/Loader/PluginClassLocator.php
+++ b/library/Zend/Loader/PluginClassLocator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/README.md b/library/Zend/Loader/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Loader/ShortNameLocator.php b/library/Zend/Loader/ShortNameLocator.php
old mode 100755
new mode 100644
index f0ee23c7b..dfa020c7d
--- a/library/Zend/Loader/ShortNameLocator.php
+++ b/library/Zend/Loader/ShortNameLocator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/SplAutoloader.php b/library/Zend/Loader/SplAutoloader.php
old mode 100755
new mode 100644
index 87cfebd2e..47d6b6c5f
--- a/library/Zend/Loader/SplAutoloader.php
+++ b/library/Zend/Loader/SplAutoloader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/StandardAutoloader.php b/library/Zend/Loader/StandardAutoloader.php
old mode 100755
new mode 100644
index cddcf26e8..6e00908e5
--- a/library/Zend/Loader/StandardAutoloader.php
+++ b/library/Zend/Loader/StandardAutoloader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Loader/composer.json b/library/Zend/Loader/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Log/CONTRIBUTING.md b/library/Zend/Log/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Log/Exception/ExceptionInterface.php b/library/Zend/Log/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index fe163f81f..39bf0b1c6
--- a/library/Zend/Log/Exception/ExceptionInterface.php
+++ b/library/Zend/Log/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Exception/InvalidArgumentException.php b/library/Zend/Log/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index cd34a99e9..ba0be8f3c
--- a/library/Zend/Log/Exception/InvalidArgumentException.php
+++ b/library/Zend/Log/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -12,8 +12,6 @@ namespace Zend\Log\Exception;
 /**
  * Invalid argument exception
  */
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Log/Exception/RuntimeException.php b/library/Zend/Log/Exception/RuntimeException.php
old mode 100755
new mode 100644
index b339c6df8..85493afcc
--- a/library/Zend/Log/Exception/RuntimeException.php
+++ b/library/Zend/Log/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -12,8 +12,6 @@ namespace Zend\Log\Exception;
 /**
  * Runtime argument exception
  */
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Log/Filter/FilterInterface.php b/library/Zend/Log/Filter/FilterInterface.php
old mode 100755
new mode 100644
index dc72777d6..561550edc
--- a/library/Zend/Log/Filter/FilterInterface.php
+++ b/library/Zend/Log/Filter/FilterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Filter/Mock.php b/library/Zend/Log/Filter/Mock.php
old mode 100755
new mode 100644
index f35c62313..5e6f5b1c9
--- a/library/Zend/Log/Filter/Mock.php
+++ b/library/Zend/Log/Filter/Mock.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Filter/Priority.php b/library/Zend/Log/Filter/Priority.php
old mode 100755
new mode 100644
index 01f00dae4..7df5586eb
--- a/library/Zend/Log/Filter/Priority.php
+++ b/library/Zend/Log/Filter/Priority.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Filter/Regex.php b/library/Zend/Log/Filter/Regex.php
old mode 100755
new mode 100644
index 6d055bd1b..24451b102
--- a/library/Zend/Log/Filter/Regex.php
+++ b/library/Zend/Log/Filter/Regex.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -59,7 +59,7 @@ class Regex implements FilterInterface
     {
         $message = $event['message'];
         if (is_array($event['message'])) {
-            $message = var_export($message, TRUE);
+            $message = var_export($message, true);
         }
         return preg_match($this->regex, $message) > 0;
     }
diff --git a/library/Zend/Log/Filter/Sample.php b/library/Zend/Log/Filter/Sample.php
old mode 100755
new mode 100644
index 459130fbe..504837c98
--- a/library/Zend/Log/Filter/Sample.php
+++ b/library/Zend/Log/Filter/Sample.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Filter/SuppressFilter.php b/library/Zend/Log/Filter/SuppressFilter.php
old mode 100755
new mode 100644
index 646ccad76..cc34fef6b
--- a/library/Zend/Log/Filter/SuppressFilter.php
+++ b/library/Zend/Log/Filter/SuppressFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -34,9 +34,9 @@ class SuppressFilter implements FilterInterface
             $suppress = isset($suppress['suppress']) ? $suppress['suppress'] : false;
         }
         if (!is_bool($suppress)) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                    'Suppress must be a boolean; received "%s"', gettype($suppress)
-            ));
+            throw new Exception\InvalidArgumentException(
+                sprintf('Suppress must be a boolean; received "%s"', gettype($suppress))
+            );
         }
 
         $this->suppress($suppress);
diff --git a/library/Zend/Log/Filter/Validator.php b/library/Zend/Log/Filter/Validator.php
old mode 100755
new mode 100644
index 651ea8821..33a0a0c42
--- a/library/Zend/Log/Filter/Validator.php
+++ b/library/Zend/Log/Filter/Validator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Formatter/Base.php b/library/Zend/Log/Formatter/Base.php
old mode 100755
new mode 100644
index 54e0cd835..e150418bd
--- a/library/Zend/Log/Formatter/Base.php
+++ b/library/Zend/Log/Formatter/Base.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Formatter/ChromePhp.php b/library/Zend/Log/Formatter/ChromePhp.php
old mode 100755
new mode 100644
index 671429b02..0670faa0f
--- a/library/Zend/Log/Formatter/ChromePhp.php
+++ b/library/Zend/Log/Formatter/ChromePhp.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Formatter/Db.php b/library/Zend/Log/Formatter/Db.php
old mode 100755
new mode 100644
index 256bb1c0f..45bb60dfd
--- a/library/Zend/Log/Formatter/Db.php
+++ b/library/Zend/Log/Formatter/Db.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Formatter/ErrorHandler.php b/library/Zend/Log/Formatter/ErrorHandler.php
old mode 100755
new mode 100644
index 287d69778..a6a12da1f
--- a/library/Zend/Log/Formatter/ErrorHandler.php
+++ b/library/Zend/Log/Formatter/ErrorHandler.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Formatter/ExceptionHandler.php b/library/Zend/Log/Formatter/ExceptionHandler.php
old mode 100755
new mode 100644
index 28d821189..e3f5a7d22
--- a/library/Zend/Log/Formatter/ExceptionHandler.php
+++ b/library/Zend/Log/Formatter/ExceptionHandler.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -79,11 +79,11 @@ class ExceptionHandler implements FormatterInterface
     protected function getType($type)
     {
         switch ($type) {
-            case "::" :
+            case "::":
                 return "static";
-            case "->" :
+            case "->":
                 return "method";
-            default :
+            default:
                 return $type;
         }
     }
diff --git a/library/Zend/Log/Formatter/FirePhp.php b/library/Zend/Log/Formatter/FirePhp.php
old mode 100755
new mode 100644
index 4e15a9825..844656211
--- a/library/Zend/Log/Formatter/FirePhp.php
+++ b/library/Zend/Log/Formatter/FirePhp.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Formatter/FormatterInterface.php b/library/Zend/Log/Formatter/FormatterInterface.php
old mode 100755
new mode 100644
index 975c3ec49..8962e5926
--- a/library/Zend/Log/Formatter/FormatterInterface.php
+++ b/library/Zend/Log/Formatter/FormatterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Formatter/Simple.php b/library/Zend/Log/Formatter/Simple.php
old mode 100755
new mode 100644
index 531ea7642..8ba520081
--- a/library/Zend/Log/Formatter/Simple.php
+++ b/library/Zend/Log/Formatter/Simple.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Formatter/Xml.php b/library/Zend/Log/Formatter/Xml.php
old mode 100755
new mode 100644
index ae4abf73e..00a6ec225
--- a/library/Zend/Log/Formatter/Xml.php
+++ b/library/Zend/Log/Formatter/Xml.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Logger.php b/library/Zend/Log/Logger.php
old mode 100755
new mode 100644
index 676ced6da..880738e15
--- a/library/Zend/Log/Logger.php
+++ b/library/Zend/Log/Logger.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -614,7 +614,8 @@ class Logger implements LoggerInterface
         register_shutdown_function(function () use ($logger, $errorPriorityMap) {
             $error = error_get_last();
             if (null !== $error && $error['type'] === E_ERROR) {
-                $logger->log($errorPriorityMap[E_ERROR],
+                $logger->log(
+                    $errorPriorityMap[E_ERROR],
                     $error['message'],
                     array(
                         'file' => $error['file'],
diff --git a/library/Zend/Log/LoggerAbstractServiceFactory.php b/library/Zend/Log/LoggerAbstractServiceFactory.php
old mode 100755
new mode 100644
index b4611e159..b280dd046
--- a/library/Zend/Log/LoggerAbstractServiceFactory.php
+++ b/library/Zend/Log/LoggerAbstractServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/LoggerAwareInterface.php b/library/Zend/Log/LoggerAwareInterface.php
old mode 100755
new mode 100644
index a65aff10a..ad6d979b0
--- a/library/Zend/Log/LoggerAwareInterface.php
+++ b/library/Zend/Log/LoggerAwareInterface.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Log;
 
-
 /**
  * Logger aware interface
  */
diff --git a/library/Zend/Log/LoggerAwareTrait.php b/library/Zend/Log/LoggerAwareTrait.php
old mode 100755
new mode 100644
index 6f5748dd7..2da20dee6
--- a/library/Zend/Log/LoggerAwareTrait.php
+++ b/library/Zend/Log/LoggerAwareTrait.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Log;
 
-
 trait LoggerAwareTrait
 {
     /**
diff --git a/library/Zend/Log/LoggerInterface.php b/library/Zend/Log/LoggerInterface.php
old mode 100755
new mode 100644
index a2fc6eb5d..b82a5fbda
--- a/library/Zend/Log/LoggerInterface.php
+++ b/library/Zend/Log/LoggerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/LoggerServiceFactory.php b/library/Zend/Log/LoggerServiceFactory.php
old mode 100755
new mode 100644
index 0fc47c058..afa75c156
--- a/library/Zend/Log/LoggerServiceFactory.php
+++ b/library/Zend/Log/LoggerServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Processor/Backtrace.php b/library/Zend/Log/Processor/Backtrace.php
old mode 100755
new mode 100644
index 2355a90b5..01b19ade3
--- a/library/Zend/Log/Processor/Backtrace.php
+++ b/library/Zend/Log/Processor/Backtrace.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
 *
 * @link      http://github.com/zendframework/zf2 for the canonical source repository
-* @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
 */
 
@@ -70,10 +70,6 @@ class Backtrace implements ProcessorInterface
             return debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $this->traceLimit);
         }
 
-        if (PHP_VERSION_ID >= 50306) {
-            return debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-        }
-
-        return debug_backtrace();
+        return debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
     }
 }
diff --git a/library/Zend/Log/Processor/ProcessorInterface.php b/library/Zend/Log/Processor/ProcessorInterface.php
old mode 100755
new mode 100644
index f0a32163b..ea1b2eff1
--- a/library/Zend/Log/Processor/ProcessorInterface.php
+++ b/library/Zend/Log/Processor/ProcessorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Processor/RequestId.php b/library/Zend/Log/Processor/RequestId.php
old mode 100755
new mode 100644
index eb66f8fb0..7614e8e9e
--- a/library/Zend/Log/Processor/RequestId.php
+++ b/library/Zend/Log/Processor/RequestId.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
 *
 * @link      http://github.com/zendframework/zf2 for the canonical source repository
-* @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/library/Zend/Log/ProcessorPluginManager.php b/library/Zend/Log/ProcessorPluginManager.php
old mode 100755
new mode 100644
index 319040f57..4164481ec
--- a/library/Zend/Log/ProcessorPluginManager.php
+++ b/library/Zend/Log/ProcessorPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/README.md b/library/Zend/Log/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Log/Writer/AbstractWriter.php b/library/Zend/Log/Writer/AbstractWriter.php
old mode 100755
new mode 100644
index 39f5d1e9f..b519e4cf8
--- a/library/Zend/Log/Writer/AbstractWriter.php
+++ b/library/Zend/Log/Writer/AbstractWriter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -215,18 +215,19 @@ abstract class AbstractWriter implements WriterInterface
             $plugins = new $plugins;
         }
         if (!$plugins instanceof FormatterPluginManager) {
-            throw new Exception\InvalidArgumentException(sprintf(
+            throw new Exception\InvalidArgumentException(
+                sprintf(
                     'Writer plugin manager must extend %s\FormatterPluginManager; received %s',
                     __NAMESPACE__,
                     is_object($plugins) ? get_class($plugins) : gettype($plugins)
-            ));
+                )
+            );
         }
 
         $this->formatterPlugins = $plugins;
         return $this;
     }
 
-
     /**
      * Get formatter instance
      *
diff --git a/library/Zend/Log/Writer/ChromePhp.php b/library/Zend/Log/Writer/ChromePhp.php
old mode 100755
new mode 100644
index aa5363149..6483cc29a
--- a/library/Zend/Log/Writer/ChromePhp.php
+++ b/library/Zend/Log/Writer/ChromePhp.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/ChromePhp/ChromePhpBridge.php b/library/Zend/Log/Writer/ChromePhp/ChromePhpBridge.php
old mode 100755
new mode 100644
index 05de1de83..ac263cb3e
--- a/library/Zend/Log/Writer/ChromePhp/ChromePhpBridge.php
+++ b/library/Zend/Log/Writer/ChromePhp/ChromePhpBridge.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/ChromePhp/ChromePhpInterface.php b/library/Zend/Log/Writer/ChromePhp/ChromePhpInterface.php
old mode 100755
new mode 100644
index 772fe0b77..569b6def3
--- a/library/Zend/Log/Writer/ChromePhp/ChromePhpInterface.php
+++ b/library/Zend/Log/Writer/ChromePhp/ChromePhpInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/Db.php b/library/Zend/Log/Writer/Db.php
old mode 100755
new mode 100644
index 2eb54f291..33ba0c94b
--- a/library/Zend/Log/Writer/Db.php
+++ b/library/Zend/Log/Writer/Db.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -139,8 +139,8 @@ class Db extends AbstractWriter
     {
         $keys = array_keys($fields);
         $sql = 'INSERT INTO ' . $db->platform->quoteIdentifier($tableName) . ' (' .
-            implode(",",array_map(array($db->platform, 'quoteIdentifier'), $keys)) . ') VALUES (' .
-            implode(",",array_map(array($db->driver, 'formatParameterName'), $keys)) . ')';
+            implode(",", array_map(array($db->platform, 'quoteIdentifier'), $keys)) . ') VALUES (' .
+            implode(",", array_map(array($db->driver, 'formatParameterName'), $keys)) . ')';
 
         return $sql;
     }
diff --git a/library/Zend/Log/Writer/FilterPluginManager.php b/library/Zend/Log/Writer/FilterPluginManager.php
old mode 100755
new mode 100644
index d2c569b8a..456d84e6a
--- a/library/Zend/Log/Writer/FilterPluginManager.php
+++ b/library/Zend/Log/Writer/FilterPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/FingersCrossed.php b/library/Zend/Log/Writer/FingersCrossed.php
old mode 100755
new mode 100644
index d7720e848..26316b191
--- a/library/Zend/Log/Writer/FingersCrossed.php
+++ b/library/Zend/Log/Writer/FingersCrossed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Log\Writer;
diff --git a/library/Zend/Log/Writer/FirePhp.php b/library/Zend/Log/Writer/FirePhp.php
old mode 100755
new mode 100644
index 3a6b76642..a04a9be4d
--- a/library/Zend/Log/Writer/FirePhp.php
+++ b/library/Zend/Log/Writer/FirePhp.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -46,7 +46,6 @@ class FirePhp extends AbstractWriter
             throw new Exception\InvalidArgumentException('You must pass a valid FirePhp\FirePhpInterface');
         }
 
-
         $this->firephp   = $instance;
         $this->formatter = new FirePhpFormatter();
     }
diff --git a/library/Zend/Log/Writer/FirePhp/FirePhpBridge.php b/library/Zend/Log/Writer/FirePhp/FirePhpBridge.php
old mode 100755
new mode 100644
index 0b8dc81cb..5c8db0e56
--- a/library/Zend/Log/Writer/FirePhp/FirePhpBridge.php
+++ b/library/Zend/Log/Writer/FirePhp/FirePhpBridge.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/FirePhp/FirePhpInterface.php b/library/Zend/Log/Writer/FirePhp/FirePhpInterface.php
old mode 100755
new mode 100644
index 523c5b92a..ddecf1096
--- a/library/Zend/Log/Writer/FirePhp/FirePhpInterface.php
+++ b/library/Zend/Log/Writer/FirePhp/FirePhpInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/FormatterPluginManager.php b/library/Zend/Log/Writer/FormatterPluginManager.php
old mode 100755
new mode 100644
index 374f1e5b8..c06faf410
--- a/library/Zend/Log/Writer/FormatterPluginManager.php
+++ b/library/Zend/Log/Writer/FormatterPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/Mail.php b/library/Zend/Log/Writer/Mail.php
old mode 100755
new mode 100644
index 4ceca29ab..056528ed3
--- a/library/Zend/Log/Writer/Mail.php
+++ b/library/Zend/Log/Writer/Mail.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -192,10 +192,11 @@ class Mail extends AbstractWriter
         } catch (TransportException\ExceptionInterface $e) {
             trigger_error(
                 "unable to send log entries via email; " .
-                    "message = {$e->getMessage()}; " .
-                    "code = {$e->getCode()}; " .
-                        "exception class = " . get_class($e),
-                E_USER_WARNING);
+                "message = {$e->getMessage()}; " .
+                "code = {$e->getCode()}; " .
+                "exception class = " . get_class($e),
+                E_USER_WARNING
+            );
         }
     }
 
diff --git a/library/Zend/Log/Writer/Mock.php b/library/Zend/Log/Writer/Mock.php
old mode 100755
new mode 100644
index 2059c5355..a7c15432f
--- a/library/Zend/Log/Writer/Mock.php
+++ b/library/Zend/Log/Writer/Mock.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/MongoDB.php b/library/Zend/Log/Writer/MongoDB.php
old mode 100755
new mode 100644
index bb2a7544f..4179f965d
--- a/library/Zend/Log/Writer/MongoDB.php
+++ b/library/Zend/Log/Writer/MongoDB.php
@@ -4,7 +4,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/Null.php b/library/Zend/Log/Writer/Null.php
old mode 100755
new mode 100644
index 534c3b473..ec41f689b
--- a/library/Zend/Log/Writer/Null.php
+++ b/library/Zend/Log/Writer/Null.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/Stream.php b/library/Zend/Log/Writer/Stream.php
old mode 100755
new mode 100644
index 36a16b620..57a05507a
--- a/library/Zend/Log/Writer/Stream.php
+++ b/library/Zend/Log/Writer/Stream.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/Syslog.php b/library/Zend/Log/Writer/Syslog.php
old mode 100755
new mode 100644
index 121f1fb0b..99348170d
--- a/library/Zend/Log/Writer/Syslog.php
+++ b/library/Zend/Log/Writer/Syslog.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/WriterInterface.php b/library/Zend/Log/Writer/WriterInterface.php
old mode 100755
new mode 100644
index e2e6ed681..2b92fde50
--- a/library/Zend/Log/Writer/WriterInterface.php
+++ b/library/Zend/Log/Writer/WriterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/Writer/ZendMonitor.php b/library/Zend/Log/Writer/ZendMonitor.php
old mode 100755
new mode 100644
index 6f2cf9026..32a8c321e
--- a/library/Zend/Log/Writer/ZendMonitor.php
+++ b/library/Zend/Log/Writer/ZendMonitor.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/WriterPluginManager.php b/library/Zend/Log/WriterPluginManager.php
old mode 100755
new mode 100644
index 934f08b1e..343514dc1
--- a/library/Zend/Log/WriterPluginManager.php
+++ b/library/Zend/Log/WriterPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Log/composer.json b/library/Zend/Log/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Mail/Address.php b/library/Zend/Mail/Address.php
old mode 100755
new mode 100644
index 526826a92..e34c85069
--- a/library/Zend/Mail/Address.php
+++ b/library/Zend/Mail/Address.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Address/AddressInterface.php b/library/Zend/Mail/Address/AddressInterface.php
old mode 100755
new mode 100644
index 4f23c5f8a..bcdf92ad8
--- a/library/Zend/Mail/Address/AddressInterface.php
+++ b/library/Zend/Mail/Address/AddressInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/AddressList.php b/library/Zend/Mail/AddressList.php
old mode 100755
new mode 100644
index acf5bde89..751b65c89
--- a/library/Zend/Mail/AddressList.php
+++ b/library/Zend/Mail/AddressList.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/CONTRIBUTING.md b/library/Zend/Mail/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Mail/Exception/BadMethodCallException.php b/library/Zend/Mail/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 6a11063b3..05f15e009
--- a/library/Zend/Mail/Exception/BadMethodCallException.php
+++ b/library/Zend/Mail/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Exception/DomainException.php b/library/Zend/Mail/Exception/DomainException.php
old mode 100755
new mode 100644
index a3b14dd60..921d1d875
--- a/library/Zend/Mail/Exception/DomainException.php
+++ b/library/Zend/Mail/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Exception/ExceptionInterface.php b/library/Zend/Mail/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index e1ebc9902..4d9f77834
--- a/library/Zend/Mail/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Exception/InvalidArgumentException.php b/library/Zend/Mail/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 30c58a5b3..b25b51086
--- a/library/Zend/Mail/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Exception/OutOfBoundsException.php b/library/Zend/Mail/Exception/OutOfBoundsException.php
old mode 100755
new mode 100644
index 1e94c8e49..dd8329950
--- a/library/Zend/Mail/Exception/OutOfBoundsException.php
+++ b/library/Zend/Mail/Exception/OutOfBoundsException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Exception/RuntimeException.php b/library/Zend/Mail/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 339d3a402..7b4374606
--- a/library/Zend/Mail/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/AbstractAddressList.php b/library/Zend/Mail/Header/AbstractAddressList.php
old mode 100755
new mode 100644
index 87f76c773..78587ea46
--- a/library/Zend/Mail/Header/AbstractAddressList.php
+++ b/library/Zend/Mail/Header/AbstractAddressList.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/Bcc.php b/library/Zend/Mail/Header/Bcc.php
old mode 100755
new mode 100644
index b03611fe4..418b3bd77
--- a/library/Zend/Mail/Header/Bcc.php
+++ b/library/Zend/Mail/Header/Bcc.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/Cc.php b/library/Zend/Mail/Header/Cc.php
old mode 100755
new mode 100644
index 07c6668c5..f4ee5709c
--- a/library/Zend/Mail/Header/Cc.php
+++ b/library/Zend/Mail/Header/Cc.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/ContentTransferEncoding.php b/library/Zend/Mail/Header/ContentTransferEncoding.php
old mode 100755
new mode 100644
index 3d72e706f..5d386f363
--- a/library/Zend/Mail/Header/ContentTransferEncoding.php
+++ b/library/Zend/Mail/Header/ContentTransferEncoding.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Mail\Header;
 
-
 class ContentTransferEncoding implements HeaderInterface
 {
     /**
@@ -29,7 +28,6 @@ class ContentTransferEncoding implements HeaderInterface
          */
     );
 
-
     /**
      * @var string
      */
diff --git a/library/Zend/Mail/Header/ContentType.php b/library/Zend/Mail/Header/ContentType.php
old mode 100755
new mode 100644
index f3fd16eda..5e72fbdc1
--- a/library/Zend/Mail/Header/ContentType.php
+++ b/library/Zend/Mail/Header/ContentType.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/Date.php b/library/Zend/Mail/Header/Date.php
old mode 100755
new mode 100644
index 4c62da8da..fdf5941bd
--- a/library/Zend/Mail/Header/Date.php
+++ b/library/Zend/Mail/Header/Date.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/Exception/BadMethodCallException.php b/library/Zend/Mail/Header/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index ebd63ca63..c58f5bb01
--- a/library/Zend/Mail/Header/Exception/BadMethodCallException.php
+++ b/library/Zend/Mail/Header/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,7 +11,6 @@ namespace Zend\Mail\Header\Exception;
 
 use Zend\Mail\Exception;
 
-class BadMethodCallException extends Exception\BadMethodCallException implements
-    ExceptionInterface
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Header/Exception/ExceptionInterface.php b/library/Zend/Mail/Header/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index a6333e03f..8ac63324f
--- a/library/Zend/Mail/Header/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Header/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/Exception/InvalidArgumentException.php b/library/Zend/Mail/Header/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 0c7844206..af8fd91c8
--- a/library/Zend/Mail/Header/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Header/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,7 +11,6 @@ namespace Zend\Mail\Header\Exception;
 
 use Zend\Mail\Exception;
 
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Header/Exception/RuntimeException.php b/library/Zend/Mail/Header/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 2d9d5937a..98354eb95
--- a/library/Zend/Mail/Header/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Header/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,7 +11,6 @@ namespace Zend\Mail\Header\Exception;
 
 use Zend\Mail\Exception;
 
-class RuntimeException extends Exception\RuntimeException implements
-    ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Header/From.php b/library/Zend/Mail/Header/From.php
old mode 100755
new mode 100644
index 463f1c6d0..4d10dfec7
--- a/library/Zend/Mail/Header/From.php
+++ b/library/Zend/Mail/Header/From.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/GenericHeader.php b/library/Zend/Mail/Header/GenericHeader.php
old mode 100755
new mode 100644
index 3824604ab..05989179a
--- a/library/Zend/Mail/Header/GenericHeader.php
+++ b/library/Zend/Mail/Header/GenericHeader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/GenericMultiHeader.php b/library/Zend/Mail/Header/GenericMultiHeader.php
old mode 100755
new mode 100644
index a5f2fb297..d0b0d204f
--- a/library/Zend/Mail/Header/GenericMultiHeader.php
+++ b/library/Zend/Mail/Header/GenericMultiHeader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/HeaderInterface.php b/library/Zend/Mail/Header/HeaderInterface.php
old mode 100755
new mode 100644
index 37919eca7..8b304b3da
--- a/library/Zend/Mail/Header/HeaderInterface.php
+++ b/library/Zend/Mail/Header/HeaderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -25,7 +25,6 @@ interface HeaderInterface
      */
     const FORMAT_RAW     = false;
 
-
     /**
      * Factory to generate a header object from a string
      *
diff --git a/library/Zend/Mail/Header/HeaderLoader.php b/library/Zend/Mail/Header/HeaderLoader.php
old mode 100755
new mode 100644
index aa33fc0da..2711ac85b
--- a/library/Zend/Mail/Header/HeaderLoader.php
+++ b/library/Zend/Mail/Header/HeaderLoader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/HeaderWrap.php b/library/Zend/Mail/Header/HeaderWrap.php
old mode 100755
new mode 100644
index 30c223f2c..24b72ce11
--- a/library/Zend/Mail/Header/HeaderWrap.php
+++ b/library/Zend/Mail/Header/HeaderWrap.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/MessageId.php b/library/Zend/Mail/Header/MessageId.php
old mode 100755
new mode 100644
index fbb7cd5aa..80c56e0bd
--- a/library/Zend/Mail/Header/MessageId.php
+++ b/library/Zend/Mail/Header/MessageId.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Mail\Header;
 
-
 class MessageId implements HeaderInterface
 {
     /**
@@ -17,7 +16,6 @@ class MessageId implements HeaderInterface
      */
     protected $messageId;
 
-
     public static function fromString($headerLine)
     {
         list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
diff --git a/library/Zend/Mail/Header/MimeVersion.php b/library/Zend/Mail/Header/MimeVersion.php
old mode 100755
new mode 100644
index c6b34e50f..80da4cf38
--- a/library/Zend/Mail/Header/MimeVersion.php
+++ b/library/Zend/Mail/Header/MimeVersion.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/MultipleHeadersInterface.php b/library/Zend/Mail/Header/MultipleHeadersInterface.php
old mode 100755
new mode 100644
index dae4c7eb6..66e8b06d6
--- a/library/Zend/Mail/Header/MultipleHeadersInterface.php
+++ b/library/Zend/Mail/Header/MultipleHeadersInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/Received.php b/library/Zend/Mail/Header/Received.php
old mode 100755
new mode 100644
index 3efbe42e8..904e30763
--- a/library/Zend/Mail/Header/Received.php
+++ b/library/Zend/Mail/Header/Received.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/ReplyTo.php b/library/Zend/Mail/Header/ReplyTo.php
old mode 100755
new mode 100644
index ca977b29f..8d2c8929b
--- a/library/Zend/Mail/Header/ReplyTo.php
+++ b/library/Zend/Mail/Header/ReplyTo.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/Sender.php b/library/Zend/Mail/Header/Sender.php
old mode 100755
new mode 100644
index c8840baae..9c08d3b67
--- a/library/Zend/Mail/Header/Sender.php
+++ b/library/Zend/Mail/Header/Sender.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/StructuredInterface.php b/library/Zend/Mail/Header/StructuredInterface.php
old mode 100755
new mode 100644
index 475cee3b4..8d3825d37
--- a/library/Zend/Mail/Header/StructuredInterface.php
+++ b/library/Zend/Mail/Header/StructuredInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/Subject.php b/library/Zend/Mail/Header/Subject.php
old mode 100755
new mode 100644
index 50daa82f9..a4858c2f3
--- a/library/Zend/Mail/Header/Subject.php
+++ b/library/Zend/Mail/Header/Subject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/To.php b/library/Zend/Mail/Header/To.php
old mode 100755
new mode 100644
index 78f69a4a8..26d41ae36
--- a/library/Zend/Mail/Header/To.php
+++ b/library/Zend/Mail/Header/To.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Header/UnstructuredInterface.php b/library/Zend/Mail/Header/UnstructuredInterface.php
old mode 100755
new mode 100644
index 1b60c1d0a..c14dbc2ca
--- a/library/Zend/Mail/Header/UnstructuredInterface.php
+++ b/library/Zend/Mail/Header/UnstructuredInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Headers.php b/library/Zend/Mail/Headers.php
old mode 100755
new mode 100644
index 7822a01b3..414168f38
--- a/library/Zend/Mail/Headers.php
+++ b/library/Zend/Mail/Headers.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -302,6 +302,7 @@ class Headers implements Countable, Iterator
                 } else {
                     return $results[0];
                 }
+                //fall-trough
             default:
                 return new ArrayIterator($results);
         }
diff --git a/library/Zend/Mail/Message.php b/library/Zend/Mail/Message.php
old mode 100755
new mode 100644
index a820bc8a8..e1b999bb9
--- a/library/Zend/Mail/Message.php
+++ b/library/Zend/Mail/Message.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Protocol/AbstractProtocol.php b/library/Zend/Mail/Protocol/AbstractProtocol.php
old mode 100755
new mode 100644
index 3f8d4c1c7..af472078b
--- a/library/Zend/Mail/Protocol/AbstractProtocol.php
+++ b/library/Zend/Mail/Protocol/AbstractProtocol.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -23,7 +23,6 @@ abstract class AbstractProtocol
      */
     const EOL = "\r\n";
 
-
     /**
      * Default timeout in seconds for initiating session
      */
@@ -35,56 +34,48 @@ abstract class AbstractProtocol
      */
     protected $maximumLog = 64;
 
-
     /**
      * Hostname or IP address of remote server
      * @var string
      */
     protected $host;
 
-
     /**
      * Port number of connection
      * @var int
      */
     protected $port;
 
-
     /**
      * Instance of Zend\Validator\ValidatorChain to check hostnames
      * @var \Zend\Validator\ValidatorChain
      */
     protected $validHost;
 
-
     /**
      * Socket connection resource
      * @var resource
      */
     protected $socket;
 
-
     /**
      * Last request sent to server
      * @var string
      */
     protected $request;
 
-
     /**
      * Array of server responses to last request
      * @var array
      */
     protected $response;
 
-
     /**
      * Log of mail requests and server responses for a session
      * @var array
      */
     private $log = array();
 
-
     /**
      * Constructor.
      *
@@ -105,7 +96,6 @@ abstract class AbstractProtocol
         $this->port = $port;
     }
 
-
     /**
      * Class destructor to cleanup open resources
      *
@@ -125,7 +115,6 @@ abstract class AbstractProtocol
         $this->maximumLog = (int) $maximumLog;
     }
 
-
     /**
      * Get the maximum log size
      *
@@ -136,7 +125,6 @@ abstract class AbstractProtocol
         return $this->maximumLog;
     }
 
-
     /**
      * Create a connection to the remote host
      *
@@ -144,7 +132,6 @@ abstract class AbstractProtocol
      */
     abstract public function connect();
 
-
     /**
      * Retrieve the last client request
      *
@@ -155,7 +142,6 @@ abstract class AbstractProtocol
         return $this->request;
     }
 
-
     /**
      * Retrieve the last server response
      *
@@ -166,7 +152,6 @@ abstract class AbstractProtocol
         return $this->response;
     }
 
-
     /**
      * Retrieve the transaction log
      *
@@ -177,7 +162,6 @@ abstract class AbstractProtocol
         return implode('', $this->log);
     }
 
-
     /**
      * Reset the transaction log
      *
@@ -232,7 +216,6 @@ abstract class AbstractProtocol
         return $result;
     }
 
-
     /**
      * Disconnect from remote host and free resource
      *
@@ -244,7 +227,6 @@ abstract class AbstractProtocol
         }
     }
 
-
     /**
      * Send the given request followed by a LINEEND to the server.
      *
@@ -272,7 +254,6 @@ abstract class AbstractProtocol
         return $result;
     }
 
-
     /**
      * Get a line from the stream.
      *
@@ -311,7 +292,6 @@ abstract class AbstractProtocol
         return $response;
     }
 
-
     /**
      * Parse server response for successful codes
      *
diff --git a/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php b/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index a19ba3a3a..3ec5ce255
--- a/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php b/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index a93b3a9bd..f49618df3
--- a/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,6 @@ use Zend\Mail\Exception;
 /**
  * Exception for Zend\Mail component.
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Protocol/Exception/RuntimeException.php b/library/Zend/Mail/Protocol/Exception/RuntimeException.php
old mode 100755
new mode 100644
index db1d48d49..1b9e19237
--- a/library/Zend/Mail/Protocol/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Protocol/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,6 @@ use Zend\Mail\Exception;
 /**
  * Exception for Zend\Mail component.
  */
-class RuntimeException extends Exception\RuntimeException implements
-    ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Protocol/Imap.php b/library/Zend/Mail/Protocol/Imap.php
old mode 100755
new mode 100644
index df9365a19..e7dd02453
--- a/library/Zend/Mail/Protocol/Imap.php
+++ b/library/Zend/Mail/Protocol/Imap.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -429,7 +429,6 @@ class Imap
         return $result;
     }
 
-
     /**
      * Get capabilities from IMAP server
      *
@@ -586,7 +585,8 @@ class Imap
             // if we want only one message we can ignore everything else and just return
             if ($to === null && !is_array($from) && $tokens[0] == $from) {
                 // we still need to read all lines
-                while (!$this->readLine($tokens, $tag));
+                while (!$this->readLine($tokens, $tag)) {
+                }
                 return $data;
             }
             $result[$tokens[0]] = $data;
diff --git a/library/Zend/Mail/Protocol/Pop3.php b/library/Zend/Mail/Protocol/Pop3.php
old mode 100755
new mode 100644
index 2722a128d..6a9eb1419
--- a/library/Zend/Mail/Protocol/Pop3.php
+++ b/library/Zend/Mail/Protocol/Pop3.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -36,7 +36,6 @@ class Pop3
      */
     protected $timestamp;
 
-
     /**
      * Public constructor
      *
@@ -51,7 +50,6 @@ class Pop3
         }
     }
 
-
     /**
      * Public destructor
      */
@@ -60,7 +58,6 @@ class Pop3
         $this->logout();
     }
 
-
     /**
      * Open connection to POP3 server
      *
@@ -125,7 +122,6 @@ class Pop3
         return $welcome;
     }
 
-
     /**
      * Send a request
      *
@@ -142,7 +138,6 @@ class Pop3
         }
     }
 
-
     /**
      * read a response
      *
@@ -186,7 +181,6 @@ class Pop3
         return $message;
     }
 
-
     /**
      * Send request and get response
      *
@@ -202,7 +196,6 @@ class Pop3
         return $this->readResponse($multiline);
     }
 
-
     /**
      * End communication with POP3 server (also closes socket)
      */
@@ -372,7 +365,6 @@ class Pop3
         return $result;
     }
 
-
     /**
      * Make a RETR call for retrieving a full message with headers and body
      *
@@ -393,7 +385,6 @@ class Pop3
         $this->request('NOOP');
     }
 
-
     /**
      * Make a DELE count to remove a message
      *
@@ -404,7 +395,6 @@ class Pop3
         $this->request("DELE $msgno");
     }
 
-
     /**
      * Make RSET call, which rollbacks delete requests
      */
diff --git a/library/Zend/Mail/Protocol/Smtp.php b/library/Zend/Mail/Protocol/Smtp.php
old mode 100755
new mode 100644
index 21506530d..8110f624e
--- a/library/Zend/Mail/Protocol/Smtp.php
+++ b/library/Zend/Mail/Protocol/Smtp.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -23,7 +23,6 @@ class Smtp extends AbstractProtocol
      */
     protected $transport = 'tcp';
 
-
     /**
      * Indicates that a session is requested to be secure
      *
@@ -31,7 +30,6 @@ class Smtp extends AbstractProtocol
      */
     protected $secure;
 
-
     /**
      * Indicates an smtp session has been started by the HELO command
      *
@@ -39,7 +37,6 @@ class Smtp extends AbstractProtocol
      */
     protected $sess = false;
 
-
     /**
      * Indicates an smtp AUTH has been issued and authenticated
      *
@@ -47,7 +44,6 @@ class Smtp extends AbstractProtocol
      */
     protected $auth = false;
 
-
     /**
      * Indicates a MAIL command has been issued
      *
@@ -55,7 +51,6 @@ class Smtp extends AbstractProtocol
      */
     protected $mail = false;
 
-
     /**
      * Indicates one or more RCTP commands have been issued
      *
@@ -63,7 +58,6 @@ class Smtp extends AbstractProtocol
      */
     protected $rcpt = false;
 
-
     /**
      * Indicates that DATA has been issued and sent
      *
@@ -71,7 +65,6 @@ class Smtp extends AbstractProtocol
      */
     protected $data = null;
 
-
     /**
      * Constructor.
      *
@@ -317,7 +310,6 @@ class Smtp extends AbstractProtocol
         $this->data = false;
     }
 
-
     /**
      * Issues the NOOP command end validates answer
      *
@@ -330,7 +322,6 @@ class Smtp extends AbstractProtocol
         $this->_expect(250, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
     }
 
-
     /**
      * Issues the VRFY command end validates answer
      *
@@ -344,7 +335,6 @@ class Smtp extends AbstractProtocol
         $this->_expect(array(250, 251, 252), 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
     }
 
-
     /**
      * Issues the QUIT command and clears the current session
      *
@@ -359,7 +349,6 @@ class Smtp extends AbstractProtocol
         }
     }
 
-
     /**
      * Default authentication method
      *
@@ -374,7 +363,6 @@ class Smtp extends AbstractProtocol
         }
     }
 
-
     /**
      * Closes connection
      *
@@ -403,7 +391,6 @@ class Smtp extends AbstractProtocol
         $this->sess = true;
     }
 
-
     /**
      * Stop mail session
      *
diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php b/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
old mode 100755
new mode 100644
index 9666df101..c3bd3a0cc
--- a/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
+++ b/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -22,13 +22,11 @@ class Crammd5 extends Smtp
      */
     protected $username;
 
-
     /**
      * @var string
      */
     protected $password;
 
-
     /**
      * Constructor.
      *
@@ -65,7 +63,6 @@ class Crammd5 extends Smtp
         parent::__construct($host, $port, $origConfig);
     }
 
-
     /**
      * Performs CRAM-MD5 authentication with supplied credentials
      */
diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Login.php b/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
old mode 100755
new mode 100644
index 79158e67a..b5dba8fc2
--- a/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
+++ b/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -23,7 +23,6 @@ class Login extends Smtp
      */
     protected $username;
 
-
     /**
      * LOGIN password
      *
@@ -31,7 +30,6 @@ class Login extends Smtp
      */
     protected $password;
 
-
     /**
      * Constructor.
      *
@@ -65,7 +63,6 @@ class Login extends Smtp
         parent::__construct($host, $port, $origConfig);
     }
 
-
     /**
      * Perform LOGIN authentication with supplied credentials
      *
diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php b/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
old mode 100755
new mode 100644
index 335ba407d..7011aeff4
--- a/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
+++ b/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -23,7 +23,6 @@ class Plain extends Smtp
      */
     protected $username;
 
-
     /**
      * PLAIN password
      *
@@ -31,7 +30,6 @@ class Plain extends Smtp
      */
     protected $password;
 
-
     /**
      * Constructor.
      *
@@ -65,7 +63,6 @@ class Plain extends Smtp
         parent::__construct($host, $port, $origConfig);
     }
 
-
     /**
      * Perform PLAIN authentication with supplied credentials
      *
diff --git a/library/Zend/Mail/Protocol/SmtpPluginManager.php b/library/Zend/Mail/Protocol/SmtpPluginManager.php
old mode 100755
new mode 100644
index b84272b25..898fd47b4
--- a/library/Zend/Mail/Protocol/SmtpPluginManager.php
+++ b/library/Zend/Mail/Protocol/SmtpPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/README.md b/library/Zend/Mail/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Mail/Storage.php b/library/Zend/Mail/Storage.php
old mode 100755
new mode 100644
index bcad4e364..3c0b0df4e
--- a/library/Zend/Mail/Storage.php
+++ b/library/Zend/Mail/Storage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Storage/AbstractStorage.php b/library/Zend/Mail/Storage/AbstractStorage.php
old mode 100755
new mode 100644
index 7ebf74c21..36bec3c65
--- a/library/Zend/Mail/Storage/AbstractStorage.php
+++ b/library/Zend/Mail/Storage/AbstractStorage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -70,7 +70,6 @@ abstract class AbstractStorage implements
         throw new Exception\InvalidArgumentException($var . ' not found');
     }
 
-
     /**
      * Get a full list of features supported by the specific mail lib and the server
      *
@@ -81,7 +80,6 @@ abstract class AbstractStorage implements
         return $this->has;
     }
 
-
     /**
      * Count messages messages in current box/folder
      *
@@ -90,7 +88,6 @@ abstract class AbstractStorage implements
      */
     abstract public function countMessages();
 
-
     /**
      * Get a list of messages with number and size
      *
@@ -99,7 +96,6 @@ abstract class AbstractStorage implements
      */
     abstract public function getSize($id = 0);
 
-
     /**
      * Get a message with headers and body
      *
@@ -108,7 +104,6 @@ abstract class AbstractStorage implements
      */
     abstract public function getMessage($id);
 
-
     /**
      * Get raw header of message or part
      *
@@ -136,7 +131,6 @@ abstract class AbstractStorage implements
      */
     abstract public function __construct($params);
 
-
     /**
      * Destructor calls close() and therefore closes the resource.
      */
@@ -145,14 +139,12 @@ abstract class AbstractStorage implements
         $this->close();
     }
 
-
     /**
      * Close resource for mail lib. If you need to control, when the resource
      * is closed. Otherwise the destructor would call this.
      */
     abstract public function close();
 
-
     /**
      * Keep the resource alive.
      */
@@ -195,42 +187,39 @@ abstract class AbstractStorage implements
      *
      * @return   int
      */
-     public function count()
-     {
-         return $this->countMessages();
-     }
+    public function count()
+    {
+        return $this->countMessages();
+    }
 
+    /**
+     * ArrayAccess::offsetExists()
+     *
+     * @param  int  $id
+     * @return bool
+     */
+    public function offsetExists($id)
+    {
+        try {
+            if ($this->getMessage($id)) {
+                return true;
+            }
+        } catch (Exception\ExceptionInterface $e) {
+        }
 
-     /**
-      * ArrayAccess::offsetExists()
-      *
-      * @param    int     $id
-      * @return   bool
-      */
-     public function offsetExists($id)
-     {
-         try {
-             if ($this->getMessage($id)) {
-                 return true;
-             }
-         } catch (Exception\ExceptionInterface $e) {
-         }
-
-         return false;
-     }
-
-
-     /**
-      * ArrayAccess::offsetGet()
-      *
-      * @param    int $id
-      * @return   \Zend\Mail\Storage\Message message object
-      */
-     public function offsetGet($id)
-     {
-         return $this->getMessage($id);
-     }
+        return false;
+    }
 
+    /**
+     * ArrayAccess::offsetGet()
+     *
+     * @param    int $id
+     * @return   \Zend\Mail\Storage\Message message object
+     */
+    public function offsetGet($id)
+    {
+        return $this->getMessage($id);
+    }
 
     /**
      * ArrayAccess::offsetSet()
@@ -239,98 +228,91 @@ abstract class AbstractStorage implements
      * @param mixed $value
      * @throws Exception\RuntimeException
      */
-     public function offsetSet($id, $value)
-     {
-         throw new Exception\RuntimeException('cannot write mail messages via array access');
-     }
+    public function offsetSet($id, $value)
+    {
+        throw new Exception\RuntimeException('cannot write mail messages via array access');
+    }
 
+    /**
+     * ArrayAccess::offsetUnset()
+     *
+     * @param    int   $id
+     * @return   bool success
+     */
+    public function offsetUnset($id)
+    {
+        return $this->removeMessage($id);
+    }
 
-     /**
-      * ArrayAccess::offsetUnset()
-      *
-      * @param    int   $id
-      * @return   bool success
-      */
-     public function offsetUnset($id)
-     {
-         return $this->removeMessage($id);
-     }
+    /**
+     * Iterator::rewind()
+     *
+     * Rewind always gets the new count from the storage. Thus if you use
+     * the interfaces and your scripts take long you should use reset()
+     * from time to time.
+     */
+    public function rewind()
+    {
+        $this->iterationMax = $this->countMessages();
+        $this->iterationPos = 1;
+    }
 
+    /**
+     * Iterator::current()
+     *
+     * @return   Message current message
+     */
+    public function current()
+    {
+        return $this->getMessage($this->iterationPos);
+    }
 
-     /**
-      * Iterator::rewind()
-      *
-      * Rewind always gets the new count from the storage. Thus if you use
-      * the interfaces and your scripts take long you should use reset()
-      * from time to time.
-      */
-     public function rewind()
-     {
-         $this->iterationMax = $this->countMessages();
-         $this->iterationPos = 1;
-     }
+    /**
+     * Iterator::key()
+     *
+     * @return   int id of current position
+     */
+    public function key()
+    {
+        return $this->iterationPos;
+    }
 
+    /**
+     * Iterator::next()
+     */
+    public function next()
+    {
+        ++$this->iterationPos;
+    }
 
-     /**
-      * Iterator::current()
-      *
-      * @return   Message current message
-      */
-     public function current()
-     {
-         return $this->getMessage($this->iterationPos);
-     }
+    /**
+     * Iterator::valid()
+     *
+     * @return bool
+     */
+    public function valid()
+    {
+        if ($this->iterationMax === null) {
+            $this->iterationMax = $this->countMessages();
+        }
+        return $this->iterationPos && $this->iterationPos <= $this->iterationMax;
+    }
 
+    /**
+     * SeekableIterator::seek()
+     *
+     * @param  int $pos
+     * @throws Exception\OutOfBoundsException
+     */
+    public function seek($pos)
+    {
+        if ($this->iterationMax === null) {
+            $this->iterationMax = $this->countMessages();
+        }
 
-     /**
-      * Iterator::key()
-      *
-      * @return   int id of current position
-      */
-     public function key()
-     {
-         return $this->iterationPos;
-     }
-
-
-     /**
-      * Iterator::next()
-      */
-     public function next()
-     {
-         ++$this->iterationPos;
-     }
-
-
-     /**
-      * Iterator::valid()
-      *
-      * @return bool
-      */
-     public function valid()
-     {
-         if ($this->iterationMax === null) {
-             $this->iterationMax = $this->countMessages();
-         }
-         return $this->iterationPos && $this->iterationPos <= $this->iterationMax;
-     }
-
-
-     /**
-      * SeekableIterator::seek()
-      *
-      * @param  int $pos
-      * @throws Exception\OutOfBoundsException
-      */
-     public function seek($pos)
-     {
-         if ($this->iterationMax === null) {
-             $this->iterationMax = $this->countMessages();
-         }
-
-         if ($pos > $this->iterationMax) {
-             throw new Exception\OutOfBoundsException('this position does not exist');
-         }
-         $this->iterationPos = $pos;
-     }
+        if ($pos > $this->iterationMax) {
+            throw new Exception\OutOfBoundsException('this position does not exist');
+        }
+        $this->iterationPos = $pos;
+    }
 }
diff --git a/library/Zend/Mail/Storage/Exception/ExceptionInterface.php b/library/Zend/Mail/Storage/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 630637c3b..923dd1b8e
--- a/library/Zend/Mail/Storage/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Storage/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php b/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 768de0673..64c8dc945
--- a/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,6 @@ use Zend\Mail\Exception;
 /**
  * Exception for Zend\Mail component.
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php b/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
old mode 100755
new mode 100644
index fae5f1e81..d86c16ac2
--- a/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
+++ b/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,6 @@ use Zend\Mail\Exception;
 /**
  * Exception for Zend\Mail component.
  */
-class OutOfBoundsException extends Exception\OutOfBoundsException implements
-    ExceptionInterface
+class OutOfBoundsException extends Exception\OutOfBoundsException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Storage/Exception/RuntimeException.php b/library/Zend/Mail/Storage/Exception/RuntimeException.php
old mode 100755
new mode 100644
index d44af131a..281ae1b98
--- a/library/Zend/Mail/Storage/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Storage/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,6 @@ use Zend\Mail\Exception;
 /**
  * Exception for Zend\Mail component.
  */
-class RuntimeException extends Exception\RuntimeException implements
-    ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Storage/Folder.php b/library/Zend/Mail/Storage/Folder.php
old mode 100755
new mode 100644
index 4d5c316ef..6ccb5d653
--- a/library/Zend/Mail/Storage/Folder.php
+++ b/library/Zend/Mail/Storage/Folder.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Storage/Folder/FolderInterface.php b/library/Zend/Mail/Storage/Folder/FolderInterface.php
old mode 100755
new mode 100644
index d334f45ca..a3d05f1bf
--- a/library/Zend/Mail/Storage/Folder/FolderInterface.php
+++ b/library/Zend/Mail/Storage/Folder/FolderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -29,7 +29,6 @@ interface FolderInterface
      */
     public function selectFolder($globalName);
 
-
     /**
      * get Zend\Mail\Storage\Folder instance for current folder
      *
diff --git a/library/Zend/Mail/Storage/Folder/Maildir.php b/library/Zend/Mail/Storage/Folder/Maildir.php
old mode 100755
new mode 100644
index 2c7996c29..876bccb34
--- a/library/Zend/Mail/Storage/Folder/Maildir.php
+++ b/library/Zend/Mail/Storage/Folder/Maildir.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -193,8 +193,11 @@ class Maildir extends Storage\Maildir implements FolderInterface
             }
             // seems like file has vanished; rebuilding folder tree - but it's still an exception
             $this->_buildFolderTree();
-            throw new Exception\RuntimeException('seems like the maildir has vanished, I\'ve rebuild the ' .
-                                                         'folder tree, search for an other folder and try again', 0, $e);
+            throw new Exception\RuntimeException(
+                'seems like the maildir has vanished, I\'ve rebuild the folder tree, search for an other folder and try again',
+                0,
+                $e
+            );
         }
     }
 
diff --git a/library/Zend/Mail/Storage/Folder/Mbox.php b/library/Zend/Mail/Storage/Folder/Mbox.php
old mode 100755
new mode 100644
index ffc536dca..29445d71a
--- a/library/Zend/Mail/Storage/Folder/Mbox.php
+++ b/library/Zend/Mail/Storage/Folder/Mbox.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -168,8 +168,11 @@ class Mbox extends Storage\Mbox implements FolderInterface
             }
             // seems like file has vanished; rebuilding folder tree - but it's still an exception
             $this->_buildFolderTree($this->rootdir);
-            throw new Exception\RuntimeException('seems like the mbox file has vanished, I\'ve rebuild the ' .
-                                                         'folder tree, search for an other folder and try again', 0, $e);
+            throw new Exception\RuntimeException(
+                'seems like the mbox file has vanished, I\'ve rebuild the folder tree, search for an other folder and try again',
+                0,
+                $e
+            );
         }
     }
 
diff --git a/library/Zend/Mail/Storage/Imap.php b/library/Zend/Mail/Storage/Imap.php
old mode 100755
new mode 100644
index 93a3cfef4..0bd2b2772
--- a/library/Zend/Mail/Storage/Imap.php
+++ b/library/Zend/Mail/Storage/Imap.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -289,7 +289,6 @@ class Imap extends AbstractStorage implements Folder\FolderInterface, Writable\W
         throw new Exception\InvalidArgumentException('unique id not found');
     }
 
-
     /**
      * get root folder or given folder
      *
@@ -362,7 +361,6 @@ class Imap extends AbstractStorage implements Folder\FolderInterface, Writable\W
         }
     }
 
-
     /**
      * get \Zend\Mail\Storage\Folder instance for current folder
      *
@@ -444,7 +442,6 @@ class Imap extends AbstractStorage implements Folder\FolderInterface, Writable\W
      * @param  null|array                            $flags   set flags for new message, else a default set is used
      * @throws Exception\RuntimeException
      */
-     // not yet * @param string|\Zend\Mail\Message|\Zend\Mime\Message $message message as string or instance of message class
     public function appendMessage($message, $folder = null, $flags = null)
     {
         if ($folder === null) {
diff --git a/library/Zend/Mail/Storage/Maildir.php b/library/Zend/Mail/Storage/Maildir.php
old mode 100755
new mode 100644
index ad995229e..02f81e924
--- a/library/Zend/Mail/Storage/Maildir.php
+++ b/library/Zend/Mail/Storage/Maildir.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -122,8 +122,6 @@ class Maildir extends AbstractStorage
         return $result;
     }
 
-
-
     /**
      * Fetch a message
      *
@@ -330,7 +328,6 @@ class Maildir extends AbstractStorage
         }
     }
 
-
     /**
      * Close resource for mail lib. If you need to control, when the resource
      * is closed. Otherwise the destructor would call this.
@@ -341,7 +338,6 @@ class Maildir extends AbstractStorage
         $this->files = array();
     }
 
-
     /**
      * Waste some CPU cycles doing nothing.
      *
@@ -352,7 +348,6 @@ class Maildir extends AbstractStorage
         return true;
     }
 
-
     /**
      * stub for not supported message deletion
      *
diff --git a/library/Zend/Mail/Storage/Mbox.php b/library/Zend/Mail/Storage/Mbox.php
old mode 100755
new mode 100644
index 847c3c0e0..35113677c
--- a/library/Zend/Mail/Storage/Mbox.php
+++ b/library/Zend/Mail/Storage/Mbox.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -54,7 +54,6 @@ class Mbox extends AbstractStorage
         return count($this->positions);
     }
 
-
     /**
      * Get a list of messages with number and size
      *
@@ -76,7 +75,6 @@ class Mbox extends AbstractStorage
         return $result;
     }
 
-
     /**
      * Get positions for mail message or throw exception if id is invalid
      *
@@ -93,7 +91,6 @@ class Mbox extends AbstractStorage
         return $this->positions[$id - 1];
     }
 
-
     /**
      * Fetch a message
      *
diff --git a/library/Zend/Mail/Storage/Message.php b/library/Zend/Mail/Storage/Message.php
old mode 100755
new mode 100644
index 53c858f7d..726b58713
--- a/library/Zend/Mail/Storage/Message.php
+++ b/library/Zend/Mail/Storage/Message.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Storage/Message/File.php b/library/Zend/Mail/Storage/Message/File.php
old mode 100755
new mode 100644
index 98933dfe2..cd9a501fc
--- a/library/Zend/Mail/Storage/Message/File.php
+++ b/library/Zend/Mail/Storage/Message/File.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Storage/Message/MessageInterface.php b/library/Zend/Mail/Storage/Message/MessageInterface.php
old mode 100755
new mode 100644
index 7dd7067d6..80a1bf745
--- a/library/Zend/Mail/Storage/Message/MessageInterface.php
+++ b/library/Zend/Mail/Storage/Message/MessageInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Storage/Part.php b/library/Zend/Mail/Storage/Part.php
old mode 100755
new mode 100644
index d46d7d14b..26a511273
--- a/library/Zend/Mail/Storage/Part.php
+++ b/library/Zend/Mail/Storage/Part.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -349,7 +349,6 @@ class Part implements RecursiveIterator, Part\PartInterface
         return Mime\Decode::splitHeaderField(current($this->getHeader($name, 'array')), $wantedPart, $firstName);
     }
 
-
     /**
      * Getter for mail headers - name is matched in lowercase
      *
diff --git a/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php b/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index d0cfeefbe..851d00806
--- a/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php b/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index f918809bb..f904c032a
--- a/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,6 @@ use Zend\Mail\Storage\Exception;
 /**
  * Exception for Zend\Mail component.
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php b/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 5d1fc5fb5..e27d09e47
--- a/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,6 @@ use Zend\Mail\Storage\Exception;
 /**
  * Exception for Zend\Mail component.
  */
-class RuntimeException extends Exception\RuntimeException implements
-    ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Storage/Part/File.php b/library/Zend/Mail/Storage/Part/File.php
old mode 100755
new mode 100644
index 154491bf1..2bf0d57a6
--- a/library/Zend/Mail/Storage/Part/File.php
+++ b/library/Zend/Mail/Storage/Part/File.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -103,7 +103,6 @@ class File extends Part
         $this->countParts = count($this->partPos);
     }
 
-
     /**
      * Body of part
      *
diff --git a/library/Zend/Mail/Storage/Part/PartInterface.php b/library/Zend/Mail/Storage/Part/PartInterface.php
old mode 100755
new mode 100644
index d0cd78ef7..88224bed1
--- a/library/Zend/Mail/Storage/Part/PartInterface.php
+++ b/library/Zend/Mail/Storage/Part/PartInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -20,7 +20,6 @@ interface PartInterface extends RecursiveIterator
      */
     public function isMultipart();
 
-
     /**
      * Body of part
      *
@@ -54,7 +53,6 @@ interface PartInterface extends RecursiveIterator
      */
     public function countParts();
 
-
     /**
      * Get all headers
      *
@@ -95,7 +93,6 @@ interface PartInterface extends RecursiveIterator
      */
     public function getHeaderField($name, $wantedPart = '0', $firstName = '0');
 
-
     /**
      * Getter for mail headers - name is matched in lowercase
      *
diff --git a/library/Zend/Mail/Storage/Pop3.php b/library/Zend/Mail/Storage/Pop3.php
old mode 100755
new mode 100644
index 4e5b698fb..e1e49b1a0
--- a/library/Zend/Mail/Storage/Pop3.php
+++ b/library/Zend/Mail/Storage/Pop3.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -21,7 +21,6 @@ class Pop3 extends AbstractStorage
      */
     protected $protocol;
 
-
     /**
      * Count messages all messages in current box
      *
diff --git a/library/Zend/Mail/Storage/Writable/Maildir.php b/library/Zend/Mail/Storage/Writable/Maildir.php
old mode 100755
new mode 100644
index e930ea041..b5d75d4a3
--- a/library/Zend/Mail/Storage/Writable/Maildir.php
+++ b/library/Zend/Mail/Storage/Writable/Maildir.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -379,8 +379,9 @@ class Maildir extends Folder\Maildir implements WritableInterface
         }
 
         if (!$fh) {
-            throw new StorageException\RuntimeException("tried $maxTries unique ids for a temp file, but all were taken"
-                . ' - giving up');
+            throw new StorageException\RuntimeException(
+                "tried {$maxTries} unique ids for a temp file, but all were taken - giving up"
+            );
         }
 
         return array('dirname'  => $this->rootdir . '.' . $folder,
@@ -625,7 +626,6 @@ class Maildir extends Folder\Maildir implements WritableInterface
         $this->files = array_values($this->files);
     }
 
-
     /**
      * set flags for message
      *
@@ -656,7 +656,6 @@ class Maildir extends Folder\Maildir implements WritableInterface
         $this->files[$id - 1] = $filedata;
     }
 
-
     /**
      * stub for not supported message deletion
      *
@@ -783,7 +782,6 @@ class Maildir extends Folder\Maildir implements WritableInterface
                     continue;
                 }
 
-
                 while (($entry = readdir()) !== false) {
                     if ($entry[0] == '.' || !is_file($dirname . $entry)) {
                         continue;
diff --git a/library/Zend/Mail/Storage/Writable/WritableInterface.php b/library/Zend/Mail/Storage/Writable/WritableInterface.php
old mode 100755
new mode 100644
index de00e8b48..2fbbffbb6
--- a/library/Zend/Mail/Storage/Writable/WritableInterface.php
+++ b/library/Zend/Mail/Storage/Writable/WritableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Transport/Exception/DomainException.php b/library/Zend/Mail/Transport/Exception/DomainException.php
old mode 100755
new mode 100644
index 908234eb0..7ecec7027
--- a/library/Zend/Mail/Transport/Exception/DomainException.php
+++ b/library/Zend/Mail/Transport/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Transport/Exception/ExceptionInterface.php b/library/Zend/Mail/Transport/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index db249c653..3b1a56cbb
--- a/library/Zend/Mail/Transport/Exception/ExceptionInterface.php
+++ b/library/Zend/Mail/Transport/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php b/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 8f67c238f..40dd35516
--- a/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,6 @@ use Zend\Mail\Exception;
 /**
  * Exception for Zend\Mail component.
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Transport/Exception/RuntimeException.php b/library/Zend/Mail/Transport/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 258fb6281..a14e41b73
--- a/library/Zend/Mail/Transport/Exception/RuntimeException.php
+++ b/library/Zend/Mail/Transport/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,6 @@ use Zend\Mail\Exception;
 /**
  * Exception for Zend\Mail component.
  */
-class RuntimeException extends Exception\RuntimeException implements
-    ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mail/Transport/Factory.php b/library/Zend/Mail/Transport/Factory.php
old mode 100755
new mode 100644
index b0add5945..63b69486a
--- a/library/Zend/Mail/Transport/Factory.php
+++ b/library/Zend/Mail/Transport/Factory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Transport/File.php b/library/Zend/Mail/Transport/File.php
old mode 100755
new mode 100644
index 89143b277..8efd6c88e
--- a/library/Zend/Mail/Transport/File.php
+++ b/library/Zend/Mail/Transport/File.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Transport/FileOptions.php b/library/Zend/Mail/Transport/FileOptions.php
old mode 100755
new mode 100644
index c58601fcb..13d208c28
--- a/library/Zend/Mail/Transport/FileOptions.php
+++ b/library/Zend/Mail/Transport/FileOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Transport/Null.php b/library/Zend/Mail/Transport/Null.php
old mode 100755
new mode 100644
index af0b40973..2abea75f4
--- a/library/Zend/Mail/Transport/Null.php
+++ b/library/Zend/Mail/Transport/Null.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Transport/Sendmail.php b/library/Zend/Mail/Transport/Sendmail.php
old mode 100755
new mode 100644
index 4905ffc86..aac12993a
--- a/library/Zend/Mail/Transport/Sendmail.php
+++ b/library/Zend/Mail/Transport/Sendmail.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Transport/Smtp.php b/library/Zend/Mail/Transport/Smtp.php
old mode 100755
new mode 100644
index 62277ef44..82bf3d1dc
--- a/library/Zend/Mail/Transport/Smtp.php
+++ b/library/Zend/Mail/Transport/Smtp.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -164,7 +164,6 @@ class Smtp implements TransportInterface
         $this->connection = $connection;
     }
 
-
     /**
      * Gets the connection protocol instance
      *
@@ -215,11 +214,13 @@ class Smtp implements TransportInterface
         $body       = $this->prepareBody($message);
 
         if ((count($recipients) == 0) && (!empty($headers) || !empty($body))) {
-            throw new Exception\RuntimeException(  // Per RFC 2821 3.3 (page 18)
+            // Per RFC 2821 3.3 (page 18)
+            throw new Exception\RuntimeException(
                 sprintf(
                     '%s transport expects at least one recipient if the message has at least one header or body',
                     __CLASS__
-                ));
+                )
+            );
         }
 
         // Set sender email address
diff --git a/library/Zend/Mail/Transport/SmtpOptions.php b/library/Zend/Mail/Transport/SmtpOptions.php
old mode 100755
new mode 100644
index a3039c344..2ce262a69
--- a/library/Zend/Mail/Transport/SmtpOptions.php
+++ b/library/Zend/Mail/Transport/SmtpOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/Transport/TransportInterface.php b/library/Zend/Mail/Transport/TransportInterface.php
old mode 100755
new mode 100644
index cded3c6d1..6d9fe7d86
--- a/library/Zend/Mail/Transport/TransportInterface.php
+++ b/library/Zend/Mail/Transport/TransportInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mail/composer.json b/library/Zend/Mail/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php b/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
old mode 100755
new mode 100644
index 6a0eb120a..6db40ff15
--- a/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
+++ b/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/BigInteger/Adapter/Bcmath.php b/library/Zend/Math/BigInteger/Adapter/Bcmath.php
old mode 100755
new mode 100644
index d3bc289ad..65c2fcf7f
--- a/library/Zend/Math/BigInteger/Adapter/Bcmath.php
+++ b/library/Zend/Math/BigInteger/Adapter/Bcmath.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/BigInteger/Adapter/Gmp.php b/library/Zend/Math/BigInteger/Adapter/Gmp.php
old mode 100755
new mode 100644
index 830d50712..8084965d6
--- a/library/Zend/Math/BigInteger/Adapter/Gmp.php
+++ b/library/Zend/Math/BigInteger/Adapter/Gmp.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/BigInteger/AdapterPluginManager.php b/library/Zend/Math/BigInteger/AdapterPluginManager.php
old mode 100755
new mode 100644
index f86bdb24b..4f84e1080
--- a/library/Zend/Math/BigInteger/AdapterPluginManager.php
+++ b/library/Zend/Math/BigInteger/AdapterPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/BigInteger/BigInteger.php b/library/Zend/Math/BigInteger/BigInteger.php
old mode 100755
new mode 100644
index f633b821f..7e0c16b8e
--- a/library/Zend/Math/BigInteger/BigInteger.php
+++ b/library/Zend/Math/BigInteger/BigInteger.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php b/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php
old mode 100755
new mode 100644
index 878ac7fad..d3323257a
--- a/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php
+++ b/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php b/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 03e685d99..ea758242a
--- a/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php
+++ b/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php b/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 03b89202d..fc9f3352e
--- a/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php
+++ b/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/BigInteger/Exception/RuntimeException.php b/library/Zend/Math/BigInteger/Exception/RuntimeException.php
old mode 100755
new mode 100644
index a8dd99bf3..954d37342
--- a/library/Zend/Math/BigInteger/Exception/RuntimeException.php
+++ b/library/Zend/Math/BigInteger/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/CONTRIBUTING.md b/library/Zend/Math/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Math/Exception/DomainException.php b/library/Zend/Math/Exception/DomainException.php
old mode 100755
new mode 100644
index 86f2a2153..881bb60e9
--- a/library/Zend/Math/Exception/DomainException.php
+++ b/library/Zend/Math/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/Exception/ExceptionInterface.php b/library/Zend/Math/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index ce7c7fa42..d63726403
--- a/library/Zend/Math/Exception/ExceptionInterface.php
+++ b/library/Zend/Math/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/Exception/InvalidArgumentException.php b/library/Zend/Math/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index fc8ad48ac..2c6d76030
--- a/library/Zend/Math/Exception/InvalidArgumentException.php
+++ b/library/Zend/Math/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/Exception/RuntimeException.php b/library/Zend/Math/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 27c0d040c..d1aca8d9a
--- a/library/Zend/Math/Exception/RuntimeException.php
+++ b/library/Zend/Math/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Math/README.md b/library/Zend/Math/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Math/Rand.php b/library/Zend/Math/Rand.php
old mode 100755
new mode 100644
index 7ca5523ec..0ab500f8a
--- a/library/Zend/Math/Rand.php
+++ b/library/Zend/Math/Rand.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -39,19 +39,13 @@ abstract class Rand
             return false;
         }
 
-        if (function_exists('openssl_random_pseudo_bytes')
-            && ((PHP_VERSION_ID >= 50304)
-            || strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
-        ) {
+        if (function_exists('openssl_random_pseudo_bytes')) {
             $bytes = openssl_random_pseudo_bytes($length, $usable);
             if (true === $usable) {
                 return $bytes;
             }
         }
-        if (function_exists('mcrypt_create_iv')
-            && ((PHP_VERSION_ID >= 50307)
-            || strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
-        ) {
+        if (function_exists('mcrypt_create_iv')) {
             $bytes = mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
             if ($bytes !== false && strlen($bytes) === $length) {
                 return $bytes;
diff --git a/library/Zend/Math/Source/HashTiming.php b/library/Zend/Math/Source/HashTiming.php
old mode 100755
new mode 100644
index 22e93bba8..a50ce43d1
--- a/library/Zend/Math/Source/HashTiming.php
+++ b/library/Zend/Math/Source/HashTiming.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Math\Source;
diff --git a/library/Zend/Math/composer.json b/library/Zend/Math/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Memory/CONTRIBUTING.md b/library/Zend/Memory/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Memory/Container/AbstractContainer.php b/library/Zend/Memory/Container/AbstractContainer.php
old mode 100755
new mode 100644
index 079bda814..e2a7b0812
--- a/library/Zend/Memory/Container/AbstractContainer.php
+++ b/library/Zend/Memory/Container/AbstractContainer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Memory/Container/AccessController.php b/library/Zend/Memory/Container/AccessController.php
old mode 100755
new mode 100644
index 470556115..08e4095e4
--- a/library/Zend/Memory/Container/AccessController.php
+++ b/library/Zend/Memory/Container/AccessController.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -30,7 +30,6 @@ class AccessController implements ContainerInterface
      */
     private $memContainer;
 
-
     /**
      * Object constructor
      *
@@ -49,7 +48,6 @@ class AccessController implements ContainerInterface
         $this->memContainer->destroy();
     }
 
-
     /**
      * Get string value reference
      *
@@ -81,7 +79,6 @@ class AccessController implements ContainerInterface
         $this->memContainer->lock();
     }
 
-
     /**
      * Unlock object
      */
diff --git a/library/Zend/Memory/Container/ContainerInterface.php b/library/Zend/Memory/Container/ContainerInterface.php
old mode 100755
new mode 100644
index fd78a581d..4b8311b42
--- a/library/Zend/Memory/Container/ContainerInterface.php
+++ b/library/Zend/Memory/Container/ContainerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Memory/Container/Locked.php b/library/Zend/Memory/Container/Locked.php
old mode 100755
new mode 100644
index 12cf62c71..a903139de
--- a/library/Zend/Memory/Container/Locked.php
+++ b/library/Zend/Memory/Container/Locked.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -23,7 +23,6 @@ class Locked extends AbstractContainer
      */
     public $value;
 
-
     /**
      * Object constructor
      *
diff --git a/library/Zend/Memory/Container/Movable.php b/library/Zend/Memory/Container/Movable.php
old mode 100755
new mode 100644
index a45e096a2..c5d129762
--- a/library/Zend/Memory/Container/Movable.php
+++ b/library/Zend/Memory/Container/Movable.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Memory/Exception/ExceptionInterface.php b/library/Zend/Memory/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 775395a2b..ad87a42dc
--- a/library/Zend/Memory/Exception/ExceptionInterface.php
+++ b/library/Zend/Memory/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Memory/Exception/InvalidArgumentException.php b/library/Zend/Memory/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index c35534b00..9f9a7675b
--- a/library/Zend/Memory/Exception/InvalidArgumentException.php
+++ b/library/Zend/Memory/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Memory/Exception/RuntimeException.php b/library/Zend/Memory/Exception/RuntimeException.php
old mode 100755
new mode 100644
index ecf52c077..72e202cc4
--- a/library/Zend/Memory/Exception/RuntimeException.php
+++ b/library/Zend/Memory/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Memory/MemoryManager.php b/library/Zend/Memory/MemoryManager.php
old mode 100755
new mode 100644
index e4c3df692..d1d5a077b
--- a/library/Zend/Memory/MemoryManager.php
+++ b/library/Zend/Memory/MemoryManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -222,7 +222,7 @@ class MemoryManager
      */
     public function create($value = '')
     {
-        return $this->_create($value,  false);
+        return $this->_create($value, false);
     }
 
     /**
diff --git a/library/Zend/Memory/README.md b/library/Zend/Memory/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Memory/Value.php b/library/Zend/Memory/Value.php
old mode 100755
new mode 100644
index 5615891f8..0c5f18378
--- a/library/Zend/Memory/Value.php
+++ b/library/Zend/Memory/Value.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -132,7 +132,6 @@ class Value implements ArrayAccess, Countable
         }
     }
 
-
     /**
      * To string conversion
      *
@@ -143,7 +142,6 @@ class Value implements ArrayAccess, Countable
         return $this->value;
     }
 
-
     /**
      * Get string value reference
      *
diff --git a/library/Zend/Memory/composer.json b/library/Zend/Memory/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Mime/CONTRIBUTING.md b/library/Zend/Mime/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Mime/Decode.php b/library/Zend/Mime/Decode.php
old mode 100755
new mode 100644
index 738b877a2..7fbdcfb81
--- a/library/Zend/Mime/Decode.php
+++ b/library/Zend/Mime/Decode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mime/Exception/ExceptionInterface.php b/library/Zend/Mime/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index bee99530b..f5ff3c8eb
--- a/library/Zend/Mime/Exception/ExceptionInterface.php
+++ b/library/Zend/Mime/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mime/Exception/RuntimeException.php b/library/Zend/Mime/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 5dea87b55..c7b54ee21
--- a/library/Zend/Mime/Exception/RuntimeException.php
+++ b/library/Zend/Mime/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -12,8 +12,6 @@ namespace Zend\Mime\Exception;
 /**
  * Exception for Zend\Mime component.
  */
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Mime/Message.php b/library/Zend/Mime/Message.php
old mode 100755
new mode 100644
index 694178468..ad97e126d
--- a/library/Zend/Mime/Message.php
+++ b/library/Zend/Mime/Message.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mime/Mime.php b/library/Zend/Mime/Mime.php
old mode 100755
new mode 100644
index 4223aa61f..862581eba
--- a/library/Zend/Mime/Mime.php
+++ b/library/Zend/Mime/Mime.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mime/Part.php b/library/Zend/Mime/Part.php
old mode 100755
new mode 100644
index d48956966..0271d6f69
--- a/library/Zend/Mime/Part.php
+++ b/library/Zend/Mime/Part.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -28,7 +28,6 @@ class Part
     protected $isStream = false;
     protected $filters = array();
 
-
     /**
      * create a new Mime Part.
      * The (unencoded) content of the Part as passed
diff --git a/library/Zend/Mime/README.md b/library/Zend/Mime/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Mime/composer.json b/library/Zend/Mime/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/ModuleManager/CONTRIBUTING.md b/library/Zend/ModuleManager/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/ModuleManager/Exception/ExceptionInterface.php b/library/Zend/ModuleManager/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index f673f1666..3e784eede
--- a/library/Zend/ModuleManager/Exception/ExceptionInterface.php
+++ b/library/Zend/ModuleManager/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Exception/InvalidArgumentException.php b/library/Zend/ModuleManager/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 2616bdcc3..0c2752dd1
--- a/library/Zend/ModuleManager/Exception/InvalidArgumentException.php
+++ b/library/Zend/ModuleManager/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Exception/MissingDependencyModuleException.php b/library/Zend/ModuleManager/Exception/MissingDependencyModuleException.php
old mode 100755
new mode 100644
index add17e8c9..a28373b92
--- a/library/Zend/ModuleManager/Exception/MissingDependencyModuleException.php
+++ b/library/Zend/ModuleManager/Exception/MissingDependencyModuleException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Exception/RuntimeException.php b/library/Zend/ModuleManager/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 358f55530..d01e905ea
--- a/library/Zend/ModuleManager/Exception/RuntimeException.php
+++ b/library/Zend/ModuleManager/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php b/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php
old mode 100755
new mode 100644
index 894ebd40e..bb72b3892
--- a/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php b/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php
old mode 100755
new mode 100644
index e898d61ef..5e2ee294d
--- a/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php
+++ b/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php b/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php
old mode 100755
new mode 100644
index 259cb6394..0829e6523
--- a/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/ConsoleBannerProviderInterface.php b/library/Zend/ModuleManager/Feature/ConsoleBannerProviderInterface.php
old mode 100755
new mode 100644
index f1989ab1b..3ec2ebd69
--- a/library/Zend/ModuleManager/Feature/ConsoleBannerProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ConsoleBannerProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/ConsoleUsageProviderInterface.php b/library/Zend/ModuleManager/Feature/ConsoleUsageProviderInterface.php
old mode 100755
new mode 100644
index 610c75800..ebc43344e
--- a/library/Zend/ModuleManager/Feature/ConsoleUsageProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ConsoleUsageProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php b/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php
old mode 100755
new mode 100644
index 1202d10b6..e1270ae00
--- a/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php b/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php
old mode 100755
new mode 100644
index ccb18c6ba..1ff1bd3d0
--- a/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/DependencyIndicatorInterface.php b/library/Zend/ModuleManager/Feature/DependencyIndicatorInterface.php
old mode 100755
new mode 100644
index 0f851887c..c68d1e686
--- a/library/Zend/ModuleManager/Feature/DependencyIndicatorInterface.php
+++ b/library/Zend/ModuleManager/Feature/DependencyIndicatorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/FilterProviderInterface.php b/library/Zend/ModuleManager/Feature/FilterProviderInterface.php
old mode 100755
new mode 100644
index be1305ee3..5b4639a6c
--- a/library/Zend/ModuleManager/Feature/FilterProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/FilterProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/FormElementProviderInterface.php b/library/Zend/ModuleManager/Feature/FormElementProviderInterface.php
old mode 100755
new mode 100644
index 364b228d5..6f97818af
--- a/library/Zend/ModuleManager/Feature/FormElementProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/FormElementProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/HydratorProviderInterface.php b/library/Zend/ModuleManager/Feature/HydratorProviderInterface.php
old mode 100755
new mode 100644
index 628e5f23d..935e1a5de
--- a/library/Zend/ModuleManager/Feature/HydratorProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/HydratorProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/InitProviderInterface.php b/library/Zend/ModuleManager/Feature/InitProviderInterface.php
old mode 100755
new mode 100644
index 61c8da6a2..f04c3eb16
--- a/library/Zend/ModuleManager/Feature/InitProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/InitProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php b/library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php
old mode 100755
new mode 100644
index 5074829fa..d84caee68
--- a/library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php b/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php
old mode 100755
new mode 100644
index 5a85affce..d4578b67d
--- a/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php
+++ b/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php b/library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php
old mode 100755
new mode 100644
index c5561139f..4e15d81c2
--- a/library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php b/library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php
old mode 100755
new mode 100644
index 251edad18..a81ad5459
--- a/library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/RouteProviderInterface.php b/library/Zend/ModuleManager/Feature/RouteProviderInterface.php
old mode 100755
new mode 100644
index 95dbaf9aa..af5bcf8eb
--- a/library/Zend/ModuleManager/Feature/RouteProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/RouteProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/SerializerProviderInterface.php b/library/Zend/ModuleManager/Feature/SerializerProviderInterface.php
old mode 100755
new mode 100644
index 94e788536..481c28b34
--- a/library/Zend/ModuleManager/Feature/SerializerProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/SerializerProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php b/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php
old mode 100755
new mode 100644
index 91f1f9b4a..7fcf922da
--- a/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/ValidatorProviderInterface.php b/library/Zend/ModuleManager/Feature/ValidatorProviderInterface.php
old mode 100755
new mode 100644
index a79cae03d..fa6c8530a
--- a/library/Zend/ModuleManager/Feature/ValidatorProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ValidatorProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php b/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php
old mode 100755
new mode 100644
index d7356acc9..ed5d5b53c
--- a/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php
+++ b/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/AbstractListener.php b/library/Zend/ModuleManager/Listener/AbstractListener.php
old mode 100755
new mode 100644
index 791b7011d..cc7636e2d
--- a/library/Zend/ModuleManager/Listener/AbstractListener.php
+++ b/library/Zend/ModuleManager/Listener/AbstractListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/AutoloaderListener.php b/library/Zend/ModuleManager/Listener/AutoloaderListener.php
old mode 100755
new mode 100644
index 3bbb313c9..8c35d8885
--- a/library/Zend/ModuleManager/Listener/AutoloaderListener.php
+++ b/library/Zend/ModuleManager/Listener/AutoloaderListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/ConfigListener.php b/library/Zend/ModuleManager/Listener/ConfigListener.php
old mode 100755
new mode 100644
index 9e25bc3e2..5646350d5
--- a/library/Zend/ModuleManager/Listener/ConfigListener.php
+++ b/library/Zend/ModuleManager/Listener/ConfigListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -286,10 +286,14 @@ class ConfigListener extends AbstractListener implements
 
         if (!is_array($paths)) {
             throw new Exception\InvalidArgumentException(
-                sprintf('Argument passed to %::%s() must be an array, '
-                . 'implement the Traversable interface, or be an '
-                . 'instance of Zend\Config\Config. %s given.',
-                __CLASS__, __METHOD__, gettype($paths))
+                sprintf(
+                    'Argument passed to %::%s() must be an array, '
+                    . 'implement the Traversable interface, or be an '
+                    . 'instance of Zend\Config\Config. %s given.',
+                    __CLASS__,
+                    __METHOD__,
+                    gettype($paths)
+                )
             );
         }
 
@@ -310,8 +314,12 @@ class ConfigListener extends AbstractListener implements
     {
         if (!is_string($path)) {
             throw new Exception\InvalidArgumentException(
-                sprintf('Parameter to %s::%s() must be a string; %s given.',
-                __CLASS__, __METHOD__, gettype($path))
+                sprintf(
+                    'Parameter to %s::%s() must be a string; %s given.',
+                    __CLASS__,
+                    __METHOD__,
+                    gettype($path)
+                )
             );
         }
         $this->paths[] = array('type' => $type, 'path' => $path);
@@ -332,9 +340,12 @@ class ConfigListener extends AbstractListener implements
 
         if (!is_array($config)) {
             throw new Exception\InvalidArgumentException(
-                sprintf('Config being merged must be an array, '
-                . 'implement the Traversable interface, or be an '
-                . 'instance of Zend\Config\Config. %s given.', gettype($config))
+                sprintf(
+                    'Config being merged must be an array, '
+                    . 'implement the Traversable interface, or be an '
+                    . 'instance of Zend\Config\Config. %s given.',
+                    gettype($config)
+                )
             );
         }
 
diff --git a/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php b/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php
old mode 100755
new mode 100644
index 9b86a4f9f..1b6eb7662
--- a/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php
+++ b/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php b/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php
old mode 100755
new mode 100644
index dae7d5eae..3eaedca5f
--- a/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php
+++ b/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php b/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index f52be43d0..e988e4f38
--- a/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php
+++ b/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php b/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 94d597eb7..e8c82cd0a
--- a/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php
+++ b/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php b/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php
old mode 100755
new mode 100644
index b5a2710e7..9234a3ccf
--- a/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php
+++ b/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/InitTrigger.php b/library/Zend/ModuleManager/Listener/InitTrigger.php
old mode 100755
new mode 100644
index 884961f88..4487b2e5d
--- a/library/Zend/ModuleManager/Listener/InitTrigger.php
+++ b/library/Zend/ModuleManager/Listener/InitTrigger.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/ListenerOptions.php b/library/Zend/ModuleManager/Listener/ListenerOptions.php
old mode 100755
new mode 100644
index a32206cda..4901562cd
--- a/library/Zend/ModuleManager/Listener/ListenerOptions.php
+++ b/library/Zend/ModuleManager/Listener/ListenerOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -88,10 +88,14 @@ class ListenerOptions extends AbstractOptions
     {
         if (!is_array($modulePaths) && !$modulePaths instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
-                sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the Traversable interface, or be an '
-                . 'instance of Zend\Config\Config. %s given.',
-                __CLASS__, __METHOD__, gettype($modulePaths))
+                sprintf(
+                    'Argument passed to %s::%s() must be an array, '
+                    . 'implement the Traversable interface, or be an '
+                    . 'instance of Zend\Config\Config. %s given.',
+                    __CLASS__,
+                    __METHOD__,
+                    gettype($modulePaths)
+                )
             );
         }
 
@@ -130,10 +134,14 @@ class ListenerOptions extends AbstractOptions
     {
         if (!is_array($configGlobPaths) && !$configGlobPaths instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
-                sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the Traversable interface, or be an '
-                . 'instance of Zend\Config\Config. %s given.',
-                __CLASS__, __METHOD__, gettype($configGlobPaths))
+                sprintf(
+                    'Argument passed to %s::%s() must be an array, '
+                    . 'implement the Traversable interface, or be an '
+                    . 'instance of Zend\Config\Config. %s given.',
+                    __CLASS__,
+                    __METHOD__,
+                    gettype($configGlobPaths)
+                )
             );
         }
 
@@ -152,10 +160,14 @@ class ListenerOptions extends AbstractOptions
     {
         if (!is_array($configStaticPaths) && !$configStaticPaths instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
-                sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the Traversable interface, or be an '
-                . 'instance of Zend\Config\Config. %s given.',
-                __CLASS__, __METHOD__, gettype($configStaticPaths))
+                sprintf(
+                    'Argument passed to %s::%s() must be an array, '
+                    . 'implement the Traversable interface, or be an '
+                    . 'instance of Zend\Config\Config. %s given.',
+                    __CLASS__,
+                    __METHOD__,
+                    gettype($configStaticPaths)
+                )
             );
         }
 
@@ -185,10 +197,14 @@ class ListenerOptions extends AbstractOptions
     {
         if (!is_array($extraConfig) && !$extraConfig instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
-                sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the Traversable interface, or be an '
-                . 'instance of Zend\Config\Config. %s given.',
-                __CLASS__, __METHOD__, gettype($extraConfig))
+                sprintf(
+                    'Argument passed to %s::%s() must be an array, '
+                    . 'implement the Traversable interface, or be an '
+                    . 'instance of Zend\Config\Config. %s given.',
+                    __CLASS__,
+                    __METHOD__,
+                    gettype($extraConfig)
+                )
             );
         }
 
diff --git a/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php b/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
old mode 100755
new mode 100644
index b3bc14106..19fac0117
--- a/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
+++ b/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,7 @@ use Zend\EventManager\EventManagerInterface;
 use Zend\EventManager\ListenerAggregateInterface;
 use Zend\ModuleManager\Feature\LocatorRegisteredInterface;
 use Zend\ModuleManager\ModuleEvent;
-use Zend\Mvc\MvcEvent;
+use Zend\ModuleManager\ModuleManager;
 
 /**
  * Locator registration listener
@@ -67,7 +67,7 @@ class LocatorRegistrationListener extends AbstractListener implements
         }
 
         // Shared instance for module manager
-        $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_BOOTSTRAP, function ($e) use ($moduleManager) {
+        $events->attach('Zend\Mvc\Application', ModuleManager::EVENT_BOOTSTRAP, function ($e) use ($moduleManager) {
             $moduleClassName = get_class($moduleManager);
             $moduleClassNameArray = explode('\\', $moduleClassName);
             $moduleClassNameAlias = end($moduleClassNameArray);
@@ -83,7 +83,7 @@ class LocatorRegistrationListener extends AbstractListener implements
         }
 
         // Attach to the bootstrap event if there are modules we need to process
-        $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_BOOTSTRAP, array($this, 'onBootstrap'), 1000);
+        $events->attach('Zend\Mvc\Application', ModuleManager::EVENT_BOOTSTRAP, array($this, 'onBootstrap'), 1000);
     }
 
     /**
diff --git a/library/Zend/ModuleManager/Listener/ModuleDependencyCheckerListener.php b/library/Zend/ModuleManager/Listener/ModuleDependencyCheckerListener.php
old mode 100755
new mode 100644
index 636ba92d0..fcb766440
--- a/library/Zend/ModuleManager/Listener/ModuleDependencyCheckerListener.php
+++ b/library/Zend/ModuleManager/Listener/ModuleDependencyCheckerListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php b/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
old mode 100755
new mode 100644
index 9e8bdf568..b4ea9509f
--- a/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
+++ b/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/ModuleResolverListener.php b/library/Zend/ModuleManager/Listener/ModuleResolverListener.php
old mode 100755
new mode 100644
index 6e841155f..bf8543f26
--- a/library/Zend/ModuleManager/Listener/ModuleResolverListener.php
+++ b/library/Zend/ModuleManager/Listener/ModuleResolverListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/OnBootstrapListener.php b/library/Zend/ModuleManager/Listener/OnBootstrapListener.php
old mode 100755
new mode 100644
index 5b0e1392a..434792c74
--- a/library/Zend/ModuleManager/Listener/OnBootstrapListener.php
+++ b/library/Zend/ModuleManager/Listener/OnBootstrapListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,7 +11,7 @@ namespace Zend\ModuleManager\Listener;
 
 use Zend\ModuleManager\Feature\BootstrapListenerInterface;
 use Zend\ModuleManager\ModuleEvent;
-use Zend\Mvc\MvcEvent;
+use Zend\ModuleManager\ModuleManager;
 
 /**
  * Autoloader listener
@@ -34,6 +34,6 @@ class OnBootstrapListener extends AbstractListener
         $moduleManager = $e->getTarget();
         $events        = $moduleManager->getEventManager();
         $sharedEvents  = $events->getSharedManager();
-        $sharedEvents->attach('Zend\Mvc\Application', MvcEvent::EVENT_BOOTSTRAP, array($module, 'onBootstrap'));
+        $sharedEvents->attach('Zend\Mvc\Application', ModuleManager::EVENT_BOOTSTRAP, array($module, 'onBootstrap'));
     }
 }
diff --git a/library/Zend/ModuleManager/Listener/ServiceListener.php b/library/Zend/ModuleManager/Listener/ServiceListener.php
old mode 100755
new mode 100644
index 7907d6f93..252d84c0a
--- a/library/Zend/ModuleManager/Listener/ServiceListener.php
+++ b/library/Zend/ModuleManager/Listener/ServiceListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/Listener/ServiceListenerInterface.php b/library/Zend/ModuleManager/Listener/ServiceListenerInterface.php
old mode 100755
new mode 100644
index 3de7660f1..9cfe4018c
--- a/library/Zend/ModuleManager/Listener/ServiceListenerInterface.php
+++ b/library/Zend/ModuleManager/Listener/ServiceListenerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/ModuleEvent.php b/library/Zend/ModuleManager/ModuleEvent.php
old mode 100755
new mode 100644
index ccc39f3ea..a4b2783b6
--- a/library/Zend/ModuleManager/ModuleEvent.php
+++ b/library/Zend/ModuleManager/ModuleEvent.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -61,10 +61,13 @@ class ModuleEvent extends Event
     public function setModuleName($moduleName)
     {
         if (!is_string($moduleName)) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects a string as an argument; %s provided'
-                ,__METHOD__, gettype($moduleName)
-            ));
+            throw new Exception\InvalidArgumentException(
+                sprintf(
+                    '%s expects a string as an argument; %s provided',
+                    __METHOD__,
+                    gettype($moduleName)
+                )
+            );
         }
         // Performance tweak, don't add it as param.
         $this->moduleName = $moduleName;
@@ -92,10 +95,13 @@ class ModuleEvent extends Event
     public function setModule($module)
     {
         if (!is_object($module)) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects a module object as an argument; %s provided'
-                ,__METHOD__, gettype($module)
-            ));
+            throw new Exception\InvalidArgumentException(
+                sprintf(
+                    '%s expects a module object as an argument; %s provided',
+                    __METHOD__,
+                    gettype($module)
+                )
+            );
         }
         // Performance tweak, don't add it as param.
         $this->module = $module;
diff --git a/library/Zend/ModuleManager/ModuleManager.php b/library/Zend/ModuleManager/ModuleManager.php
old mode 100755
new mode 100644
index a1207e026..7823052cf
--- a/library/Zend/ModuleManager/ModuleManager.php
+++ b/library/Zend/ModuleManager/ModuleManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -18,6 +18,12 @@ use Zend\EventManager\EventManagerInterface;
  */
 class ModuleManager implements ModuleManagerInterface
 {
+    /**#@+
+     * Reference to Zend\Mvc\MvcEvent::EVENT_BOOTSTRAP
+     */
+    const EVENT_BOOTSTRAP = 'bootstrap';
+    /**#@-*/
+
     /**
      * @var array An array of Module classes of loaded modules
      */
@@ -246,10 +252,13 @@ class ModuleManager implements ModuleManagerInterface
         if (is_array($modules) || $modules instanceof Traversable) {
             $this->modules = $modules;
         } else {
-            throw new Exception\InvalidArgumentException(sprintf(
-                'Parameter to %s\'s %s method must be an array or implement the Traversable interface',
-                __CLASS__, __METHOD__
-            ));
+            throw new Exception\InvalidArgumentException(
+                sprintf(
+                    'Parameter to %s\'s %s method must be an array or implement the Traversable interface',
+                    __CLASS__,
+                    __METHOD__
+                )
+            );
         }
         return $this;
     }
diff --git a/library/Zend/ModuleManager/ModuleManagerInterface.php b/library/Zend/ModuleManager/ModuleManagerInterface.php
old mode 100755
new mode 100644
index 8d3818726..92454c033
--- a/library/Zend/ModuleManager/ModuleManagerInterface.php
+++ b/library/Zend/ModuleManager/ModuleManagerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ModuleManager/README.md b/library/Zend/ModuleManager/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/ModuleManager/composer.json b/library/Zend/ModuleManager/composer.json
old mode 100755
new mode 100644
index db1d6388b..0e7bc7c5c
--- a/library/Zend/ModuleManager/composer.json
+++ b/library/Zend/ModuleManager/composer.json
@@ -22,7 +22,6 @@
         "zendframework/zend-config": "self.version",
         "zendframework/zend-console": "self.version",
         "zendframework/zend-loader": "self.version",
-        "zendframework/zend-mvc": "self.version",
         "zendframework/zend-servicemanager": "self.version"
     },
     "suggest": {
diff --git a/library/Zend/Mvc/Application.php b/library/Zend/Mvc/Application.php
old mode 100755
new mode 100644
index 0dce2db39..d4d8f02ee
--- a/library/Zend/Mvc/Application.php
+++ b/library/Zend/Mvc/Application.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/ApplicationInterface.php b/library/Zend/Mvc/ApplicationInterface.php
old mode 100755
new mode 100644
index c6bc23f32..51bd7eec0
--- a/library/Zend/Mvc/ApplicationInterface.php
+++ b/library/Zend/Mvc/ApplicationInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/CONTRIBUTING.md b/library/Zend/Mvc/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Mvc/Controller/AbstractActionController.php b/library/Zend/Mvc/Controller/AbstractActionController.php
old mode 100755
new mode 100644
index f933b83ed..f0cfb03fe
--- a/library/Zend/Mvc/Controller/AbstractActionController.php
+++ b/library/Zend/Mvc/Controller/AbstractActionController.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/AbstractConsoleController.php b/library/Zend/Mvc/Controller/AbstractConsoleController.php
old mode 100755
new mode 100644
index 8f0a59621..42eb361a0
--- a/library/Zend/Mvc/Controller/AbstractConsoleController.php
+++ b/library/Zend/Mvc/Controller/AbstractConsoleController.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/AbstractController.php b/library/Zend/Mvc/Controller/AbstractController.php
old mode 100755
new mode 100644
index d29ee7dc5..a3616d937
--- a/library/Zend/Mvc/Controller/AbstractController.php
+++ b/library/Zend/Mvc/Controller/AbstractController.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -90,7 +90,6 @@ abstract class AbstractController implements
      */
     abstract public function onDispatch(MvcEvent $e);
 
-
     /**
      * Dispatch a request
      *
diff --git a/library/Zend/Mvc/Controller/AbstractRestfulController.php b/library/Zend/Mvc/Controller/AbstractRestfulController.php
old mode 100755
new mode 100644
index 142185c79..75850cb73
--- a/library/Zend/Mvc/Controller/AbstractRestfulController.php
+++ b/library/Zend/Mvc/Controller/AbstractRestfulController.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Mvc\Controller;
@@ -200,6 +200,7 @@ abstract class AbstractRestfulController extends AbstractController
      *
      * @param  $id
      * @param  $data
+     * @return array
      */
     public function patch($id, $data)
     {
@@ -373,8 +374,8 @@ abstract class AbstractRestfulController extends AbstractController
                     $id = null;
                 }
                 $action = 'head';
-                $this->head($id);
-                $response = $e->getResponse();
+                $headResult = $this->head($id);
+                $response = ($headResult instanceof Response) ? clone $headResult : $e->getResponse();
                 $response->setContent('');
                 $return = $response;
                 break;
diff --git a/library/Zend/Mvc/Controller/ControllerManager.php b/library/Zend/Mvc/Controller/ControllerManager.php
old mode 100755
new mode 100644
index c64de2682..97f428dbf
--- a/library/Zend/Mvc/Controller/ControllerManager.php
+++ b/library/Zend/Mvc/Controller/ControllerManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php b/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
old mode 100755
new mode 100644
index 6c6e3ae47..7f74dfb3f
--- a/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
+++ b/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php b/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php
old mode 100755
new mode 100644
index fffab0ed7..582c45313
--- a/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php
+++ b/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php b/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
old mode 100755
new mode 100644
index 9250ad783..df54816bc
--- a/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
+++ b/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
@@ -4,7 +4,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -126,7 +126,6 @@ class FilePostRedirectGet extends AbstractPlugin
         $post          = $container->post;
         $errors        = $container->errors;
         $isValid       = $container->isValid;
-        $previousFiles = ($container->files) ?: array();
         unset($container->post);
         unset($container->errors);
         unset($container->isValid);
diff --git a/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php b/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
old mode 100755
new mode 100644
index a7b2d3096..9799119d9
--- a/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
+++ b/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/Forward.php b/library/Zend/Mvc/Controller/Plugin/Forward.php
old mode 100755
new mode 100644
index 19389f79b..264ddb6c6
--- a/library/Zend/Mvc/Controller/Plugin/Forward.php
+++ b/library/Zend/Mvc/Controller/Plugin/Forward.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/Identity.php b/library/Zend/Mvc/Controller/Plugin/Identity.php
old mode 100755
new mode 100644
index 5c30d699d..98618e6d5
--- a/library/Zend/Mvc/Controller/Plugin/Identity.php
+++ b/library/Zend/Mvc/Controller/Plugin/Identity.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/Layout.php b/library/Zend/Mvc/Controller/Plugin/Layout.php
old mode 100755
new mode 100644
index ccdd2f217..149630984
--- a/library/Zend/Mvc/Controller/Plugin/Layout.php
+++ b/library/Zend/Mvc/Controller/Plugin/Layout.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/Params.php b/library/Zend/Mvc/Controller/Plugin/Params.php
old mode 100755
new mode 100644
index 7642b05ff..7f2818800
--- a/library/Zend/Mvc/Controller/Plugin/Params.php
+++ b/library/Zend/Mvc/Controller/Plugin/Params.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/PluginInterface.php b/library/Zend/Mvc/Controller/Plugin/PluginInterface.php
old mode 100755
new mode 100644
index ba4d7378a..f4b28d009
--- a/library/Zend/Mvc/Controller/Plugin/PluginInterface.php
+++ b/library/Zend/Mvc/Controller/Plugin/PluginInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php b/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
old mode 100755
new mode 100644
index a2b67efa7..de74783c1
--- a/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
+++ b/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
@@ -4,7 +4,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -52,7 +52,7 @@ class PostRedirectGet extends AbstractPlugin
             $container->post = $request->getPost()->toArray();
             return $this->redirect($redirect, $redirectToUrl);
         } else {
-            if ($container->post !== null) {
+            if (null !== $container->post) {
                 $post = $container->post;
                 unset($container->post);
                 return $post;
@@ -114,14 +114,14 @@ class PostRedirectGet extends AbstractPlugin
              * If the user wants to redirect to a route, the redirector has to come
              * from the plugin manager -- otherwise no router will be injected
              */
-            if ($redirectToUrl === false) {
+            if (false === $redirectToUrl) {
                 throw new RuntimeException('Could not redirect to a route without a router');
             }
 
             $redirector = new Redirect();
         }
 
-        if ($redirectToUrl === false) {
+        if (false === $redirectToUrl) {
             $response = $redirector->toRoute($redirect, $params, $options, $reuseMatchedParams);
             $response->setStatusCode(303);
             return $response;
diff --git a/library/Zend/Mvc/Controller/Plugin/Redirect.php b/library/Zend/Mvc/Controller/Plugin/Redirect.php
old mode 100755
new mode 100644
index 10eb029f4..471f5b561
--- a/library/Zend/Mvc/Controller/Plugin/Redirect.php
+++ b/library/Zend/Mvc/Controller/Plugin/Redirect.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php b/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php
old mode 100755
new mode 100644
index 8f5025ce3..1f114ac57
--- a/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php
+++ b/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php b/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php
old mode 100755
new mode 100644
index a59c6a624..701b3ddd7
--- a/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php
+++ b/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/Plugin/Url.php b/library/Zend/Mvc/Controller/Plugin/Url.php
old mode 100755
new mode 100644
index 4eb313517..583023e29
--- a/library/Zend/Mvc/Controller/Plugin/Url.php
+++ b/library/Zend/Mvc/Controller/Plugin/Url.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Controller/PluginManager.php b/library/Zend/Mvc/Controller/PluginManager.php
old mode 100755
new mode 100644
index ec53bb0c1..6d96cf096
--- a/library/Zend/Mvc/Controller/PluginManager.php
+++ b/library/Zend/Mvc/Controller/PluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/DispatchListener.php b/library/Zend/Mvc/DispatchListener.php
old mode 100755
new mode 100644
index 6a78aa989..a27562422
--- a/library/Zend/Mvc/DispatchListener.php
+++ b/library/Zend/Mvc/DispatchListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -15,7 +15,6 @@ use Zend\EventManager\ListenerAggregateInterface;
 use Zend\Mvc\Exception\InvalidControllerException;
 use Zend\Stdlib\ArrayUtils;
 
-
 /**
  * Default dispatch listener
  *
diff --git a/library/Zend/Mvc/Exception/BadMethodCallException.php b/library/Zend/Mvc/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 11ecc40ae..cb01a8a5e
--- a/library/Zend/Mvc/Exception/BadMethodCallException.php
+++ b/library/Zend/Mvc/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Exception/DomainException.php b/library/Zend/Mvc/Exception/DomainException.php
old mode 100755
new mode 100644
index fdf8dbf13..7490b6465
--- a/library/Zend/Mvc/Exception/DomainException.php
+++ b/library/Zend/Mvc/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Exception/ExceptionInterface.php b/library/Zend/Mvc/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 8fd5cd552..abdd7a32b
--- a/library/Zend/Mvc/Exception/ExceptionInterface.php
+++ b/library/Zend/Mvc/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Exception/InvalidArgumentException.php b/library/Zend/Mvc/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index cc81ee999..fbd05f591
--- a/library/Zend/Mvc/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mvc/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Exception/InvalidControllerException.php b/library/Zend/Mvc/Exception/InvalidControllerException.php
old mode 100755
new mode 100644
index 83e484b8d..166f1fcdb
--- a/library/Zend/Mvc/Exception/InvalidControllerException.php
+++ b/library/Zend/Mvc/Exception/InvalidControllerException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Exception/InvalidPluginException.php b/library/Zend/Mvc/Exception/InvalidPluginException.php
old mode 100755
new mode 100644
index 4961c9ce7..05abc5da4
--- a/library/Zend/Mvc/Exception/InvalidPluginException.php
+++ b/library/Zend/Mvc/Exception/InvalidPluginException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Exception/MissingLocatorException.php b/library/Zend/Mvc/Exception/MissingLocatorException.php
old mode 100755
new mode 100644
index e741a16a0..220c01e4f
--- a/library/Zend/Mvc/Exception/MissingLocatorException.php
+++ b/library/Zend/Mvc/Exception/MissingLocatorException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Exception/RuntimeException.php b/library/Zend/Mvc/Exception/RuntimeException.php
old mode 100755
new mode 100644
index cabf55da8..a959ed7ff
--- a/library/Zend/Mvc/Exception/RuntimeException.php
+++ b/library/Zend/Mvc/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/I18n/DummyTranslator.php b/library/Zend/Mvc/I18n/DummyTranslator.php
old mode 100755
new mode 100644
index 657379f7d..620198175
--- a/library/Zend/Mvc/I18n/DummyTranslator.php
+++ b/library/Zend/Mvc/I18n/DummyTranslator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/I18n/Translator.php b/library/Zend/Mvc/I18n/Translator.php
old mode 100755
new mode 100644
index 71caf83ce..032dbed1a
--- a/library/Zend/Mvc/I18n/Translator.php
+++ b/library/Zend/Mvc/I18n/Translator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/InjectApplicationEventInterface.php b/library/Zend/Mvc/InjectApplicationEventInterface.php
old mode 100755
new mode 100644
index ba3be137d..506b6e2fa
--- a/library/Zend/Mvc/InjectApplicationEventInterface.php
+++ b/library/Zend/Mvc/InjectApplicationEventInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/ModuleRouteListener.php b/library/Zend/Mvc/ModuleRouteListener.php
old mode 100755
new mode 100644
index f9c4dc6ab..659645ea9
--- a/library/Zend/Mvc/ModuleRouteListener.php
+++ b/library/Zend/Mvc/ModuleRouteListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/MvcEvent.php b/library/Zend/Mvc/MvcEvent.php
old mode 100755
new mode 100644
index 896cdbf4f..824b27e37
--- a/library/Zend/Mvc/MvcEvent.php
+++ b/library/Zend/Mvc/MvcEvent.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/README.md b/library/Zend/Mvc/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Mvc/ResponseSender/AbstractResponseSender.php b/library/Zend/Mvc/ResponseSender/AbstractResponseSender.php
old mode 100755
new mode 100644
index edfbd4f80..09a42567e
--- a/library/Zend/Mvc/ResponseSender/AbstractResponseSender.php
+++ b/library/Zend/Mvc/ResponseSender/AbstractResponseSender.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/ResponseSender/ConsoleResponseSender.php b/library/Zend/Mvc/ResponseSender/ConsoleResponseSender.php
old mode 100755
new mode 100644
index c921dfa97..0ed967738
--- a/library/Zend/Mvc/ResponseSender/ConsoleResponseSender.php
+++ b/library/Zend/Mvc/ResponseSender/ConsoleResponseSender.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/ResponseSender/HttpResponseSender.php b/library/Zend/Mvc/ResponseSender/HttpResponseSender.php
old mode 100755
new mode 100644
index 2f07bbd10..5c129e63a
--- a/library/Zend/Mvc/ResponseSender/HttpResponseSender.php
+++ b/library/Zend/Mvc/ResponseSender/HttpResponseSender.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php b/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php
old mode 100755
new mode 100644
index 94833d238..3fe5efb41
--- a/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php
+++ b/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php b/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php
old mode 100755
new mode 100644
index b1a76dd30..de42f9a67
--- a/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php
+++ b/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Mvc\ResponseSender;
 
-
 interface ResponseSenderInterface
 {
     /**
diff --git a/library/Zend/Mvc/ResponseSender/SendResponseEvent.php b/library/Zend/Mvc/ResponseSender/SendResponseEvent.php
old mode 100755
new mode 100644
index 696c22a03..34c2d3b7d
--- a/library/Zend/Mvc/ResponseSender/SendResponseEvent.php
+++ b/library/Zend/Mvc/ResponseSender/SendResponseEvent.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/ResponseSender/SimpleStreamResponseSender.php b/library/Zend/Mvc/ResponseSender/SimpleStreamResponseSender.php
old mode 100755
new mode 100644
index 2cd90c50a..d238232aa
--- a/library/Zend/Mvc/ResponseSender/SimpleStreamResponseSender.php
+++ b/library/Zend/Mvc/ResponseSender/SimpleStreamResponseSender.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/RouteListener.php b/library/Zend/Mvc/RouteListener.php
old mode 100755
new mode 100644
index bc1d0714a..646925d0c
--- a/library/Zend/Mvc/RouteListener.php
+++ b/library/Zend/Mvc/RouteListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Console/Catchall.php b/library/Zend/Mvc/Router/Console/Catchall.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Mvc/Router/Console/RouteInterface.php b/library/Zend/Mvc/Router/Console/RouteInterface.php
old mode 100755
new mode 100644
index b35be0a99..2a3c8c6da
--- a/library/Zend/Mvc/Router/Console/RouteInterface.php
+++ b/library/Zend/Mvc/Router/Console/RouteInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -17,7 +17,7 @@ use Zend\Mvc\Router\RouteInterface as BaseRoute;
 /**
  * Tree specific route interface.
  *
- * @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
  */
 interface RouteInterface extends BaseRoute
diff --git a/library/Zend/Mvc/Router/Console/RouteMatch.php b/library/Zend/Mvc/Router/Console/RouteMatch.php
old mode 100755
new mode 100644
index b5af6a8be..5de4746a4
--- a/library/Zend/Mvc/Router/Console/RouteMatch.php
+++ b/library/Zend/Mvc/Router/Console/RouteMatch.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -17,7 +17,7 @@ use Zend\Mvc\Router\RouteMatch as BaseRouteMatch;
 /**
  * Part route match.
  *
- * @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 RouteMatch extends BaseRouteMatch
diff --git a/library/Zend/Mvc/Router/Console/Simple.php b/library/Zend/Mvc/Router/Console/Simple.php
old mode 100755
new mode 100644
index 7be034b89..18fb6945b
--- a/library/Zend/Mvc/Router/Console/Simple.php
+++ b/library/Zend/Mvc/Router/Console/Simple.php
@@ -52,7 +52,7 @@ class Simple implements RouteInterface
      * @param  array                                    $aliases
      * @param  null|array|Traversable|FilterChain       $filters
      * @param  null|array|Traversable|ValidatorChain    $validators
-     * @throws InvalidArgumentException
+     * @throws Exception\InvalidArgumentException
      */
     public function __construct(
         $routeOrRouteMatcher,
@@ -79,7 +79,7 @@ class Simple implements RouteInterface
      *
      * @see    \Zend\Mvc\Router\RouteInterface::factory()
      * @param  array|Traversable $options
-     * @throws InvalidArgumentException
+     * @throws Exception\InvalidArgumentException
      * @return self
      */
     public static function factory($options = array())
@@ -112,7 +112,6 @@ class Simple implements RouteInterface
             $options['filters'] = null;
         }
 
-
         return new static(
             $options['route'],
             $options['constraints'],
diff --git a/library/Zend/Mvc/Router/Console/SimpleRouteStack.php b/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
old mode 100755
new mode 100644
index a16c03de0..acdb93e27
--- a/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
+++ b/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Exception/ExceptionInterface.php b/library/Zend/Mvc/Router/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index d2eda183e..42e2fad8e
--- a/library/Zend/Mvc/Router/Exception/ExceptionInterface.php
+++ b/library/Zend/Mvc/Router/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php b/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index ab3432c02..c0a727297
--- a/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php
+++ b/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Exception/RuntimeException.php b/library/Zend/Mvc/Router/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 243a4bb68..d722b958f
--- a/library/Zend/Mvc/Router/Exception/RuntimeException.php
+++ b/library/Zend/Mvc/Router/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/Chain.php b/library/Zend/Mvc/Router/Http/Chain.php
old mode 100755
new mode 100644
index 909ca2a10..a4f337334
--- a/library/Zend/Mvc/Router/Http/Chain.php
+++ b/library/Zend/Mvc/Router/Http/Chain.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/Hostname.php b/library/Zend/Mvc/Router/Http/Hostname.php
old mode 100755
new mode 100644
index 0b4de2cef..dab4da843
--- a/library/Zend/Mvc/Router/Http/Hostname.php
+++ b/library/Zend/Mvc/Router/Http/Hostname.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/Literal.php b/library/Zend/Mvc/Router/Http/Literal.php
old mode 100755
new mode 100644
index 528536a0b..2cab258d7
--- a/library/Zend/Mvc/Router/Http/Literal.php
+++ b/library/Zend/Mvc/Router/Http/Literal.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/Method.php b/library/Zend/Mvc/Router/Http/Method.php
old mode 100755
new mode 100644
index 27b3b642f..40694893f
--- a/library/Zend/Mvc/Router/Http/Method.php
+++ b/library/Zend/Mvc/Router/Http/Method.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/Part.php b/library/Zend/Mvc/Router/Http/Part.php
old mode 100755
new mode 100644
index 1c7e4b0b1..bbe92f916
--- a/library/Zend/Mvc/Router/Http/Part.php
+++ b/library/Zend/Mvc/Router/Http/Part.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/Query.php b/library/Zend/Mvc/Router/Http/Query.php
old mode 100755
new mode 100644
index c25964f23..c17ef0cd2
--- a/library/Zend/Mvc/Router/Http/Query.php
+++ b/library/Zend/Mvc/Router/Http/Query.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/Regex.php b/library/Zend/Mvc/Router/Http/Regex.php
old mode 100755
new mode 100644
index d2f703704..fe3e77c20
--- a/library/Zend/Mvc/Router/Http/Regex.php
+++ b/library/Zend/Mvc/Router/Http/Regex.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/RouteInterface.php b/library/Zend/Mvc/Router/Http/RouteInterface.php
old mode 100755
new mode 100644
index a9987758a..50d5f3f43
--- a/library/Zend/Mvc/Router/Http/RouteInterface.php
+++ b/library/Zend/Mvc/Router/Http/RouteInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/RouteMatch.php b/library/Zend/Mvc/Router/Http/RouteMatch.php
old mode 100755
new mode 100644
index 39c882355..f1864f259
--- a/library/Zend/Mvc/Router/Http/RouteMatch.php
+++ b/library/Zend/Mvc/Router/Http/RouteMatch.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/Scheme.php b/library/Zend/Mvc/Router/Http/Scheme.php
old mode 100755
new mode 100644
index 707f8ea11..5ca68af8e
--- a/library/Zend/Mvc/Router/Http/Scheme.php
+++ b/library/Zend/Mvc/Router/Http/Scheme.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/Segment.php b/library/Zend/Mvc/Router/Http/Segment.php
old mode 100755
new mode 100644
index 540e6cf2f..dc8be858c
--- a/library/Zend/Mvc/Router/Http/Segment.php
+++ b/library/Zend/Mvc/Router/Http/Segment.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php b/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
old mode 100755
new mode 100644
index 4caa4e7a4..7b2884cfe
--- a/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
+++ b/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/TreeRouteStack.php b/library/Zend/Mvc/Router/Http/TreeRouteStack.php
old mode 100755
new mode 100644
index da18421d0..091be6974
--- a/library/Zend/Mvc/Router/Http/TreeRouteStack.php
+++ b/library/Zend/Mvc/Router/Http/TreeRouteStack.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/Http/Wildcard.php b/library/Zend/Mvc/Router/Http/Wildcard.php
old mode 100755
new mode 100644
index ce8f6251f..871f91f2d
--- a/library/Zend/Mvc/Router/Http/Wildcard.php
+++ b/library/Zend/Mvc/Router/Http/Wildcard.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/PriorityList.php b/library/Zend/Mvc/Router/PriorityList.php
old mode 100755
new mode 100644
index 889a0a6ed..3fcf8ad73
--- a/library/Zend/Mvc/Router/PriorityList.php
+++ b/library/Zend/Mvc/Router/PriorityList.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/RouteInterface.php b/library/Zend/Mvc/Router/RouteInterface.php
old mode 100755
new mode 100644
index a5374bc3d..c5977bde8
--- a/library/Zend/Mvc/Router/RouteInterface.php
+++ b/library/Zend/Mvc/Router/RouteInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/RouteMatch.php b/library/Zend/Mvc/Router/RouteMatch.php
old mode 100755
new mode 100644
index 94cf57dd7..a78dd454d
--- a/library/Zend/Mvc/Router/RouteMatch.php
+++ b/library/Zend/Mvc/Router/RouteMatch.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/RoutePluginManager.php b/library/Zend/Mvc/Router/RoutePluginManager.php
old mode 100755
new mode 100644
index b3fbca3a5..641c128cb
--- a/library/Zend/Mvc/Router/RoutePluginManager.php
+++ b/library/Zend/Mvc/Router/RoutePluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/RouteStackInterface.php b/library/Zend/Mvc/Router/RouteStackInterface.php
old mode 100755
new mode 100644
index 4eb5b10c8..2470da0b7
--- a/library/Zend/Mvc/Router/RouteStackInterface.php
+++ b/library/Zend/Mvc/Router/RouteStackInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Router/SimpleRouteStack.php b/library/Zend/Mvc/Router/SimpleRouteStack.php
old mode 100755
new mode 100644
index 798bbf539..f8652f172
--- a/library/Zend/Mvc/Router/SimpleRouteStack.php
+++ b/library/Zend/Mvc/Router/SimpleRouteStack.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/SendResponseListener.php b/library/Zend/Mvc/SendResponseListener.php
old mode 100755
new mode 100644
index ea95d4909..380d03998
--- a/library/Zend/Mvc/SendResponseListener.php
+++ b/library/Zend/Mvc/SendResponseListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -71,7 +71,6 @@ class SendResponseListener implements
         return $this->eventManager;
     }
 
-
     /**
      * Attach the aggregate to the specified event manager
      *
diff --git a/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php b/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
old mode 100755
new mode 100644
index 8974d4c38..1463fd5d3
--- a/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
+++ b/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ApplicationFactory.php b/library/Zend/Mvc/Service/ApplicationFactory.php
old mode 100755
new mode 100644
index 6bb3c5843..3b6cb8ee0
--- a/library/Zend/Mvc/Service/ApplicationFactory.php
+++ b/library/Zend/Mvc/Service/ApplicationFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ConfigFactory.php b/library/Zend/Mvc/Service/ConfigFactory.php
old mode 100755
new mode 100644
index 4fbc2bf32..a3683994c
--- a/library/Zend/Mvc/Service/ConfigFactory.php
+++ b/library/Zend/Mvc/Service/ConfigFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ConsoleAdapterFactory.php b/library/Zend/Mvc/Service/ConsoleAdapterFactory.php
old mode 100755
new mode 100644
index 79ffa399c..0258653d4
--- a/library/Zend/Mvc/Service/ConsoleAdapterFactory.php
+++ b/library/Zend/Mvc/Service/ConsoleAdapterFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ConsoleViewManagerFactory.php b/library/Zend/Mvc/Service/ConsoleViewManagerFactory.php
old mode 100755
new mode 100644
index 1bd8c9394..e3dfc6653
--- a/library/Zend/Mvc/Service/ConsoleViewManagerFactory.php
+++ b/library/Zend/Mvc/Service/ConsoleViewManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ControllerLoaderFactory.php b/library/Zend/Mvc/Service/ControllerLoaderFactory.php
old mode 100755
new mode 100644
index b55729077..cf5cda2d0
--- a/library/Zend/Mvc/Service/ControllerLoaderFactory.php
+++ b/library/Zend/Mvc/Service/ControllerLoaderFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php b/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
old mode 100755
new mode 100644
index 048f9a353..adcfac724
--- a/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
+++ b/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php b/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php
old mode 100755
new mode 100644
index 75bf207d9..625468f65
--- a/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php
+++ b/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/DiFactory.php b/library/Zend/Mvc/Service/DiFactory.php
old mode 100755
new mode 100644
index 4bc115668..9ea5ceaba
--- a/library/Zend/Mvc/Service/DiFactory.php
+++ b/library/Zend/Mvc/Service/DiFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/DiServiceInitializerFactory.php b/library/Zend/Mvc/Service/DiServiceInitializerFactory.php
old mode 100755
new mode 100644
index 190e67371..2a2fb1904
--- a/library/Zend/Mvc/Service/DiServiceInitializerFactory.php
+++ b/library/Zend/Mvc/Service/DiServiceInitializerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php b/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php
old mode 100755
new mode 100644
index eb6df3d51..38eaa8978
--- a/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php
+++ b/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -87,7 +87,6 @@ class DiStrictAbstractServiceFactory extends Di implements AbstractFactoryInterf
             throw new Exception\InvalidServiceNameException('Service "' . $requestedName . '" is not whitelisted');
         }
 
-
         if ($serviceLocator instanceof AbstractPluginManager) {
             /* @var $serviceLocator AbstractPluginManager */
             $this->serviceLocator = $serviceLocator->getServiceLocator();
diff --git a/library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.php b/library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.php
old mode 100755
new mode 100644
index 70100c297..54dd3335a
--- a/library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.php
+++ b/library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/EventManagerFactory.php b/library/Zend/Mvc/Service/EventManagerFactory.php
old mode 100755
new mode 100644
index 7941cb761..a806e104b
--- a/library/Zend/Mvc/Service/EventManagerFactory.php
+++ b/library/Zend/Mvc/Service/EventManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/FilterManagerFactory.php b/library/Zend/Mvc/Service/FilterManagerFactory.php
old mode 100755
new mode 100644
index a6a53603d..d9a9e1722
--- a/library/Zend/Mvc/Service/FilterManagerFactory.php
+++ b/library/Zend/Mvc/Service/FilterManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/FormElementManagerFactory.php b/library/Zend/Mvc/Service/FormElementManagerFactory.php
old mode 100755
new mode 100644
index fd5400f30..e33dd87eb
--- a/library/Zend/Mvc/Service/FormElementManagerFactory.php
+++ b/library/Zend/Mvc/Service/FormElementManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/HttpViewManagerFactory.php b/library/Zend/Mvc/Service/HttpViewManagerFactory.php
old mode 100755
new mode 100644
index 928c3da5b..5c61bad97
--- a/library/Zend/Mvc/Service/HttpViewManagerFactory.php
+++ b/library/Zend/Mvc/Service/HttpViewManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/HydratorManagerFactory.php b/library/Zend/Mvc/Service/HydratorManagerFactory.php
old mode 100755
new mode 100644
index 561d00c75..76c6da077
--- a/library/Zend/Mvc/Service/HydratorManagerFactory.php
+++ b/library/Zend/Mvc/Service/HydratorManagerFactory.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Mvc\Service;
 
-
 class HydratorManagerFactory extends AbstractPluginManagerFactory
 {
     const PLUGIN_MANAGER_CLASS = 'Zend\Stdlib\Hydrator\HydratorPluginManager';
diff --git a/library/Zend/Mvc/Service/InputFilterManagerFactory.php b/library/Zend/Mvc/Service/InputFilterManagerFactory.php
old mode 100755
new mode 100644
index 61cf6888c..14806f7f8
--- a/library/Zend/Mvc/Service/InputFilterManagerFactory.php
+++ b/library/Zend/Mvc/Service/InputFilterManagerFactory.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Mvc\Service;
 
-
 class InputFilterManagerFactory extends AbstractPluginManagerFactory
 {
     const PLUGIN_MANAGER_CLASS = 'Zend\InputFilter\InputFilterPluginManager';
diff --git a/library/Zend/Mvc/Service/LogProcessorManagerFactory.php b/library/Zend/Mvc/Service/LogProcessorManagerFactory.php
old mode 100755
new mode 100644
index 833906863..fa3f884e8
--- a/library/Zend/Mvc/Service/LogProcessorManagerFactory.php
+++ b/library/Zend/Mvc/Service/LogProcessorManagerFactory.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Mvc\Service;
 
-
 class LogProcessorManagerFactory extends AbstractPluginManagerFactory
 {
     const PLUGIN_MANAGER_CLASS = 'Zend\Log\ProcessorPluginManager';
diff --git a/library/Zend/Mvc/Service/LogWriterManagerFactory.php b/library/Zend/Mvc/Service/LogWriterManagerFactory.php
old mode 100755
new mode 100644
index a9e39a287..b858dbe3c
--- a/library/Zend/Mvc/Service/LogWriterManagerFactory.php
+++ b/library/Zend/Mvc/Service/LogWriterManagerFactory.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Mvc\Service;
 
-
 class LogWriterManagerFactory extends AbstractPluginManagerFactory
 {
     const PLUGIN_MANAGER_CLASS = 'Zend\Log\WriterPluginManager';
diff --git a/library/Zend/Mvc/Service/ModuleManagerFactory.php b/library/Zend/Mvc/Service/ModuleManagerFactory.php
old mode 100755
new mode 100644
index a47b89e41..2532658c2
--- a/library/Zend/Mvc/Service/ModuleManagerFactory.php
+++ b/library/Zend/Mvc/Service/ModuleManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php b/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
old mode 100755
new mode 100644
index 2f8db4c95..182a53a40
--- a/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
+++ b/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/RequestFactory.php b/library/Zend/Mvc/Service/RequestFactory.php
old mode 100755
new mode 100644
index 84201bd56..3c5d4a5c1
--- a/library/Zend/Mvc/Service/RequestFactory.php
+++ b/library/Zend/Mvc/Service/RequestFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ResponseFactory.php b/library/Zend/Mvc/Service/ResponseFactory.php
old mode 100755
new mode 100644
index 9f7b74a56..707e6c9dd
--- a/library/Zend/Mvc/Service/ResponseFactory.php
+++ b/library/Zend/Mvc/Service/ResponseFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/RoutePluginManagerFactory.php b/library/Zend/Mvc/Service/RoutePluginManagerFactory.php
old mode 100755
new mode 100644
index c37f606fc..2f24b8581
--- a/library/Zend/Mvc/Service/RoutePluginManagerFactory.php
+++ b/library/Zend/Mvc/Service/RoutePluginManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/RouterFactory.php b/library/Zend/Mvc/Service/RouterFactory.php
old mode 100755
new mode 100644
index 18f2bcb94..462ec2101
--- a/library/Zend/Mvc/Service/RouterFactory.php
+++ b/library/Zend/Mvc/Service/RouterFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php b/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php
old mode 100755
new mode 100644
index aee001c54..11d1653ca
--- a/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php
+++ b/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ServiceListenerFactory.php b/library/Zend/Mvc/Service/ServiceListenerFactory.php
old mode 100755
new mode 100644
index 6686a4dca..2d3acb46c
--- a/library/Zend/Mvc/Service/ServiceListenerFactory.php
+++ b/library/Zend/Mvc/Service/ServiceListenerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ServiceManagerConfig.php b/library/Zend/Mvc/Service/ServiceManagerConfig.php
old mode 100755
new mode 100644
index dc724027c..921d4f743
--- a/library/Zend/Mvc/Service/ServiceManagerConfig.php
+++ b/library/Zend/Mvc/Service/ServiceManagerConfig.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/TranslatorServiceFactory.php b/library/Zend/Mvc/Service/TranslatorServiceFactory.php
old mode 100755
new mode 100644
index 6e49e0673..b819f3ede
--- a/library/Zend/Mvc/Service/TranslatorServiceFactory.php
+++ b/library/Zend/Mvc/Service/TranslatorServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ValidatorManagerFactory.php b/library/Zend/Mvc/Service/ValidatorManagerFactory.php
old mode 100755
new mode 100644
index 0fe09f0c8..a270f8fc3
--- a/library/Zend/Mvc/Service/ValidatorManagerFactory.php
+++ b/library/Zend/Mvc/Service/ValidatorManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ViewFeedRendererFactory.php b/library/Zend/Mvc/Service/ViewFeedRendererFactory.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php b/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php
old mode 100755
new mode 100644
index 56ab2556a..2e7c8d20b
--- a/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php
+++ b/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ViewHelperManagerFactory.php b/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
old mode 100755
new mode 100644
index 30757df15..969fca2f5
--- a/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
+++ b/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ViewJsonRendererFactory.php b/library/Zend/Mvc/Service/ViewJsonRendererFactory.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php b/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php
old mode 100755
new mode 100644
index 63be77d1d..f0935de5b
--- a/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php
+++ b/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ViewManagerFactory.php b/library/Zend/Mvc/Service/ViewManagerFactory.php
old mode 100755
new mode 100644
index 008eb4a22..548e530f5
--- a/library/Zend/Mvc/Service/ViewManagerFactory.php
+++ b/library/Zend/Mvc/Service/ViewManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ViewResolverFactory.php b/library/Zend/Mvc/Service/ViewResolverFactory.php
old mode 100755
new mode 100644
index 166ce1a24..fdb8f1e2f
--- a/library/Zend/Mvc/Service/ViewResolverFactory.php
+++ b/library/Zend/Mvc/Service/ViewResolverFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php b/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php
old mode 100755
new mode 100644
index 1df38dbd9..ca49219a2
--- a/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php
+++ b/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php b/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php
old mode 100755
new mode 100644
index 8c028f76c..dcf6ddd4b
--- a/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php
+++ b/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Console/CreateViewModelListener.php b/library/Zend/Mvc/View/Console/CreateViewModelListener.php
old mode 100755
new mode 100644
index 91eaf6d62..0403d3a44
--- a/library/Zend/Mvc/View/Console/CreateViewModelListener.php
+++ b/library/Zend/Mvc/View/Console/CreateViewModelListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php b/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php
old mode 100755
new mode 100644
index dd7d60001..fb322986f
--- a/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php
+++ b/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Console/ExceptionStrategy.php b/library/Zend/Mvc/View/Console/ExceptionStrategy.php
old mode 100755
new mode 100644
index 380e61431..f4f21ff51
--- a/library/Zend/Mvc/View/Console/ExceptionStrategy.php
+++ b/library/Zend/Mvc/View/Console/ExceptionStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php b/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php
old mode 100755
new mode 100644
index 18919365f..5631105ac
--- a/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php
+++ b/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Console/InjectViewModelListener.php b/library/Zend/Mvc/View/Console/InjectViewModelListener.php
old mode 100755
new mode 100644
index 985a1010f..30895cb80
--- a/library/Zend/Mvc/View/Console/InjectViewModelListener.php
+++ b/library/Zend/Mvc/View/Console/InjectViewModelListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php b/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
old mode 100755
new mode 100644
index af64e134e..f30c80f0e
--- a/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
+++ b/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Console/ViewManager.php b/library/Zend/Mvc/View/Console/ViewManager.php
old mode 100755
new mode 100644
index 2ca26438f..2fabf2513
--- a/library/Zend/Mvc/View/Console/ViewManager.php
+++ b/library/Zend/Mvc/View/Console/ViewManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Http/CreateViewModelListener.php b/library/Zend/Mvc/View/Http/CreateViewModelListener.php
old mode 100755
new mode 100644
index d2282eb2e..77b2029e3
--- a/library/Zend/Mvc/View/Http/CreateViewModelListener.php
+++ b/library/Zend/Mvc/View/Http/CreateViewModelListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php b/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php
old mode 100755
new mode 100644
index 0407d1a65..e3db51edc
--- a/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php
+++ b/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -77,7 +77,8 @@ class DefaultRenderingStrategy extends AbstractListenerAggregate
      * Render the view
      *
      * @param  MvcEvent $e
-     * @return Response
+     * @return Response|null
+     * @throws \Exception
      */
     public function render(MvcEvent $e)
     {
diff --git a/library/Zend/Mvc/View/Http/ExceptionStrategy.php b/library/Zend/Mvc/View/Http/ExceptionStrategy.php
old mode 100755
new mode 100644
index 1f888cd6d..dc99f5e82
--- a/library/Zend/Mvc/View/Http/ExceptionStrategy.php
+++ b/library/Zend/Mvc/View/Http/ExceptionStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php b/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php
old mode 100755
new mode 100644
index f68f0308d..79228930d
--- a/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php
+++ b/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Http/InjectTemplateListener.php b/library/Zend/Mvc/View/Http/InjectTemplateListener.php
old mode 100755
new mode 100644
index abb16ac89..1decc4c38
--- a/library/Zend/Mvc/View/Http/InjectTemplateListener.php
+++ b/library/Zend/Mvc/View/Http/InjectTemplateListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Http/InjectViewModelListener.php b/library/Zend/Mvc/View/Http/InjectViewModelListener.php
old mode 100755
new mode 100644
index 2115984a6..dc9bd7c56
--- a/library/Zend/Mvc/View/Http/InjectViewModelListener.php
+++ b/library/Zend/Mvc/View/Http/InjectViewModelListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php b/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php
old mode 100755
new mode 100644
index 718e774df..951d4f75e
--- a/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php
+++ b/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/View/Http/ViewManager.php b/library/Zend/Mvc/View/Http/ViewManager.php
old mode 100755
new mode 100644
index 168962fa3..3216d0256
--- a/library/Zend/Mvc/View/Http/ViewManager.php
+++ b/library/Zend/Mvc/View/Http/ViewManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -364,6 +364,9 @@ class ViewManager extends AbstractListenerAggregate
      * is a ListenerAggregate, attach it to the view, at priority 100. This
      * latter allows each to trigger before the default mvc rendering strategy,
      * and for them to trigger in the order they are registered.
+     *
+     * @param EventManagerInterface $events
+     * @return void
      */
     protected function registerMvcRenderingStrategies(EventManagerInterface $events)
     {
diff --git a/library/Zend/Mvc/View/SendResponseListener.php b/library/Zend/Mvc/View/SendResponseListener.php
old mode 100755
new mode 100644
index 275fb8c59..0e1ebb846
--- a/library/Zend/Mvc/View/SendResponseListener.php
+++ b/library/Zend/Mvc/View/SendResponseListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Mvc/composer.json b/library/Zend/Mvc/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Navigation/AbstractContainer.php b/library/Zend/Navigation/AbstractContainer.php
old mode 100755
new mode 100644
index 1308803fc..718c85556
--- a/library/Zend/Navigation/AbstractContainer.php
+++ b/library/Zend/Navigation/AbstractContainer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/CONTRIBUTING.md b/library/Zend/Navigation/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Navigation/Exception/BadMethodCallException.php b/library/Zend/Navigation/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 3e5f6600e..af2be2684
--- a/library/Zend/Navigation/Exception/BadMethodCallException.php
+++ b/library/Zend/Navigation/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/Exception/DomainException.php b/library/Zend/Navigation/Exception/DomainException.php
old mode 100755
new mode 100644
index ce106f672..11dafd28c
--- a/library/Zend/Navigation/Exception/DomainException.php
+++ b/library/Zend/Navigation/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/Exception/ExceptionInterface.php b/library/Zend/Navigation/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index f921eb48c..dc841acf9
--- a/library/Zend/Navigation/Exception/ExceptionInterface.php
+++ b/library/Zend/Navigation/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/Exception/InvalidArgumentException.php b/library/Zend/Navigation/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 45715b4ef..5e36fa5b8
--- a/library/Zend/Navigation/Exception/InvalidArgumentException.php
+++ b/library/Zend/Navigation/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/Exception/OutOfBoundsException.php b/library/Zend/Navigation/Exception/OutOfBoundsException.php
old mode 100755
new mode 100644
index 97854a490..edfd5c793
--- a/library/Zend/Navigation/Exception/OutOfBoundsException.php
+++ b/library/Zend/Navigation/Exception/OutOfBoundsException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/Navigation.php b/library/Zend/Navigation/Navigation.php
old mode 100755
new mode 100644
index dede898e6..2c2dd5b51
--- a/library/Zend/Navigation/Navigation.php
+++ b/library/Zend/Navigation/Navigation.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/Page/AbstractPage.php b/library/Zend/Navigation/Page/AbstractPage.php
old mode 100755
new mode 100644
index d64a6d539..f178d26db
--- a/library/Zend/Navigation/Page/AbstractPage.php
+++ b/library/Zend/Navigation/Page/AbstractPage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/Page/Mvc.php b/library/Zend/Navigation/Page/Mvc.php
old mode 100755
new mode 100644
index 449b301f9..569caedf7
--- a/library/Zend/Navigation/Page/Mvc.php
+++ b/library/Zend/Navigation/Page/Mvc.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/Page/Uri.php b/library/Zend/Navigation/Page/Uri.php
old mode 100755
new mode 100644
index ebdc0f4e1..e07c886d1
--- a/library/Zend/Navigation/Page/Uri.php
+++ b/library/Zend/Navigation/Page/Uri.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/README.md b/library/Zend/Navigation/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Navigation/Service/AbstractNavigationFactory.php b/library/Zend/Navigation/Service/AbstractNavigationFactory.php
old mode 100755
new mode 100644
index d25678d46..650b603c3
--- a/library/Zend/Navigation/Service/AbstractNavigationFactory.php
+++ b/library/Zend/Navigation/Service/AbstractNavigationFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/Service/ConstructedNavigationFactory.php b/library/Zend/Navigation/Service/ConstructedNavigationFactory.php
old mode 100755
new mode 100644
index 363c2b2e7..7c3e281cd
--- a/library/Zend/Navigation/Service/ConstructedNavigationFactory.php
+++ b/library/Zend/Navigation/Service/ConstructedNavigationFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/Service/DefaultNavigationFactory.php b/library/Zend/Navigation/Service/DefaultNavigationFactory.php
old mode 100755
new mode 100644
index 771666d78..3e06179c3
--- a/library/Zend/Navigation/Service/DefaultNavigationFactory.php
+++ b/library/Zend/Navigation/Service/DefaultNavigationFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/View/HelperConfig.php b/library/Zend/Navigation/View/HelperConfig.php
old mode 100755
new mode 100644
index af3c2d616..f831691f2
--- a/library/Zend/Navigation/View/HelperConfig.php
+++ b/library/Zend/Navigation/View/HelperConfig.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Navigation/composer.json b/library/Zend/Navigation/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Paginator/Adapter/AdapterInterface.php b/library/Zend/Paginator/Adapter/AdapterInterface.php
old mode 100755
new mode 100644
index faf74e260..513517e9c
--- a/library/Zend/Paginator/Adapter/AdapterInterface.php
+++ b/library/Zend/Paginator/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/ArrayAdapter.php b/library/Zend/Paginator/Adapter/ArrayAdapter.php
old mode 100755
new mode 100644
index a713b19d5..90a5dc16d
--- a/library/Zend/Paginator/Adapter/ArrayAdapter.php
+++ b/library/Zend/Paginator/Adapter/ArrayAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/Callback.php b/library/Zend/Paginator/Adapter/Callback.php
old mode 100755
new mode 100644
index 2bf1a0cbb..412736b9c
--- a/library/Zend/Paginator/Adapter/Callback.php
+++ b/library/Zend/Paginator/Adapter/Callback.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/DbSelect.php b/library/Zend/Paginator/Adapter/DbSelect.php
old mode 100755
new mode 100644
index 29f7317b3..4739569b8
--- a/library/Zend/Paginator/Adapter/DbSelect.php
+++ b/library/Zend/Paginator/Adapter/DbSelect.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/DbTableGateway.php b/library/Zend/Paginator/Adapter/DbTableGateway.php
old mode 100755
new mode 100644
index 447f7726b..8f2b30f75
--- a/library/Zend/Paginator/Adapter/DbTableGateway.php
+++ b/library/Zend/Paginator/Adapter/DbTableGateway.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php b/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 492a1fda4..71d02ea0c
--- a/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php b/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index ed1ade69e..f8b76a87c
--- a/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php
+++ b/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/Exception/RuntimeException.php b/library/Zend/Paginator/Adapter/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 43b0c1de5..85868d2c6
--- a/library/Zend/Paginator/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/Paginator/Adapter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php b/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index c7d4c0309..bf956f584
--- a/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php
+++ b/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/Iterator.php b/library/Zend/Paginator/Adapter/Iterator.php
old mode 100755
new mode 100644
index 8b2e760a9..ebbc1d7fb
--- a/library/Zend/Paginator/Adapter/Iterator.php
+++ b/library/Zend/Paginator/Adapter/Iterator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -16,7 +16,7 @@ class Iterator implements AdapterInterface
     /**
      * Iterator which implements Countable
      *
-     * @var Iterator
+     * @var \Iterator
      */
     protected $iterator = null;
 
diff --git a/library/Zend/Paginator/Adapter/Null.php b/library/Zend/Paginator/Adapter/Null.php
old mode 100755
new mode 100644
index 557c03c88..a1a9cfcf5
--- a/library/Zend/Paginator/Adapter/Null.php
+++ b/library/Zend/Paginator/Adapter/Null.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/Service/CallbackFactory.php b/library/Zend/Paginator/Adapter/Service/CallbackFactory.php
old mode 100755
new mode 100644
index 97fdb747f..e59d6509d
--- a/library/Zend/Paginator/Adapter/Service/CallbackFactory.php
+++ b/library/Zend/Paginator/Adapter/Service/CallbackFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/Service/DbSelectFactory.php b/library/Zend/Paginator/Adapter/Service/DbSelectFactory.php
old mode 100755
new mode 100644
index dea2dc370..41a2a1847
--- a/library/Zend/Paginator/Adapter/Service/DbSelectFactory.php
+++ b/library/Zend/Paginator/Adapter/Service/DbSelectFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Adapter/Service/DbTableGatewayFactory.php b/library/Zend/Paginator/Adapter/Service/DbTableGatewayFactory.php
old mode 100755
new mode 100644
index 7c8f60f5e..e849fec57
--- a/library/Zend/Paginator/Adapter/Service/DbTableGatewayFactory.php
+++ b/library/Zend/Paginator/Adapter/Service/DbTableGatewayFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/AdapterAggregateInterface.php b/library/Zend/Paginator/AdapterAggregateInterface.php
old mode 100755
new mode 100644
index 4b50b4580..da00a86ee
--- a/library/Zend/Paginator/AdapterAggregateInterface.php
+++ b/library/Zend/Paginator/AdapterAggregateInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/AdapterPluginManager.php b/library/Zend/Paginator/AdapterPluginManager.php
old mode 100755
new mode 100644
index df9405d98..d9c070795
--- a/library/Zend/Paginator/AdapterPluginManager.php
+++ b/library/Zend/Paginator/AdapterPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/CONTRIBUTING.md b/library/Zend/Paginator/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Paginator/Exception/ExceptionInterface.php b/library/Zend/Paginator/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index ccf562133..25f5a3bb5
--- a/library/Zend/Paginator/Exception/ExceptionInterface.php
+++ b/library/Zend/Paginator/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Exception/InvalidArgumentException.php b/library/Zend/Paginator/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index d5b62aaff..1e158e982
--- a/library/Zend/Paginator/Exception/InvalidArgumentException.php
+++ b/library/Zend/Paginator/Exception/InvalidArgumentException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Paginator\Exception;
 
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Paginator/Exception/RuntimeException.php b/library/Zend/Paginator/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 00bb7f74a..06401f0fa
--- a/library/Zend/Paginator/Exception/RuntimeException.php
+++ b/library/Zend/Paginator/Exception/RuntimeException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Paginator\Exception;
 
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Paginator/Exception/UnexpectedValueException.php b/library/Zend/Paginator/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index d655f29bd..42d1736db
--- a/library/Zend/Paginator/Exception/UnexpectedValueException.php
+++ b/library/Zend/Paginator/Exception/UnexpectedValueException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Paginator\Exception;
 
-class UnexpectedValueException
-    extends \UnexpectedValueException
-    implements ExceptionInterface
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Paginator/Factory.php b/library/Zend/Paginator/Factory.php
old mode 100755
new mode 100644
index 790f51b71..afba3da79
--- a/library/Zend/Paginator/Factory.php
+++ b/library/Zend/Paginator/Factory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/Paginator.php b/library/Zend/Paginator/Paginator.php
old mode 100755
new mode 100644
index 93dcc423f..03b73caa4
--- a/library/Zend/Paginator/Paginator.php
+++ b/library/Zend/Paginator/Paginator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -523,8 +523,9 @@ class Paginator implements Countable, IteratorAggregate
         $itemNumber = $this->normalizeItemNumber($itemNumber);
 
         if ($itemNumber > $itemCount) {
-            throw new Exception\InvalidArgumentException('Page ' . $pageNumber . ' does not'
-                                             . ' contain item number ' . $itemNumber);
+            throw new Exception\InvalidArgumentException(
+                "Page {$pageNumber} does not contain item number {$itemNumber}"
+            );
         }
 
         return $page[$itemNumber - 1];
diff --git a/library/Zend/Paginator/README.md b/library/Zend/Paginator/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Paginator/ScrollingStyle/All.php b/library/Zend/Paginator/ScrollingStyle/All.php
old mode 100755
new mode 100644
index c22d807a1..c7f44b828
--- a/library/Zend/Paginator/ScrollingStyle/All.php
+++ b/library/Zend/Paginator/ScrollingStyle/All.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/ScrollingStyle/Elastic.php b/library/Zend/Paginator/ScrollingStyle/Elastic.php
old mode 100755
new mode 100644
index 07d0e3447..8183ae2e7
--- a/library/Zend/Paginator/ScrollingStyle/Elastic.php
+++ b/library/Zend/Paginator/ScrollingStyle/Elastic.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/ScrollingStyle/Jumping.php b/library/Zend/Paginator/ScrollingStyle/Jumping.php
old mode 100755
new mode 100644
index 705d2e9e1..f560c9b71
--- a/library/Zend/Paginator/ScrollingStyle/Jumping.php
+++ b/library/Zend/Paginator/ScrollingStyle/Jumping.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php b/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
old mode 100755
new mode 100644
index eeb92c923..3bf7c9794
--- a/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
+++ b/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/ScrollingStyle/Sliding.php b/library/Zend/Paginator/ScrollingStyle/Sliding.php
old mode 100755
new mode 100644
index 57fed0387..00ecf508e
--- a/library/Zend/Paginator/ScrollingStyle/Sliding.php
+++ b/library/Zend/Paginator/ScrollingStyle/Sliding.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/ScrollingStylePluginManager.php b/library/Zend/Paginator/ScrollingStylePluginManager.php
old mode 100755
new mode 100644
index 09e78335a..8c6b4bed9
--- a/library/Zend/Paginator/ScrollingStylePluginManager.php
+++ b/library/Zend/Paginator/ScrollingStylePluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Paginator/SerializableLimitIterator.php b/library/Zend/Paginator/SerializableLimitIterator.php
old mode 100755
new mode 100644
index 46755a158..c67b2f8fc
--- a/library/Zend/Paginator/SerializableLimitIterator.php
+++ b/library/Zend/Paginator/SerializableLimitIterator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -38,7 +38,7 @@ class SerializableLimitIterator extends LimitIterator implements Serializable, A
      * @param int $count Maximum number of elements to show or -1 for all
      * @see LimitIterator::__construct
      */
-    public function __construct(Iterator $it, $offset=0, $count=-1)
+    public function __construct(Iterator $it, $offset = 0, $count = -1)
     {
         parent::__construct($it, $offset, $count);
         $this->offset = $offset;
diff --git a/library/Zend/Paginator/composer.json b/library/Zend/Paginator/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Permissions/Acl/Acl.php b/library/Zend/Permissions/Acl/Acl.php
old mode 100755
new mode 100644
index b0365ec8e..571e37bb8
--- a/library/Zend/Permissions/Acl/Acl.php
+++ b/library/Zend/Permissions/Acl/Acl.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -108,7 +108,6 @@ class Acl implements AclInterface
             );
         }
 
-
         $this->getRoleRegistry()->add($role, $parents);
 
         return $this;
@@ -522,8 +521,13 @@ class Acl implements AclInterface
      * @throws Exception\InvalidArgumentException
      * @return Acl Provides a fluent interface
      */
-    public function setRule($operation, $type, $roles = null, $resources = null,
-                            $privileges = null, Assertion\AssertionInterface $assert = null
+    public function setRule(
+        $operation,
+        $type,
+        $roles = null,
+        $resources = null,
+        $privileges = null,
+        Assertion\AssertionInterface $assert = null
     ) {
         // ensure that the rule type is valid; normalize input to uppercase
         $type = strtoupper($type);
@@ -632,16 +636,12 @@ class Acl implements AclInterface
                                 continue;
                             }
 
-                            if (isset($rules['allPrivileges']['type']) &&
-                                $type === $rules['allPrivileges']['type']
-                            ) {
+                            if (isset($rules['allPrivileges']['type']) && $type === $rules['allPrivileges']['type']) {
                                 unset($rules['allPrivileges']);
                             }
                         } else {
                             foreach ($privileges as $privilege) {
-                                if (isset($rules['byPrivilegeId'][$privilege]) &&
-                                    $type === $rules['byPrivilegeId'][$privilege]['type']
-                                ) {
+                                if (isset($rules['byPrivilegeId'][$privilege]) && $type === $rules['byPrivilegeId'][$privilege]['type']) {
                                     unset($rules['byPrivilegeId'][$privilege]);
                                 }
                             }
@@ -926,8 +926,11 @@ class Acl implements AclInterface
      * @return bool|null
      * @throws Exception\RuntimeException
      */
-    protected function roleDFSVisitOnePrivilege(Role\RoleInterface $role, Resource\ResourceInterface $resource = null,
-                                                $privilege = null, &$dfs = null
+    protected function roleDFSVisitOnePrivilege(
+        Role\RoleInterface $role,
+        Resource\ResourceInterface $resource = null,
+        $privilege = null,
+        &$dfs = null
     ) {
         if (null === $privilege) {
             /**
@@ -1055,7 +1058,6 @@ class Acl implements AclInterface
             $visitor =& $this->rules['byResourceId'][$resourceId];
         } while (false);
 
-
         // follow $role
         if (null === $role) {
             if (!isset($visitor['allRoles'])) {
diff --git a/library/Zend/Permissions/Acl/AclInterface.php b/library/Zend/Permissions/Acl/AclInterface.php
old mode 100755
new mode 100644
index 2f730d19b..6e0b9f2cf
--- a/library/Zend/Permissions/Acl/AclInterface.php
+++ b/library/Zend/Permissions/Acl/AclInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Acl/Assertion/AssertionAggregate.php b/library/Zend/Permissions/Acl/Assertion/AssertionAggregate.php
old mode 100755
new mode 100644
index 9bd247938..4821e56a4
--- a/library/Zend/Permissions/Acl/Assertion/AssertionAggregate.php
+++ b/library/Zend/Permissions/Acl/Assertion/AssertionAggregate.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Permissions\Acl\Assertion;
diff --git a/library/Zend/Permissions/Acl/Assertion/AssertionInterface.php b/library/Zend/Permissions/Acl/Assertion/AssertionInterface.php
old mode 100755
new mode 100644
index f43823a23..f963c93d1
--- a/library/Zend/Permissions/Acl/Assertion/AssertionInterface.php
+++ b/library/Zend/Permissions/Acl/Assertion/AssertionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Acl/Assertion/AssertionManager.php b/library/Zend/Permissions/Acl/Assertion/AssertionManager.php
old mode 100755
new mode 100644
index 606ab265a..69e35e8f8
--- a/library/Zend/Permissions/Acl/Assertion/AssertionManager.php
+++ b/library/Zend/Permissions/Acl/Assertion/AssertionManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Permissions\Acl\Assertion;
@@ -28,9 +28,12 @@ class AssertionManager extends AbstractPluginManager
     public function validatePlugin($plugin)
     {
         if (! $plugin instanceof AssertionInterface) {
-            throw new InvalidArgumentException(sprintf('Plugin of type %s is invalid; must implement
-                Zend\Permissions\Acl\Assertion\AssertionInterface',
-                (is_object($plugin) ? get_class($plugin) : gettype($plugin))));
+            throw new InvalidArgumentException(
+                sprintf(
+                    'Plugin of type %s is invalid; must implement Zend\Permissions\Acl\Assertion\AssertionInterface',
+                    (is_object($plugin) ? get_class($plugin) : gettype($plugin))
+                )
+            );
         }
 
         return true;
diff --git a/library/Zend/Permissions/Acl/Assertion/Exception/InvalidAssertionException.php b/library/Zend/Permissions/Acl/Assertion/Exception/InvalidAssertionException.php
old mode 100755
new mode 100644
diff --git a/library/Zend/Permissions/Acl/CONTRIBUTING.md b/library/Zend/Permissions/Acl/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Permissions/Acl/Exception/ExceptionInterface.php b/library/Zend/Permissions/Acl/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 1fc28d8b8..78c92c633
--- a/library/Zend/Permissions/Acl/Exception/ExceptionInterface.php
+++ b/library/Zend/Permissions/Acl/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Acl/Exception/InvalidArgumentException.php b/library/Zend/Permissions/Acl/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 89b377805..0ca63111e
--- a/library/Zend/Permissions/Acl/Exception/InvalidArgumentException.php
+++ b/library/Zend/Permissions/Acl/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Acl/Exception/RuntimeException.php b/library/Zend/Permissions/Acl/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 0def073ac..db23864bf
--- a/library/Zend/Permissions/Acl/Exception/RuntimeException.php
+++ b/library/Zend/Permissions/Acl/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Acl/README.md b/library/Zend/Permissions/Acl/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Permissions/Acl/Resource/GenericResource.php b/library/Zend/Permissions/Acl/Resource/GenericResource.php
old mode 100755
new mode 100644
index 019e28718..2b45d6bd9
--- a/library/Zend/Permissions/Acl/Resource/GenericResource.php
+++ b/library/Zend/Permissions/Acl/Resource/GenericResource.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Acl/Resource/ResourceInterface.php b/library/Zend/Permissions/Acl/Resource/ResourceInterface.php
old mode 100755
new mode 100644
index f761c2ed7..4ae5b40ac
--- a/library/Zend/Permissions/Acl/Resource/ResourceInterface.php
+++ b/library/Zend/Permissions/Acl/Resource/ResourceInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Acl/Role/GenericRole.php b/library/Zend/Permissions/Acl/Role/GenericRole.php
old mode 100755
new mode 100644
index 2f7463f89..a913393d7
--- a/library/Zend/Permissions/Acl/Role/GenericRole.php
+++ b/library/Zend/Permissions/Acl/Role/GenericRole.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Acl/Role/Registry.php b/library/Zend/Permissions/Acl/Role/Registry.php
old mode 100755
new mode 100644
index 3c38ec075..b575759aa
--- a/library/Zend/Permissions/Acl/Role/Registry.php
+++ b/library/Zend/Permissions/Acl/Role/Registry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Acl/Role/RoleInterface.php b/library/Zend/Permissions/Acl/Role/RoleInterface.php
old mode 100755
new mode 100644
index 55c837593..104de047d
--- a/library/Zend/Permissions/Acl/Role/RoleInterface.php
+++ b/library/Zend/Permissions/Acl/Role/RoleInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Acl/composer.json b/library/Zend/Permissions/Acl/composer.json
old mode 100755
new mode 100644
index 4276a5a76..ffe94f984
--- a/library/Zend/Permissions/Acl/composer.json
+++ b/library/Zend/Permissions/Acl/composer.json
@@ -16,6 +16,9 @@
     "require": {
         "php": ">=5.3.23"
     },
+    "suggest": {
+        "zendframework/zend-servicemanager": "To support Zend\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.3-dev",
diff --git a/library/Zend/Permissions/Rbac/AbstractIterator.php b/library/Zend/Permissions/Rbac/AbstractIterator.php
old mode 100755
new mode 100644
index 5b28a9225..dc8a68340
--- a/library/Zend/Permissions/Rbac/AbstractIterator.php
+++ b/library/Zend/Permissions/Rbac/AbstractIterator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Rbac/AbstractRole.php b/library/Zend/Permissions/Rbac/AbstractRole.php
old mode 100755
new mode 100644
index d3d6ea766..0f69b0890
--- a/library/Zend/Permissions/Rbac/AbstractRole.php
+++ b/library/Zend/Permissions/Rbac/AbstractRole.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Rbac/AssertionInterface.php b/library/Zend/Permissions/Rbac/AssertionInterface.php
old mode 100755
new mode 100644
index 0a01addc0..cddff258d
--- a/library/Zend/Permissions/Rbac/AssertionInterface.php
+++ b/library/Zend/Permissions/Rbac/AssertionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Rbac/CONTRIBUTING.md b/library/Zend/Permissions/Rbac/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Permissions/Rbac/Exception/ExceptionInterface.php b/library/Zend/Permissions/Rbac/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 63e89be6a..431c4d5eb
--- a/library/Zend/Permissions/Rbac/Exception/ExceptionInterface.php
+++ b/library/Zend/Permissions/Rbac/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Rbac/Exception/InvalidArgumentException.php b/library/Zend/Permissions/Rbac/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 170e078da..c2708ae49
--- a/library/Zend/Permissions/Rbac/Exception/InvalidArgumentException.php
+++ b/library/Zend/Permissions/Rbac/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Rbac/README.md b/library/Zend/Permissions/Rbac/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Permissions/Rbac/Rbac.php b/library/Zend/Permissions/Rbac/Rbac.php
old mode 100755
new mode 100644
index 3ce66aa2b..8ed79a8ec
--- a/library/Zend/Permissions/Rbac/Rbac.php
+++ b/library/Zend/Permissions/Rbac/Rbac.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Rbac/Role.php b/library/Zend/Permissions/Rbac/Role.php
old mode 100755
new mode 100644
index 9daa1d743..18114a41f
--- a/library/Zend/Permissions/Rbac/Role.php
+++ b/library/Zend/Permissions/Rbac/Role.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Rbac/RoleInterface.php b/library/Zend/Permissions/Rbac/RoleInterface.php
old mode 100755
new mode 100644
index fd8a65c5f..f7a78279a
--- a/library/Zend/Permissions/Rbac/RoleInterface.php
+++ b/library/Zend/Permissions/Rbac/RoleInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Permissions/Rbac/composer.json b/library/Zend/Permissions/Rbac/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/ProgressBar/Adapter/AbstractAdapter.php b/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
old mode 100755
new mode 100644
index 53f9d2897..446a6334e
--- a/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
+++ b/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/Adapter/Console.php b/library/Zend/ProgressBar/Adapter/Console.php
old mode 100755
new mode 100644
index 8de843c8c..3d9b8ff31
--- a/library/Zend/ProgressBar/Adapter/Console.php
+++ b/library/Zend/ProgressBar/Adapter/Console.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php b/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index e64d3afdc..7f9c7ca96
--- a/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
+++ b/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php b/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index a1b18f2d7..a7bafe458
--- a/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
+++ b/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,6 @@ use Zend\ProgressBar\Exception;
 /**
  * Exception for Zend\Progressbar component.
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php b/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
old mode 100755
new mode 100644
index f70248623..43faa3cc9
--- a/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
+++ b/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -14,7 +14,6 @@ use Zend\ProgressBar\Exception;
 /**
  * Exception for Zend\Progressbar component.
  */
-class RuntimeException extends Exception\RuntimeException implements
-    ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/ProgressBar/Adapter/JsPull.php b/library/Zend/ProgressBar/Adapter/JsPull.php
old mode 100755
new mode 100644
index f5f63f071..66940e96e
--- a/library/Zend/ProgressBar/Adapter/JsPull.php
+++ b/library/Zend/ProgressBar/Adapter/JsPull.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/Adapter/JsPush.php b/library/Zend/ProgressBar/Adapter/JsPush.php
old mode 100755
new mode 100644
index cf417468e..25796bd41
--- a/library/Zend/ProgressBar/Adapter/JsPush.php
+++ b/library/Zend/ProgressBar/Adapter/JsPush.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/CONTRIBUTING.md b/library/Zend/ProgressBar/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/ProgressBar/Exception/ExceptionInterface.php b/library/Zend/ProgressBar/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index d89fbc01e..a2ca184b6
--- a/library/Zend/ProgressBar/Exception/ExceptionInterface.php
+++ b/library/Zend/ProgressBar/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/Exception/InvalidArgumentException.php b/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 1734096b3..122fc78d2
--- a/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
+++ b/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -12,7 +12,6 @@ namespace Zend\ProgressBar\Exception;
 /**
  * Exception for Zend\Progressbar component.
  */
-class InvalidArgumentException extends \InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/ProgressBar/Exception/OutOfRangeException.php b/library/Zend/ProgressBar/Exception/OutOfRangeException.php
old mode 100755
new mode 100644
index 72a7543e9..9a477e311
--- a/library/Zend/ProgressBar/Exception/OutOfRangeException.php
+++ b/library/Zend/ProgressBar/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/Exception/PhpEnvironmentException.php b/library/Zend/ProgressBar/Exception/PhpEnvironmentException.php
old mode 100755
new mode 100644
index 7eb63ed15..2893bcdb0
--- a/library/Zend/ProgressBar/Exception/PhpEnvironmentException.php
+++ b/library/Zend/ProgressBar/Exception/PhpEnvironmentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/Exception/RuntimeException.php b/library/Zend/ProgressBar/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 874dcd3f9..6b8a51a4b
--- a/library/Zend/ProgressBar/Exception/RuntimeException.php
+++ b/library/Zend/ProgressBar/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/ProgressBar.php b/library/Zend/ProgressBar/ProgressBar.php
old mode 100755
new mode 100644
index 424a0d3c7..c811ecd04
--- a/library/Zend/ProgressBar/ProgressBar.php
+++ b/library/Zend/ProgressBar/ProgressBar.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/README.md b/library/Zend/ProgressBar/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php b/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
old mode 100755
new mode 100644
index 1474c4c2b..82b42a356
--- a/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
+++ b/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -137,9 +137,7 @@ abstract class AbstractUploadHandler implements UploadHandlerInterface
         $adapter = $this->getProgressAdapter();
         if (isset($adapter)) {
             if ($adapter instanceof AbstractProgressAdapter) {
-                $adapter = new ProgressBar(
-                    $adapter, 0, $status['total'], $this->getSessionNamespace()
-                );
+                $adapter = new ProgressBar($adapter, 0, $status['total'], $this->getSessionNamespace());
                 $this->setProgressAdapter($adapter);
             }
 
diff --git a/library/Zend/ProgressBar/Upload/ApcProgress.php b/library/Zend/ProgressBar/Upload/ApcProgress.php
old mode 100755
new mode 100644
index 236e3767a..2fa561f46
--- a/library/Zend/ProgressBar/Upload/ApcProgress.php
+++ b/library/Zend/ProgressBar/Upload/ApcProgress.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/Upload/SessionProgress.php b/library/Zend/ProgressBar/Upload/SessionProgress.php
old mode 100755
new mode 100644
index 3c8cfbede..8560a610d
--- a/library/Zend/ProgressBar/Upload/SessionProgress.php
+++ b/library/Zend/ProgressBar/Upload/SessionProgress.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php b/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php
old mode 100755
new mode 100644
index 9c9746939..234759ed1
--- a/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php
+++ b/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\ProgressBar\Upload;
 
-
 /**
  * Interface for Upload Progress Handlers
  */
diff --git a/library/Zend/ProgressBar/Upload/UploadProgress.php b/library/Zend/ProgressBar/Upload/UploadProgress.php
old mode 100755
new mode 100644
index 871de58df..8dd65aacb
--- a/library/Zend/ProgressBar/Upload/UploadProgress.php
+++ b/library/Zend/ProgressBar/Upload/UploadProgress.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ProgressBar/composer.json b/library/Zend/ProgressBar/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Serializer/Adapter/AbstractAdapter.php b/library/Zend/Serializer/Adapter/AbstractAdapter.php
old mode 100755
new mode 100644
index de5ae4a3e..1b6c8b43c
--- a/library/Zend/Serializer/Adapter/AbstractAdapter.php
+++ b/library/Zend/Serializer/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Adapter/AdapterInterface.php b/library/Zend/Serializer/Adapter/AdapterInterface.php
old mode 100755
new mode 100644
index 132304f4b..44c0c4fcd
--- a/library/Zend/Serializer/Adapter/AdapterInterface.php
+++ b/library/Zend/Serializer/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Adapter/AdapterOptions.php b/library/Zend/Serializer/Adapter/AdapterOptions.php
old mode 100755
new mode 100644
index 4054c30d1..800eb9f8c
--- a/library/Zend/Serializer/Adapter/AdapterOptions.php
+++ b/library/Zend/Serializer/Adapter/AdapterOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Adapter/IgBinary.php b/library/Zend/Serializer/Adapter/IgBinary.php
old mode 100755
new mode 100644
index 391cb3ebb..d821c403b
--- a/library/Zend/Serializer/Adapter/IgBinary.php
+++ b/library/Zend/Serializer/Adapter/IgBinary.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Adapter/Json.php b/library/Zend/Serializer/Adapter/Json.php
old mode 100755
new mode 100644
index 025c19efa..03bde65db
--- a/library/Zend/Serializer/Adapter/Json.php
+++ b/library/Zend/Serializer/Adapter/Json.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Adapter/JsonOptions.php b/library/Zend/Serializer/Adapter/JsonOptions.php
old mode 100755
new mode 100644
index e6bc3c910..4b2e3e004
--- a/library/Zend/Serializer/Adapter/JsonOptions.php
+++ b/library/Zend/Serializer/Adapter/JsonOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Adapter/MsgPack.php b/library/Zend/Serializer/Adapter/MsgPack.php
old mode 100755
new mode 100644
index 01734e397..e8537d6b9
--- a/library/Zend/Serializer/Adapter/MsgPack.php
+++ b/library/Zend/Serializer/Adapter/MsgPack.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Adapter/PhpCode.php b/library/Zend/Serializer/Adapter/PhpCode.php
old mode 100755
new mode 100644
index 744377390..9b2cee956
--- a/library/Zend/Serializer/Adapter/PhpCode.php
+++ b/library/Zend/Serializer/Adapter/PhpCode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Adapter/PhpSerialize.php b/library/Zend/Serializer/Adapter/PhpSerialize.php
old mode 100755
new mode 100644
index 3fef17e4a..5dbd92f53
--- a/library/Zend/Serializer/Adapter/PhpSerialize.php
+++ b/library/Zend/Serializer/Adapter/PhpSerialize.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -48,9 +48,7 @@ class PhpSerialize extends AbstractAdapter
         $ret = serialize($value);
         $err = ErrorHandler::stop();
         if ($err) {
-            throw new Exception\RuntimeException(
-                'Serialization failed', 0, $err
-            );
+            throw new Exception\RuntimeException('Serialization failed', 0, $err);
         }
 
         return $ret;
diff --git a/library/Zend/Serializer/Adapter/PythonPickle.php b/library/Zend/Serializer/Adapter/PythonPickle.php
old mode 100755
new mode 100644
index daa1ac5c3..25ea9cd2f
--- a/library/Zend/Serializer/Adapter/PythonPickle.php
+++ b/library/Zend/Serializer/Adapter/PythonPickle.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -1048,9 +1048,9 @@ class PythonPickle extends AbstractAdapter
                        . chr(0x80 | $uniCode >> 6 & 0x3F)
                        . chr(0x80 | $uniCode & 0x3F);
         } else {
-            throw new Exception\RuntimeException(sprintf(
-                'Unsupported unicode character found "%s"', dechex($uniCode)
-            ));
+            throw new Exception\RuntimeException(
+                sprintf('Unsupported unicode character found "%s"', dechex($uniCode))
+            );
         }
 
         return $utf8Char;
diff --git a/library/Zend/Serializer/Adapter/PythonPickleOptions.php b/library/Zend/Serializer/Adapter/PythonPickleOptions.php
old mode 100755
new mode 100644
index b43f2ab72..bdf551174
--- a/library/Zend/Serializer/Adapter/PythonPickleOptions.php
+++ b/library/Zend/Serializer/Adapter/PythonPickleOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Adapter/Wddx.php b/library/Zend/Serializer/Adapter/Wddx.php
old mode 100755
new mode 100644
index b848cee17..4d1ba3f83
--- a/library/Zend/Serializer/Adapter/Wddx.php
+++ b/library/Zend/Serializer/Adapter/Wddx.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Adapter/WddxOptions.php b/library/Zend/Serializer/Adapter/WddxOptions.php
old mode 100755
new mode 100644
index e403731ae..a06276a69
--- a/library/Zend/Serializer/Adapter/WddxOptions.php
+++ b/library/Zend/Serializer/Adapter/WddxOptions.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Serializer\Adapter;
 
-
 class WddxOptions extends AdapterOptions
 {
     /**
diff --git a/library/Zend/Serializer/AdapterPluginManager.php b/library/Zend/Serializer/AdapterPluginManager.php
old mode 100755
new mode 100644
index 5be62ce6b..56d2f7291
--- a/library/Zend/Serializer/AdapterPluginManager.php
+++ b/library/Zend/Serializer/AdapterPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/CONTRIBUTING.md b/library/Zend/Serializer/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Serializer/Exception/ExceptionInterface.php b/library/Zend/Serializer/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index bf31d9f10..c58b17ada
--- a/library/Zend/Serializer/Exception/ExceptionInterface.php
+++ b/library/Zend/Serializer/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php b/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php
old mode 100755
new mode 100644
index 5d389dbfd..d502a3d30
--- a/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Exception/InvalidArgumentException.php b/library/Zend/Serializer/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 91d20326d..f0b385328
--- a/library/Zend/Serializer/Exception/InvalidArgumentException.php
+++ b/library/Zend/Serializer/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/Exception/RuntimeException.php b/library/Zend/Serializer/Exception/RuntimeException.php
old mode 100755
new mode 100644
index d09f59696..3d8486aa5
--- a/library/Zend/Serializer/Exception/RuntimeException.php
+++ b/library/Zend/Serializer/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/README.md b/library/Zend/Serializer/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Serializer/Serializer.php b/library/Zend/Serializer/Serializer.php
old mode 100755
new mode 100644
index adcea15c7..ec3b63b46
--- a/library/Zend/Serializer/Serializer.php
+++ b/library/Zend/Serializer/Serializer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Serializer/composer.json b/library/Zend/Serializer/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Server/AbstractServer.php b/library/Zend/Server/AbstractServer.php
old mode 100755
new mode 100644
index e52deefd1..47e4ca674
--- a/library/Zend/Server/AbstractServer.php
+++ b/library/Zend/Server/AbstractServer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/CONTRIBUTING.md b/library/Zend/Server/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Server/Cache.php b/library/Zend/Server/Cache.php
old mode 100755
new mode 100644
index c45f3940c..c23ea8f3d
--- a/library/Zend/Server/Cache.php
+++ b/library/Zend/Server/Cache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -36,9 +36,7 @@ class Cache
      */
     public static function save($filename, Server $server)
     {
-        if (!is_string($filename)
-            || (!file_exists($filename) && !is_writable(dirname($filename)))
-        ) {
+        if (!is_string($filename) || (!file_exists($filename) && !is_writable(dirname($filename)))) {
             return false;
         }
 
@@ -98,9 +96,7 @@ class Cache
      */
     public static function get($filename, Server $server)
     {
-        if (!is_string($filename)
-            || !file_exists($filename)
-            || !is_readable($filename)) {
+        if (!is_string($filename) || !file_exists($filename) || !is_readable($filename)) {
             return false;
         }
 
diff --git a/library/Zend/Server/Client.php b/library/Zend/Server/Client.php
old mode 100755
new mode 100644
index 203b9c011..b84ed4db6
--- a/library/Zend/Server/Client.php
+++ b/library/Zend/Server/Client.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Definition.php b/library/Zend/Server/Definition.php
old mode 100755
new mode 100644
index 1cf6e09d5..442a03707
--- a/library/Zend/Server/Definition.php
+++ b/library/Zend/Server/Definition.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Exception/BadMethodCallException.php b/library/Zend/Server/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 2ea3d550f..8ba9c2da3
--- a/library/Zend/Server/Exception/BadMethodCallException.php
+++ b/library/Zend/Server/Exception/BadMethodCallException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Server\Exception;
 
-class BadMethodCallException
-    extends \BadMethodCallException
-    implements ExceptionInterface
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Server/Exception/ExceptionInterface.php b/library/Zend/Server/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 65974b9d9..8b19f6c8f
--- a/library/Zend/Server/Exception/ExceptionInterface.php
+++ b/library/Zend/Server/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Exception/InvalidArgumentException.php b/library/Zend/Server/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index c3c0a0a98..bbddd095d
--- a/library/Zend/Server/Exception/InvalidArgumentException.php
+++ b/library/Zend/Server/Exception/InvalidArgumentException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Server\Exception;
 
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Server/Exception/RuntimeException.php b/library/Zend/Server/Exception/RuntimeException.php
old mode 100755
new mode 100644
index cc53b7ecc..f2f213e26
--- a/library/Zend/Server/Exception/RuntimeException.php
+++ b/library/Zend/Server/Exception/RuntimeException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Server\Exception;
 
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Server/Method/Callback.php b/library/Zend/Server/Method/Callback.php
old mode 100755
new mode 100644
index 472dc1c51..7e73b3496
--- a/library/Zend/Server/Method/Callback.php
+++ b/library/Zend/Server/Method/Callback.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Method/Definition.php b/library/Zend/Server/Method/Definition.php
old mode 100755
new mode 100644
index 661259776..3df08b531
--- a/library/Zend/Server/Method/Definition.php
+++ b/library/Zend/Server/Method/Definition.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Method/Parameter.php b/library/Zend/Server/Method/Parameter.php
old mode 100755
new mode 100644
index a867ec972..9d6ea917e
--- a/library/Zend/Server/Method/Parameter.php
+++ b/library/Zend/Server/Method/Parameter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Method/Prototype.php b/library/Zend/Server/Method/Prototype.php
old mode 100755
new mode 100644
index 61380b986..851cda9a6
--- a/library/Zend/Server/Method/Prototype.php
+++ b/library/Zend/Server/Method/Prototype.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/README.md b/library/Zend/Server/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Server/Reflection.php b/library/Zend/Server/Reflection.php
old mode 100755
new mode 100644
index 729efbf73..28eb04d8d
--- a/library/Zend/Server/Reflection.php
+++ b/library/Zend/Server/Reflection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Reflection/AbstractFunction.php b/library/Zend/Server/Reflection/AbstractFunction.php
old mode 100755
new mode 100644
index 1f288316d..cb37bf94c
--- a/library/Zend/Server/Reflection/AbstractFunction.php
+++ b/library/Zend/Server/Reflection/AbstractFunction.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -282,8 +282,9 @@ abstract class AbstractFunction
             }
         } elseif ($nParamTypesTmp != $paramCount) {
             throw new Exception\RuntimeException(
-               'Variable number of arguments is not supported for services (except optional parameters). '
-             . 'Number of function arguments must correspond to actual number of arguments described in a docblock.');
+                'Variable number of arguments is not supported for services (except optional parameters). '
+                . 'Number of function arguments must correspond to actual number of arguments described in a docblock.'
+            );
         }
 
         $paramTypes = array();
@@ -297,7 +298,6 @@ abstract class AbstractFunction
         $this->buildSignatures($return, $returnDesc, $paramTypes, $paramDesc);
     }
 
-
     /**
      * Proxy reflection calls
      *
diff --git a/library/Zend/Server/Reflection/Exception/BadMethodCallException.php b/library/Zend/Server/Reflection/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index eb4c152e9..613fdde0b
--- a/library/Zend/Server/Reflection/Exception/BadMethodCallException.php
+++ b/library/Zend/Server/Reflection/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,8 +11,6 @@ namespace Zend\Server\Reflection\Exception;
 
 use Zend\Server\Exception;
 
-class BadMethodCallException
-    extends Exception\BadMethodCallException
-    implements ExceptionInterface
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Server/Reflection/Exception/ExceptionInterface.php b/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 6e5276710..e44c798d3
--- a/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
+++ b/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php b/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 2803eb248..4fc4e2716
--- a/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php
+++ b/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,8 +11,6 @@ namespace Zend\Server\Reflection\Exception;
 
 use Zend\Server\Exception;
 
-class InvalidArgumentException
-    extends Exception\InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Server/Reflection/Exception/RuntimeException.php b/library/Zend/Server/Reflection/Exception/RuntimeException.php
old mode 100755
new mode 100644
index be51f236b..6ddfdf959
--- a/library/Zend/Server/Reflection/Exception/RuntimeException.php
+++ b/library/Zend/Server/Reflection/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -11,8 +11,6 @@ namespace Zend\Server\Reflection\Exception;
 
 use Zend\Server\Exception;
 
-class RuntimeException
-    extends Exception\RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Server/Reflection/Node.php b/library/Zend/Server/Reflection/Node.php
old mode 100755
new mode 100644
index e0f4268ed..6f49044ae
--- a/library/Zend/Server/Reflection/Node.php
+++ b/library/Zend/Server/Reflection/Node.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -168,9 +168,7 @@ class Node
 
             if (null === $value) {
                 $endPoints[] = $this;
-            } elseif ((null !== $value)
-                && $child->hasChildren()
-            ) {
+            } elseif ((null !== $value) && $child->hasChildren()) {
                 $childEndPoints = $child->getEndPoints();
                 if (!empty($childEndPoints)) {
                     $endPoints = array_merge($endPoints, $childEndPoints);
diff --git a/library/Zend/Server/Reflection/Prototype.php b/library/Zend/Server/Reflection/Prototype.php
old mode 100755
new mode 100644
index 416995bff..35c53ddd3
--- a/library/Zend/Server/Reflection/Prototype.php
+++ b/library/Zend/Server/Reflection/Prototype.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Reflection/ReflectionClass.php b/library/Zend/Server/Reflection/ReflectionClass.php
old mode 100755
new mode 100644
index 7c0479896..8f191bc1f
--- a/library/Zend/Server/Reflection/ReflectionClass.php
+++ b/library/Zend/Server/Reflection/ReflectionClass.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Reflection/ReflectionFunction.php b/library/Zend/Server/Reflection/ReflectionFunction.php
old mode 100755
new mode 100644
index 2595ce56d..f06fc68ff
--- a/library/Zend/Server/Reflection/ReflectionFunction.php
+++ b/library/Zend/Server/Reflection/ReflectionFunction.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Reflection/ReflectionMethod.php b/library/Zend/Server/Reflection/ReflectionMethod.php
old mode 100755
new mode 100644
index af63f5064..3e8865d0c
--- a/library/Zend/Server/Reflection/ReflectionMethod.php
+++ b/library/Zend/Server/Reflection/ReflectionMethod.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Reflection/ReflectionParameter.php b/library/Zend/Server/Reflection/ReflectionParameter.php
old mode 100755
new mode 100644
index e076e93be..af6b661f3
--- a/library/Zend/Server/Reflection/ReflectionParameter.php
+++ b/library/Zend/Server/Reflection/ReflectionParameter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Reflection/ReflectionReturnValue.php b/library/Zend/Server/Reflection/ReflectionReturnValue.php
old mode 100755
new mode 100644
index 64f0fb956..3b7e18393
--- a/library/Zend/Server/Reflection/ReflectionReturnValue.php
+++ b/library/Zend/Server/Reflection/ReflectionReturnValue.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/Server.php b/library/Zend/Server/Server.php
old mode 100755
new mode 100644
index 56e5269bb..3cf0756da
--- a/library/Zend/Server/Server.php
+++ b/library/Zend/Server/Server.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Server/composer.json b/library/Zend/Server/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/ServiceManager/AbstractFactoryInterface.php b/library/Zend/ServiceManager/AbstractFactoryInterface.php
old mode 100755
new mode 100644
index f54205b25..96bffea82
--- a/library/Zend/ServiceManager/AbstractFactoryInterface.php
+++ b/library/Zend/ServiceManager/AbstractFactoryInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/AbstractPluginManager.php b/library/Zend/ServiceManager/AbstractPluginManager.php
old mode 100755
new mode 100644
index f82c1b354..791a314f9
--- a/library/Zend/ServiceManager/AbstractPluginManager.php
+++ b/library/Zend/ServiceManager/AbstractPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -216,9 +216,13 @@ abstract class AbstractPluginManager extends ServiceManager implements ServiceLo
         } elseif (is_callable($factory)) {
             $instance = $this->createServiceViaCallback($factory, $canonicalName, $requestedName);
         } else {
-            throw new Exception\ServiceNotCreatedException(sprintf(
-                'While attempting to create %s%s an invalid factory was registered for this instance type.', $canonicalName, ($requestedName ? '(alias: ' . $requestedName . ')' : '')
-            ));
+            throw new Exception\ServiceNotCreatedException(
+                sprintf(
+                    'While attempting to create %s%s an invalid factory was registered for this instance type.',
+                    $canonicalName,
+                    ($requestedName ? '(alias: ' . $requestedName . ')' : '')
+                )
+            );
         }
 
         return $instance;
diff --git a/library/Zend/ServiceManager/CONTRIBUTING.md b/library/Zend/ServiceManager/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/ServiceManager/Config.php b/library/Zend/ServiceManager/Config.php
old mode 100755
new mode 100644
index c64bb0e7c..0551ee02e
--- a/library/Zend/ServiceManager/Config.php
+++ b/library/Zend/ServiceManager/Config.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/ConfigInterface.php b/library/Zend/ServiceManager/ConfigInterface.php
old mode 100755
new mode 100644
index 1593312a3..d55bc0e56
--- a/library/Zend/ServiceManager/ConfigInterface.php
+++ b/library/Zend/ServiceManager/ConfigInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/DelegatorFactoryInterface.php b/library/Zend/ServiceManager/DelegatorFactoryInterface.php
old mode 100755
new mode 100644
index 27ad5f1fb..fc8a47a9e
--- a/library/Zend/ServiceManager/DelegatorFactoryInterface.php
+++ b/library/Zend/ServiceManager/DelegatorFactoryInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php b/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php
old mode 100755
new mode 100644
index 9f030e18f..7b4b257d2
--- a/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php
+++ b/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Di/DiInstanceManagerProxy.php b/library/Zend/ServiceManager/Di/DiInstanceManagerProxy.php
old mode 100755
new mode 100644
index cdd4bf9fa..87b10a390
--- a/library/Zend/ServiceManager/Di/DiInstanceManagerProxy.php
+++ b/library/Zend/ServiceManager/Di/DiInstanceManagerProxy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Di/DiServiceFactory.php b/library/Zend/ServiceManager/Di/DiServiceFactory.php
old mode 100755
new mode 100644
index 27d3a31a2..97bcb02c9
--- a/library/Zend/ServiceManager/Di/DiServiceFactory.php
+++ b/library/Zend/ServiceManager/Di/DiServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Di/DiServiceInitializer.php b/library/Zend/ServiceManager/Di/DiServiceInitializer.php
old mode 100755
new mode 100644
index 6bfe8d2ea..2e3c594d1
--- a/library/Zend/ServiceManager/Di/DiServiceInitializer.php
+++ b/library/Zend/ServiceManager/Di/DiServiceInitializer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php b/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php
old mode 100755
new mode 100644
index d50ef311a..280ff9d11
--- a/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php
+++ b/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Exception/CircularReferenceException.php b/library/Zend/ServiceManager/Exception/CircularReferenceException.php
old mode 100755
new mode 100644
index f5451f804..0472cdf27
--- a/library/Zend/ServiceManager/Exception/CircularReferenceException.php
+++ b/library/Zend/ServiceManager/Exception/CircularReferenceException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Exception/ExceptionInterface.php b/library/Zend/ServiceManager/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index d72a170d6..ca59fbf39
--- a/library/Zend/ServiceManager/Exception/ExceptionInterface.php
+++ b/library/Zend/ServiceManager/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Exception/InvalidArgumentException.php b/library/Zend/ServiceManager/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index d997c62ee..174c7eb08
--- a/library/Zend/ServiceManager/Exception/InvalidArgumentException.php
+++ b/library/Zend/ServiceManager/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php b/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php
old mode 100755
new mode 100644
index 8958b6310..a7065c4df
--- a/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php
+++ b/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Exception/RuntimeException.php b/library/Zend/ServiceManager/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 1ce28f1fc..d19165374
--- a/library/Zend/ServiceManager/Exception/RuntimeException.php
+++ b/library/Zend/ServiceManager/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php b/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php
old mode 100755
new mode 100644
index caf843d75..a8b08e0f5
--- a/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php
+++ b/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php b/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php
old mode 100755
new mode 100644
index e02b24099..478f4ee0d
--- a/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php
+++ b/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/FactoryInterface.php b/library/Zend/ServiceManager/FactoryInterface.php
old mode 100755
new mode 100644
index 8fd7dc449..0a65d6550
--- a/library/Zend/ServiceManager/FactoryInterface.php
+++ b/library/Zend/ServiceManager/FactoryInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/InitializerInterface.php b/library/Zend/ServiceManager/InitializerInterface.php
old mode 100755
new mode 100644
index b12061b54..7e7f793fc
--- a/library/Zend/ServiceManager/InitializerInterface.php
+++ b/library/Zend/ServiceManager/InitializerInterface.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\ServiceManager;
 
-
 interface InitializerInterface
 {
     /**
diff --git a/library/Zend/ServiceManager/MutableCreationOptionsInterface.php b/library/Zend/ServiceManager/MutableCreationOptionsInterface.php
old mode 100755
new mode 100644
index 785e6e84e..3464155e7
--- a/library/Zend/ServiceManager/MutableCreationOptionsInterface.php
+++ b/library/Zend/ServiceManager/MutableCreationOptionsInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php b/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php
old mode 100755
new mode 100644
index 3be5506b1..6dcdf3220
--- a/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php
+++ b/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php b/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php
old mode 100755
new mode 100644
index 2f363a0b6..9c94e75a2
--- a/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php
+++ b/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/README.md b/library/Zend/ServiceManager/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/ServiceManager/ServiceLocatorAwareInterface.php b/library/Zend/ServiceManager/ServiceLocatorAwareInterface.php
old mode 100755
new mode 100644
index 7f53ada01..1058042cf
--- a/library/Zend/ServiceManager/ServiceLocatorAwareInterface.php
+++ b/library/Zend/ServiceManager/ServiceLocatorAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/ServiceLocatorAwareTrait.php b/library/Zend/ServiceManager/ServiceLocatorAwareTrait.php
old mode 100755
new mode 100644
index 17f6069d8..94ceb56e6
--- a/library/Zend/ServiceManager/ServiceLocatorAwareTrait.php
+++ b/library/Zend/ServiceManager/ServiceLocatorAwareTrait.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\ServiceManager;
 
-
 trait ServiceLocatorAwareTrait
 {
     /**
diff --git a/library/Zend/ServiceManager/ServiceLocatorInterface.php b/library/Zend/ServiceManager/ServiceLocatorInterface.php
old mode 100755
new mode 100644
index b9a04e5dc..4df3c5fc5
--- a/library/Zend/ServiceManager/ServiceLocatorInterface.php
+++ b/library/Zend/ServiceManager/ServiceLocatorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/ServiceManager.php b/library/Zend/ServiceManager/ServiceManager.php
old mode 100755
new mode 100644
index 74129fdde..2ed71d27e
--- a/library/Zend/ServiceManager/ServiceManager.php
+++ b/library/Zend/ServiceManager/ServiceManager.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\ServiceManager;
 
-use ReflectionClass;
-
 class ServiceManager implements ServiceLocatorInterface
 {
     /**@#+
@@ -1189,6 +1187,8 @@ class ServiceManager implements ServiceLocatorInterface
      * @see https://bugs.php.net/bug.php?id=53727
      * @see https://github.com/zendframework/zf2/pull/1807
      *
+     * @deprecated since zf 2.3 requires PHP >= 5.3.23
+     *
      * @param string $className
      * @param string $type
      * @return bool
@@ -1197,17 +1197,7 @@ class ServiceManager implements ServiceLocatorInterface
      */
     protected static function isSubclassOf($className, $type)
     {
-        if (is_subclass_of($className, $type)) {
-            return true;
-        }
-        if (PHP_VERSION_ID >= 50307) {
-            return false;
-        }
-        if (!interface_exists($type)) {
-            return false;
-        }
-        $r = new ReflectionClass($className);
-        return $r->implementsInterface($type);
+        return is_subclass_of($className, $type);
     }
 
     /**
diff --git a/library/Zend/ServiceManager/ServiceManagerAwareInterface.php b/library/Zend/ServiceManager/ServiceManagerAwareInterface.php
old mode 100755
new mode 100644
index 320f6bc69..2519bbaf4
--- a/library/Zend/ServiceManager/ServiceManagerAwareInterface.php
+++ b/library/Zend/ServiceManager/ServiceManagerAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/ServiceManager/composer.json b/library/Zend/ServiceManager/composer.json
old mode 100755
new mode 100644
index bc54dd6e2..d843f4929
--- a/library/Zend/ServiceManager/composer.json
+++ b/library/Zend/ServiceManager/composer.json
@@ -20,6 +20,7 @@
         "zendframework/zend-di": "self.version"
     },
     "suggest": {
+        "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
         "zendframework/zend-di": "Zend\\Di component"
     },
     "extra": {
diff --git a/library/Zend/Session/AbstractContainer.php b/library/Zend/Session/AbstractContainer.php
old mode 100755
new mode 100644
index 92ab8ea1c..39327d110
--- a/library/Zend/Session/AbstractContainer.php
+++ b/library/Zend/Session/AbstractContainer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -63,7 +63,7 @@ abstract class AbstractContainer extends ArrayObject
      */
     public function __construct($name = 'Default', Manager $manager = null)
     {
-        if (!preg_match('/^[a-z][a-z0-9_\\\]+$/i', $name)) {
+        if (!preg_match('/^[a-z0-9][a-z0-9_\\\\]+$/i', $name)) {
             throw new Exception\InvalidArgumentException(
                 'Name passed to container is invalid; must consist of alphanumerics, backslashes and underscores only'
             );
diff --git a/library/Zend/Session/AbstractManager.php b/library/Zend/Session/AbstractManager.php
old mode 100755
new mode 100644
index 7f94be15e..145841a91
--- a/library/Zend/Session/AbstractManager.php
+++ b/library/Zend/Session/AbstractManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/CONTRIBUTING.md b/library/Zend/Session/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Session/Config/ConfigInterface.php b/library/Zend/Session/Config/ConfigInterface.php
old mode 100755
new mode 100644
index a71b891e7..97b062d7a
--- a/library/Zend/Session/Config/ConfigInterface.php
+++ b/library/Zend/Session/Config/ConfigInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Config/SessionConfig.php b/library/Zend/Session/Config/SessionConfig.php
old mode 100755
new mode 100644
index 0abf88923..3328a6c9f
--- a/library/Zend/Session/Config/SessionConfig.php
+++ b/library/Zend/Session/Config/SessionConfig.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -86,9 +86,10 @@ class SessionConfig extends StandardConfig
         }
 
         $result = ini_set($key, $storageValue);
-        if (FALSE === $result) {
-            throw new Exception\InvalidArgumentException("'" . $key .
-                    "' is not a valid sessions-related ini setting.");
+        if (false === $result) {
+            throw new Exception\InvalidArgumentException(
+                "'{$key}' is not a valid sessions-related ini setting."
+            );
         }
         return $this;
     }
@@ -161,7 +162,6 @@ class SessionConfig extends StandardConfig
         return $this;
     }
 
-
     /**
      * Set session.serialize_handler
      *
diff --git a/library/Zend/Session/Config/StandardConfig.php b/library/Zend/Session/Config/StandardConfig.php
old mode 100755
new mode 100644
index 805691fd7..5ff2c2469
--- a/library/Zend/Session/Config/StandardConfig.php
+++ b/library/Zend/Session/Config/StandardConfig.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -88,7 +88,6 @@ class StandardConfig implements ConfigInterface
      */
     protected $options = array();
 
-
     /**
      * Set many options at once
      *
@@ -251,8 +250,6 @@ class StandardConfig implements ConfigInterface
         return $this->savePath;
     }
 
-
-
     /**
      * Set session.name
      *
diff --git a/library/Zend/Session/Container.php b/library/Zend/Session/Container.php
old mode 100755
new mode 100644
index 7c1162902..9957ae722
--- a/library/Zend/Session/Container.php
+++ b/library/Zend/Session/Container.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Exception/BadMethodCallException.php b/library/Zend/Session/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 518b6414f..273372d77
--- a/library/Zend/Session/Exception/BadMethodCallException.php
+++ b/library/Zend/Session/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Exception/ExceptionInterface.php b/library/Zend/Session/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 2534a7097..457ecc7b8
--- a/library/Zend/Session/Exception/ExceptionInterface.php
+++ b/library/Zend/Session/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Exception/InvalidArgumentException.php b/library/Zend/Session/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index ca813627e..85e698dab
--- a/library/Zend/Session/Exception/InvalidArgumentException.php
+++ b/library/Zend/Session/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Exception/RuntimeException.php b/library/Zend/Session/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 0590cf2bd..48446ecbb
--- a/library/Zend/Session/Exception/RuntimeException.php
+++ b/library/Zend/Session/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/ManagerInterface.php b/library/Zend/Session/ManagerInterface.php
old mode 100755
new mode 100644
index 2038c6928..f5e34681e
--- a/library/Zend/Session/ManagerInterface.php
+++ b/library/Zend/Session/ManagerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/README.md b/library/Zend/Session/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Session/SaveHandler/Cache.php b/library/Zend/Session/SaveHandler/Cache.php
old mode 100755
new mode 100644
index c5ad27074..be3b4d756
--- a/library/Zend/Session/SaveHandler/Cache.php
+++ b/library/Zend/Session/SaveHandler/Cache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/SaveHandler/DbTableGateway.php b/library/Zend/Session/SaveHandler/DbTableGateway.php
old mode 100755
new mode 100644
index 1d8487cc9..77d0e4dd2
--- a/library/Zend/Session/SaveHandler/DbTableGateway.php
+++ b/library/Zend/Session/SaveHandler/DbTableGateway.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -164,9 +164,12 @@ class DbTableGateway implements SaveHandlerInterface
     public function gc($maxlifetime)
     {
         $platform = $this->tableGateway->getAdapter()->getPlatform();
-        return (bool) $this->tableGateway->delete(sprintf('%s < %d',
-            $platform->quoteIdentifier($this->options->getModifiedColumn()),
-            (time() - $this->lifetime)
-        ));
+        return (bool) $this->tableGateway->delete(
+            sprintf(
+                '%s < %d',
+                $platform->quoteIdentifier($this->options->getModifiedColumn()),
+                (time() - $this->lifetime)
+            )
+        );
     }
 }
diff --git a/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php b/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php
old mode 100755
new mode 100644
index ad55c73c7..6553863ac
--- a/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php
+++ b/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -47,7 +47,6 @@ class DbTableGatewayOptions extends AbstractOptions
      */
     protected $modifiedColumn = 'modified';
 
-
     /**
      * Set Id Column
      *
diff --git a/library/Zend/Session/SaveHandler/MongoDB.php b/library/Zend/Session/SaveHandler/MongoDB.php
old mode 100755
new mode 100644
index 9780b3108..2965ab492
--- a/library/Zend/Session/SaveHandler/MongoDB.php
+++ b/library/Zend/Session/SaveHandler/MongoDB.php
@@ -4,7 +4,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/SaveHandler/MongoDBOptions.php b/library/Zend/Session/SaveHandler/MongoDBOptions.php
old mode 100755
new mode 100644
index 5616337c9..d915b6829
--- a/library/Zend/Session/SaveHandler/MongoDBOptions.php
+++ b/library/Zend/Session/SaveHandler/MongoDBOptions.php
@@ -4,7 +4,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/SaveHandler/SaveHandlerInterface.php b/library/Zend/Session/SaveHandler/SaveHandlerInterface.php
old mode 100755
new mode 100644
index 5ee7dd498..8ed3bcf21
--- a/library/Zend/Session/SaveHandler/SaveHandlerInterface.php
+++ b/library/Zend/Session/SaveHandler/SaveHandlerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Service/ContainerAbstractServiceFactory.php b/library/Zend/Session/Service/ContainerAbstractServiceFactory.php
old mode 100755
new mode 100644
index cb4ecd7e4..0d099dc64
--- a/library/Zend/Session/Service/ContainerAbstractServiceFactory.php
+++ b/library/Zend/Session/Service/ContainerAbstractServiceFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Service/SessionConfigFactory.php b/library/Zend/Session/Service/SessionConfigFactory.php
old mode 100755
new mode 100644
index 389b53d2f..35f1d8896
--- a/library/Zend/Session/Service/SessionConfigFactory.php
+++ b/library/Zend/Session/Service/SessionConfigFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Service/SessionManagerFactory.php b/library/Zend/Session/Service/SessionManagerFactory.php
old mode 100755
new mode 100644
index 5efe31949..864d8649c
--- a/library/Zend/Session/Service/SessionManagerFactory.php
+++ b/library/Zend/Session/Service/SessionManagerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Service/StorageFactory.php b/library/Zend/Session/Service/StorageFactory.php
old mode 100755
new mode 100644
index 664142685..7dfc827b9
--- a/library/Zend/Session/Service/StorageFactory.php
+++ b/library/Zend/Session/Service/StorageFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/SessionManager.php b/library/Zend/Session/SessionManager.php
old mode 100755
new mode 100644
index e013e0e7a..77219f645
--- a/library/Zend/Session/SessionManager.php
+++ b/library/Zend/Session/SessionManager.php
@@ -3,13 +3,14 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Session;
 
 use Zend\EventManager\EventManagerInterface;
+use Zend\Stdlib\ArrayUtils;
 
 /**
  * Session ManagerInterface implementation utilizing ext/session
@@ -92,8 +93,16 @@ class SessionManager extends AbstractManager
             $this->registerSaveHandler($saveHandler);
         }
 
+        $oldSessionData = $_SESSION;
+
         session_start();
 
+        if ($oldSessionData instanceof \Traversable
+            || (! empty($oldSessionData) && is_array($oldSessionData))
+        ) {
+            $_SESSION = ArrayUtils::merge($oldSessionData, $_SESSION, true);
+        }
+
         $storage = $this->getStorage();
 
         // Since session is starting, we need to potentially repopulate our
@@ -356,8 +365,8 @@ class SessionManager extends AbstractManager
             return;
         }
         setcookie(
-            $this->getName(),                 // session name
-            '',                               // value
+            $this->getName(), // session name
+            '', // value
             $_SERVER['REQUEST_TIME'] - 42000, // TTL for cookie
             $config->getCookiePath(),
             $config->getCookieDomain(),
diff --git a/library/Zend/Session/Storage/AbstractSessionArrayStorage.php b/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
old mode 100755
new mode 100644
index 604954aee..fd861767a
--- a/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
+++ b/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -35,7 +35,6 @@ abstract class AbstractSessionArrayStorage implements
         $this->init($input);
     }
 
-
     /**
      * Initialize Storage
      *
@@ -351,9 +350,9 @@ abstract class AbstractSessionArrayStorage implements
     public function setMetadata($key, $value, $overwriteArray = false)
     {
         if ($this->isImmutable()) {
-            throw new Exception\RuntimeException(sprintf(
-                'Cannot set key "%s" as storage is marked isImmutable', $key
-            ));
+            throw new Exception\RuntimeException(
+                sprintf('Cannot set key "%s" as storage is marked isImmutable', $key)
+            );
         }
 
         if (!isset($_SESSION['__ZF'])) {
diff --git a/library/Zend/Session/Storage/ArrayStorage.php b/library/Zend/Session/Storage/ArrayStorage.php
old mode 100755
new mode 100644
index f0d706472..ed54a31a3
--- a/library/Zend/Session/Storage/ArrayStorage.php
+++ b/library/Zend/Session/Storage/ArrayStorage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -87,14 +87,14 @@ class ArrayStorage extends ArrayObject implements StorageInterface
     public function offsetSet($key, $value)
     {
         if ($this->isImmutable()) {
-            throw new Exception\RuntimeException(sprintf(
-                'Cannot set key "%s" as storage is marked isImmutable', $key
-            ));
+            throw new Exception\RuntimeException(
+                sprintf('Cannot set key "%s" as storage is marked isImmutable', $key)
+            );
         }
         if ($this->isLocked($key)) {
-            throw new Exception\RuntimeException(sprintf(
-                'Cannot set key "%s" due to locking', $key
-            ));
+            throw new Exception\RuntimeException(
+                sprintf('Cannot set key "%s" due to locking', $key)
+            );
         }
 
         parent::offsetSet($key, $value);
@@ -232,9 +232,9 @@ class ArrayStorage extends ArrayObject implements StorageInterface
     public function setMetadata($key, $value, $overwriteArray = false)
     {
         if ($this->isImmutable) {
-            throw new Exception\RuntimeException(sprintf(
-                'Cannot set key "%s" as storage is marked isImmutable', $key
-            ));
+            throw new Exception\RuntimeException(
+                sprintf('Cannot set key "%s" as storage is marked isImmutable', $key)
+            );
         }
 
         if (!isset($this['__ZF'])) {
diff --git a/library/Zend/Session/Storage/Factory.php b/library/Zend/Session/Storage/Factory.php
old mode 100755
new mode 100644
index 0e6c4ea3b..73595fbf8
--- a/library/Zend/Session/Storage/Factory.php
+++ b/library/Zend/Session/Storage/Factory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Storage/SessionArrayStorage.php b/library/Zend/Session/Storage/SessionArrayStorage.php
old mode 100755
new mode 100644
index a8da92920..f000a5891
--- a/library/Zend/Session/Storage/SessionArrayStorage.php
+++ b/library/Zend/Session/Storage/SessionArrayStorage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Storage/SessionStorage.php b/library/Zend/Session/Storage/SessionStorage.php
old mode 100755
new mode 100644
index 231fb7ffd..ec7e29542
--- a/library/Zend/Session/Storage/SessionStorage.php
+++ b/library/Zend/Session/Storage/SessionStorage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Storage/StorageInitializationInterface.php b/library/Zend/Session/Storage/StorageInitializationInterface.php
old mode 100755
new mode 100644
index 8323eed48..afb2f7d73
--- a/library/Zend/Session/Storage/StorageInitializationInterface.php
+++ b/library/Zend/Session/Storage/StorageInitializationInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Storage/StorageInterface.php b/library/Zend/Session/Storage/StorageInterface.php
old mode 100755
new mode 100644
index 4070bc5f5..74a26e398
--- a/library/Zend/Session/Storage/StorageInterface.php
+++ b/library/Zend/Session/Storage/StorageInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Validator/HttpUserAgent.php b/library/Zend/Session/Validator/HttpUserAgent.php
old mode 100755
new mode 100644
index 5b1bf92ed..f8129bfcf
--- a/library/Zend/Session/Validator/HttpUserAgent.php
+++ b/library/Zend/Session/Validator/HttpUserAgent.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Validator/RemoteAddr.php b/library/Zend/Session/Validator/RemoteAddr.php
old mode 100755
new mode 100644
index d8870059e..93baf58bb
--- a/library/Zend/Session/Validator/RemoteAddr.php
+++ b/library/Zend/Session/Validator/RemoteAddr.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/Validator/ValidatorInterface.php b/library/Zend/Session/Validator/ValidatorInterface.php
old mode 100755
new mode 100644
index fcbe9bca4..6f1c8b777
--- a/library/Zend/Session/Validator/ValidatorInterface.php
+++ b/library/Zend/Session/Validator/ValidatorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Session/ValidatorChain.php b/library/Zend/Session/ValidatorChain.php
old mode 100755
new mode 100644
index 5774c98f3..333797d00
--- a/library/Zend/Session/ValidatorChain.php
+++ b/library/Zend/Session/ValidatorChain.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Session;
diff --git a/library/Zend/Session/compatibility/autoload.php b/library/Zend/Session/compatibility/autoload.php
old mode 100755
new mode 100644
index 3ecffe7fc..287c6ba0d
--- a/library/Zend/Session/compatibility/autoload.php
+++ b/library/Zend/Session/compatibility/autoload.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  * @deprecated
  */
diff --git a/library/Zend/Session/composer.json b/library/Zend/Session/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Soap/AutoDiscover.php b/library/Zend/Soap/AutoDiscover.php
old mode 100755
new mode 100644
index 92f79c5f7..fc534aafa
--- a/library/Zend/Soap/AutoDiscover.php
+++ b/library/Zend/Soap/AutoDiscover.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -207,7 +207,6 @@ class AutoDiscover
         return $this->serviceName;
     }
 
-
     /**
      * Set the location at which the WSDL file will be available.
      *
diff --git a/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php b/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
old mode 100755
new mode 100644
index fccbd95da..126b1e3f1
--- a/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
+++ b/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php b/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
old mode 100755
new mode 100644
index abc7688b0..b5ab91a39
--- a/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
+++ b/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/CONTRIBUTING.md b/library/Zend/Soap/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Soap/Client.php b/library/Zend/Soap/Client.php
old mode 100755
new mode 100644
index 6bb794b20..91c956355
--- a/library/Zend/Soap/Client.php
+++ b/library/Zend/Soap/Client.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Client/Common.php b/library/Zend/Soap/Client/Common.php
old mode 100755
new mode 100644
index a252f0b26..5b1c2fb42
--- a/library/Zend/Soap/Client/Common.php
+++ b/library/Zend/Soap/Client/Common.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Client/DotNet.php b/library/Zend/Soap/Client/DotNet.php
old mode 100755
new mode 100644
index 0910dd133..84393d87e
--- a/library/Zend/Soap/Client/DotNet.php
+++ b/library/Zend/Soap/Client/DotNet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Client/Local.php b/library/Zend/Soap/Client/Local.php
old mode 100755
new mode 100644
index 61c11cfa8..fc9868c0e
--- a/library/Zend/Soap/Client/Local.php
+++ b/library/Zend/Soap/Client/Local.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Exception/BadMethodCallException.php b/library/Zend/Soap/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 970baa36d..6cc54650b
--- a/library/Zend/Soap/Exception/BadMethodCallException.php
+++ b/library/Zend/Soap/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Exception/ExceptionInterface.php b/library/Zend/Soap/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index ceb6da94b..1aae25f61
--- a/library/Zend/Soap/Exception/ExceptionInterface.php
+++ b/library/Zend/Soap/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Exception/ExtensionNotLoadedException.php b/library/Zend/Soap/Exception/ExtensionNotLoadedException.php
old mode 100755
new mode 100644
index 536cde405..03e346bd6
--- a/library/Zend/Soap/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Soap/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Exception/InvalidArgumentException.php b/library/Zend/Soap/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 0b0899eec..8b9ec0239
--- a/library/Zend/Soap/Exception/InvalidArgumentException.php
+++ b/library/Zend/Soap/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Exception/RuntimeException.php b/library/Zend/Soap/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 40214d586..9a36a5ab9
--- a/library/Zend/Soap/Exception/RuntimeException.php
+++ b/library/Zend/Soap/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Exception/UnexpectedValueException.php b/library/Zend/Soap/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index 062c1deb5..b18e0108a
--- a/library/Zend/Soap/Exception/UnexpectedValueException.php
+++ b/library/Zend/Soap/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/README.md b/library/Zend/Soap/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Soap/Server.php b/library/Zend/Soap/Server.php
old mode 100755
new mode 100644
index 3c563b44c..dc111d86f
--- a/library/Zend/Soap/Server.php
+++ b/library/Zend/Soap/Server.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Server/DocumentLiteralWrapper.php b/library/Zend/Soap/Server/DocumentLiteralWrapper.php
old mode 100755
new mode 100644
index fcf4c20a3..b3f7222cb
--- a/library/Zend/Soap/Server/DocumentLiteralWrapper.php
+++ b/library/Zend/Soap/Server/DocumentLiteralWrapper.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Wsdl.php b/library/Zend/Soap/Wsdl.php
old mode 100755
new mode 100644
index 33def53c9..a69416208
--- a/library/Zend/Soap/Wsdl.php
+++ b/library/Zend/Soap/Wsdl.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -190,7 +190,7 @@ class Wsdl
         $oldUri = $this->uri;
         $this->uri = $uri;
 
-        if ($this->dom instanceof DOMDocument ) {
+        if ($this->dom instanceof DOMDocument) {
             // namespace declarations are NOT true attributes so one must explicitly set on root element
             //                                                                  xmlns:tns = $uri
             $this->dom->documentElement->setAttributeNS(self::XML_NS_URI, self::XML_NS . ':' . self::TYPES_NS, $uri);
@@ -549,7 +549,7 @@ class Wsdl
         if ($types instanceof DOMDocument) {
             $dom = $this->dom->importNode($types->documentElement);
             $this->wsdl->appendChild($dom);
-        } elseif ($types instanceof DOMNode || $types instanceof DOMElement || $types instanceof DOMDocumentFragment ) {
+        } elseif ($types instanceof DOMNode || $types instanceof DOMElement || $types instanceof DOMDocumentFragment) {
             $dom = $this->dom->importNode($types);
             $this->wsdl->appendChild($dom);
         }
@@ -859,7 +859,7 @@ class Wsdl
      */
     protected function getSoapNamespaceUriByVersion($soapVersion)
     {
-        if ($soapVersion != SOAP_1_1 AND $soapVersion != SOAP_1_2) {
+        if ($soapVersion != SOAP_1_1 and $soapVersion != SOAP_1_2) {
             throw new Exception\InvalidArgumentException('Invalid SOAP version, use constants: SOAP_1_1 or SOAP_1_2');
         }
 
diff --git a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
old mode 100755
new mode 100644
index b8c3b04cd..bdce1f423
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
old mode 100755
new mode 100644
index 17774147d..c1594df85
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
old mode 100755
new mode 100644
index 487a96997..16f9eee5f
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -69,7 +69,6 @@ class ArrayOfTypeComplex extends DefaultComplexType
         // Process singular type using DefaultComplexType strategy
         parent::addComplexType($singularType);
 
-
         // Add array type structure to WSDL document
         $dom = $this->getContext()->toDomDocument();
 
diff --git a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
old mode 100755
new mode 100644
index c9248e2a6..9085f0891
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -104,7 +104,6 @@ class ArrayOfTypeSequence extends DefaultComplexType
         // Register type here to avoid recursion
         $this->getContext()->addType($phpArrayType, $arrayType);
 
-
         $dom = $this->getContext()->toDomDocument();
 
         $arrayTypeName = substr($arrayType, strpos($arrayType, ':') + 1);
diff --git a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php
old mode 100755
new mode 100644
index 47aece373..69128a17f
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
old mode 100755
new mode 100644
index 784e73f64..8f1b9f0b0
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
old mode 100755
new mode 100644
index 59e74e561..b3fe27c32
--- a/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
+++ b/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Soap/composer.json b/library/Zend/Soap/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Stdlib/AbstractOptions.php b/library/Zend/Stdlib/AbstractOptions.php
old mode 100755
new mode 100644
index 6bb4c12a7..29a491f6a
--- a/library/Zend/Stdlib/AbstractOptions.php
+++ b/library/Zend/Stdlib/AbstractOptions.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -47,10 +47,15 @@ abstract class AbstractOptions implements ParameterObjectInterface
         }
 
         if (!is_array($options) && !$options instanceof Traversable) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                'Parameter provided to %s must be an %s, %s or %s',
-                __METHOD__, 'array', 'Traversable', 'Zend\Stdlib\AbstractOptions'
-            ));
+            throw new Exception\InvalidArgumentException(
+                sprintf(
+                    'Parameter provided to %s must be an %s, %s or %s',
+                    __METHOD__,
+                    'array',
+                    'Traversable',
+                    'Zend\Stdlib\AbstractOptions'
+                )
+            );
         }
 
         foreach ($options as $key => $value) {
@@ -93,17 +98,21 @@ abstract class AbstractOptions implements ParameterObjectInterface
      */
     public function __set($key, $value)
     {
-        $setter = 'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
-        if ($this->__strictMode__ && !method_exists($this, $setter)) {
-            throw new Exception\BadMethodCallException(
-                'The option "' . $key . '" does not '
-                . 'have a matching ' . $setter . ' setter method '
-                . 'which must be defined'
-            );
-        } elseif (!$this->__strictMode__ && !method_exists($this, $setter)) {
+        $setter = 'set' . str_replace('_', '', $key);
+
+        if (method_exists($this, $setter)) {
+            $this->{$setter}($value);
+
             return;
         }
-        $this->{$setter}($value);
+
+        if ($this->__strictMode__) {
+            throw new Exception\BadMethodCallException(sprintf(
+                'The option "%s" does not have a matching "%s" setter method which must be defined',
+                $key,
+                'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)))
+            ));
+        }
     }
 
     /**
@@ -116,16 +125,17 @@ abstract class AbstractOptions implements ParameterObjectInterface
      */
     public function __get($key)
     {
-        $getter = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
-        if (!method_exists($this, $getter)) {
-            throw new Exception\BadMethodCallException(
-                'The option "' . $key . '" does not '
-                . 'have a matching ' . $getter . ' getter method '
-                . 'which must be defined'
-            );
+        $getter = 'get' . str_replace('_', '', $key);
+
+        if (method_exists($this, $getter)) {
+            return $this->{$getter}();
         }
 
-        return $this->{$getter}();
+        throw new Exception\BadMethodCallException(sprintf(
+            'The option "%s" does not have a matching "%s" getter method which must be defined',
+            $key,
+            'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)))
+        ));
     }
 
     /**
@@ -154,7 +164,7 @@ abstract class AbstractOptions implements ParameterObjectInterface
         } catch (Exception\BadMethodCallException $e) {
             throw new Exception\InvalidArgumentException(
                 'The class property $' . $key . ' cannot be unset as'
-                    . ' NULL is an invalid value for it',
+                . ' NULL is an invalid value for it',
                 0,
                 $e
             );
diff --git a/library/Zend/Stdlib/ArrayObject.php b/library/Zend/Stdlib/ArrayObject.php
old mode 100755
new mode 100644
index b4d9eb79d..44145c855
--- a/library/Zend/Stdlib/ArrayObject.php
+++ b/library/Zend/Stdlib/ArrayObject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/ArraySerializableInterface.php b/library/Zend/Stdlib/ArraySerializableInterface.php
old mode 100755
new mode 100644
index 222f57b0a..dcf847195
--- a/library/Zend/Stdlib/ArraySerializableInterface.php
+++ b/library/Zend/Stdlib/ArraySerializableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/ArrayStack.php b/library/Zend/Stdlib/ArrayStack.php
old mode 100755
new mode 100644
index 0fcceb954..39d02aaca
--- a/library/Zend/Stdlib/ArrayStack.php
+++ b/library/Zend/Stdlib/ArrayStack.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/ArrayUtils.php b/library/Zend/Stdlib/ArrayUtils.php
old mode 100755
new mode 100644
index a9ece65f8..8f77bc836
--- a/library/Zend/Stdlib/ArrayUtils.php
+++ b/library/Zend/Stdlib/ArrayUtils.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/CONTRIBUTING.md b/library/Zend/Stdlib/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Stdlib/CallbackHandler.php b/library/Zend/Stdlib/CallbackHandler.php
old mode 100755
new mode 100644
index fd74974ed..cc66e457a
--- a/library/Zend/Stdlib/CallbackHandler.php
+++ b/library/Zend/Stdlib/CallbackHandler.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/DateTime.php b/library/Zend/Stdlib/DateTime.php
old mode 100755
new mode 100644
index 64a39f62f..cdab67d6e
--- a/library/Zend/Stdlib/DateTime.php
+++ b/library/Zend/Stdlib/DateTime.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/DispatchableInterface.php b/library/Zend/Stdlib/DispatchableInterface.php
old mode 100755
new mode 100644
index b8bfdac16..4f74d1e8a
--- a/library/Zend/Stdlib/DispatchableInterface.php
+++ b/library/Zend/Stdlib/DispatchableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/ErrorHandler.php b/library/Zend/Stdlib/ErrorHandler.php
old mode 100755
new mode 100644
index d3255843c..01949d1ef
--- a/library/Zend/Stdlib/ErrorHandler.php
+++ b/library/Zend/Stdlib/ErrorHandler.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Exception/BadMethodCallException.php b/library/Zend/Stdlib/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 4b06b3885..0254e45bf
--- a/library/Zend/Stdlib/Exception/BadMethodCallException.php
+++ b/library/Zend/Stdlib/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Exception/DomainException.php b/library/Zend/Stdlib/Exception/DomainException.php
old mode 100755
new mode 100644
index 3178c1534..6d2ac714a
--- a/library/Zend/Stdlib/Exception/DomainException.php
+++ b/library/Zend/Stdlib/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Exception/ExceptionInterface.php b/library/Zend/Stdlib/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index d43eb3078..60b795f8d
--- a/library/Zend/Stdlib/Exception/ExceptionInterface.php
+++ b/library/Zend/Stdlib/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Exception/ExtensionNotLoadedException.php b/library/Zend/Stdlib/Exception/ExtensionNotLoadedException.php
old mode 100755
new mode 100644
index 3955952f8..4b51475f2
--- a/library/Zend/Stdlib/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Stdlib/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Exception/InvalidArgumentException.php b/library/Zend/Stdlib/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 534d1906a..8028c4717
--- a/library/Zend/Stdlib/Exception/InvalidArgumentException.php
+++ b/library/Zend/Stdlib/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Exception/InvalidCallbackException.php b/library/Zend/Stdlib/Exception/InvalidCallbackException.php
old mode 100755
new mode 100644
index bfc1070a1..aa36f9863
--- a/library/Zend/Stdlib/Exception/InvalidCallbackException.php
+++ b/library/Zend/Stdlib/Exception/InvalidCallbackException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Exception/LogicException.php b/library/Zend/Stdlib/Exception/LogicException.php
old mode 100755
new mode 100644
index 8becb252b..087ac0e83
--- a/library/Zend/Stdlib/Exception/LogicException.php
+++ b/library/Zend/Stdlib/Exception/LogicException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Exception/RuntimeException.php b/library/Zend/Stdlib/Exception/RuntimeException.php
old mode 100755
new mode 100644
index bb52eb874..f3891d64b
--- a/library/Zend/Stdlib/Exception/RuntimeException.php
+++ b/library/Zend/Stdlib/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Extractor/ExtractionInterface.php b/library/Zend/Stdlib/Extractor/ExtractionInterface.php
old mode 100755
new mode 100644
index 8913b0996..297d55774
--- a/library/Zend/Stdlib/Extractor/ExtractionInterface.php
+++ b/library/Zend/Stdlib/Extractor/ExtractionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Glob.php b/library/Zend/Stdlib/Glob.php
old mode 100755
new mode 100644
index 5a821be9e..a4d0068a0
--- a/library/Zend/Stdlib/Glob.php
+++ b/library/Zend/Stdlib/Glob.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Stdlib;
 
-
 /**
  * Wrapper for glob with fallback if GLOB_BRACE is not available.
  */
diff --git a/library/Zend/Stdlib/Guard/AllGuardsTrait.php b/library/Zend/Stdlib/Guard/AllGuardsTrait.php
old mode 100755
new mode 100644
index 60b341288..95bc5162d
--- a/library/Zend/Stdlib/Guard/AllGuardsTrait.php
+++ b/library/Zend/Stdlib/Guard/AllGuardsTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Guard/ArrayOrTraversableGuardTrait.php b/library/Zend/Stdlib/Guard/ArrayOrTraversableGuardTrait.php
old mode 100755
new mode 100644
index 84e846ea3..e6959a5ef
--- a/library/Zend/Stdlib/Guard/ArrayOrTraversableGuardTrait.php
+++ b/library/Zend/Stdlib/Guard/ArrayOrTraversableGuardTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Guard/EmptyGuardTrait.php b/library/Zend/Stdlib/Guard/EmptyGuardTrait.php
old mode 100755
new mode 100644
index 72f5b3459..c6751cc35
--- a/library/Zend/Stdlib/Guard/EmptyGuardTrait.php
+++ b/library/Zend/Stdlib/Guard/EmptyGuardTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Guard/GuardUtils.php b/library/Zend/Stdlib/Guard/GuardUtils.php
old mode 100755
new mode 100644
index 31c446410..4fe4ccacb
--- a/library/Zend/Stdlib/Guard/GuardUtils.php
+++ b/library/Zend/Stdlib/Guard/GuardUtils.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Guard/NullGuardTrait.php b/library/Zend/Stdlib/Guard/NullGuardTrait.php
old mode 100755
new mode 100644
index e7aadb150..eac716281
--- a/library/Zend/Stdlib/Guard/NullGuardTrait.php
+++ b/library/Zend/Stdlib/Guard/NullGuardTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/AbstractHydrator.php b/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
old mode 100755
new mode 100644
index fc07ae4da..338ed8044
--- a/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
+++ b/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/Aggregate/AggregateHydrator.php b/library/Zend/Stdlib/Hydrator/Aggregate/AggregateHydrator.php
old mode 100755
new mode 100644
index 335f5648a..38a868e02
--- a/library/Zend/Stdlib/Hydrator/Aggregate/AggregateHydrator.php
+++ b/library/Zend/Stdlib/Hydrator/Aggregate/AggregateHydrator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php b/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php
old mode 100755
new mode 100644
index 7e199397a..b13bc5c70
--- a/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php
+++ b/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Stdlib\Hydrator\Aggregate;
 
-
 use Zend\EventManager\Event;
 
 /**
diff --git a/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php b/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php
old mode 100755
new mode 100644
index 0cc48abee..a7c91eec2
--- a/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php
+++ b/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Stdlib\Hydrator\Aggregate;
 
-
 use Zend\EventManager\Event;
 
 /**
diff --git a/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php b/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
old mode 100755
new mode 100644
index d2d8ff46a..1c25ff3c4
--- a/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
+++ b/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Stdlib\Hydrator\Aggregate;
 
-
 use Zend\EventManager\AbstractListenerAggregate;
 use Zend\EventManager\EventManagerInterface;
 use Zend\Stdlib\Hydrator\HydratorInterface;
diff --git a/library/Zend/Stdlib/Hydrator/ArraySerializable.php b/library/Zend/Stdlib/Hydrator/ArraySerializable.php
old mode 100755
new mode 100644
index 7b8a48bae..4f4ab2a13
--- a/library/Zend/Stdlib/Hydrator/ArraySerializable.php
+++ b/library/Zend/Stdlib/Hydrator/ArraySerializable.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -25,9 +25,9 @@ class ArraySerializable extends AbstractHydrator
     public function extract($object)
     {
         if (!is_callable(array($object, 'getArrayCopy'))) {
-            throw new Exception\BadMethodCallException(sprintf(
-                '%s expects the provided object to implement getArrayCopy()', __METHOD__
-            ));
+            throw new Exception\BadMethodCallException(
+                sprintf('%s expects the provided object to implement getArrayCopy()', __METHOD__)
+            );
         }
 
         $data = $object->getArrayCopy();
@@ -74,9 +74,9 @@ class ArraySerializable extends AbstractHydrator
         } elseif (is_callable(array($object, 'populate'))) {
             $object->populate($replacement);
         } else {
-            throw new Exception\BadMethodCallException(sprintf(
-                '%s expects the provided object to implement exchangeArray() or populate()', __METHOD__
-            ));
+            throw new Exception\BadMethodCallException(
+                sprintf('%s expects the provided object to implement exchangeArray() or populate()', __METHOD__)
+            );
         }
         return $object;
     }
diff --git a/library/Zend/Stdlib/Hydrator/ClassMethods.php b/library/Zend/Stdlib/Hydrator/ClassMethods.php
old mode 100755
new mode 100644
index 07376d951..526a27640
--- a/library/Zend/Stdlib/Hydrator/ClassMethods.php
+++ b/library/Zend/Stdlib/Hydrator/ClassMethods.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -109,9 +109,9 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
     public function extract($object)
     {
         if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(sprintf(
-                '%s expects the provided $object to be a PHP object)', __METHOD__
-            ));
+            throw new Exception\BadMethodCallException(
+                sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
+            );
         }
 
         $filter = null;
@@ -168,9 +168,9 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
     public function hydrate(array $data, $object)
     {
         if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(sprintf(
-                '%s expects the provided $object to be a PHP object)', __METHOD__
-            ));
+            throw new Exception\BadMethodCallException(
+                sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
+            );
         }
 
         foreach ($data as $property => $value) {
diff --git a/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php b/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php
old mode 100755
new mode 100644
index 49cd785d4..000fc701e
--- a/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php
+++ b/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Stdlib\Hydrator\Filter;
@@ -40,12 +40,10 @@ class FilterComposite implements FilterInterface
      */
     public function __construct($orFilter = array(), $andFilter = array())
     {
-        array_walk($orFilter,
+        array_walk(
+            $orFilter,
             function ($value, $key) {
-                if (
-                    !is_callable($value)
-                    && !$value instanceof FilterInterface
-                ) {
+                if (!is_callable($value) && !$value instanceof FilterInterface) {
                     throw new InvalidArgumentException(
                         'The value of ' . $key . ' should be either a callable or ' .
                         'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
@@ -54,12 +52,10 @@ class FilterComposite implements FilterInterface
             }
         );
 
-        array_walk($andFilter,
+        array_walk(
+            $andFilter,
             function ($value, $key) {
-                if (
-                    !is_callable($value)
-                    && !$value instanceof FilterInterface
-                ) {
+                if (!is_callable($value) && !$value instanceof FilterInterface) {
                     throw new InvalidArgumentException(
                         'The value of ' . $key . '  should be either a callable or ' .
                         'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
diff --git a/library/Zend/Stdlib/Hydrator/Filter/FilterInterface.php b/library/Zend/Stdlib/Hydrator/Filter/FilterInterface.php
old mode 100755
new mode 100644
index 7e2ebaaea..16df098f5
--- a/library/Zend/Stdlib/Hydrator/Filter/FilterInterface.php
+++ b/library/Zend/Stdlib/Hydrator/Filter/FilterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Stdlib\Hydrator\Filter;
diff --git a/library/Zend/Stdlib/Hydrator/Filter/FilterProviderInterface.php b/library/Zend/Stdlib/Hydrator/Filter/FilterProviderInterface.php
old mode 100755
new mode 100644
index e3fbc8c07..c2e978877
--- a/library/Zend/Stdlib/Hydrator/Filter/FilterProviderInterface.php
+++ b/library/Zend/Stdlib/Hydrator/Filter/FilterProviderInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Stdlib\Hydrator\Filter;
diff --git a/library/Zend/Stdlib/Hydrator/Filter/GetFilter.php b/library/Zend/Stdlib/Hydrator/Filter/GetFilter.php
old mode 100755
new mode 100644
index 8a303f8f3..b4d898dc2
--- a/library/Zend/Stdlib/Hydrator/Filter/GetFilter.php
+++ b/library/Zend/Stdlib/Hydrator/Filter/GetFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Stdlib\Hydrator\Filter;
diff --git a/library/Zend/Stdlib/Hydrator/Filter/HasFilter.php b/library/Zend/Stdlib/Hydrator/Filter/HasFilter.php
old mode 100755
new mode 100644
index 48011fe05..0cf57f95e
--- a/library/Zend/Stdlib/Hydrator/Filter/HasFilter.php
+++ b/library/Zend/Stdlib/Hydrator/Filter/HasFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Stdlib\Hydrator\Filter;
diff --git a/library/Zend/Stdlib/Hydrator/Filter/IsFilter.php b/library/Zend/Stdlib/Hydrator/Filter/IsFilter.php
old mode 100755
new mode 100644
index 736212b5b..3b6e37637
--- a/library/Zend/Stdlib/Hydrator/Filter/IsFilter.php
+++ b/library/Zend/Stdlib/Hydrator/Filter/IsFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Stdlib\Hydrator\Filter;
diff --git a/library/Zend/Stdlib/Hydrator/Filter/MethodMatchFilter.php b/library/Zend/Stdlib/Hydrator/Filter/MethodMatchFilter.php
old mode 100755
new mode 100644
index 0f8db0714..5ed594ee7
--- a/library/Zend/Stdlib/Hydrator/Filter/MethodMatchFilter.php
+++ b/library/Zend/Stdlib/Hydrator/Filter/MethodMatchFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Stdlib\Hydrator\Filter;
diff --git a/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php b/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php
old mode 100755
new mode 100644
index 3d153e3ad..1254b63b3
--- a/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php
+++ b/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/Filter/OptionalParametersFilter.php b/library/Zend/Stdlib/Hydrator/Filter/OptionalParametersFilter.php
old mode 100755
new mode 100644
index 464015905..ccd67ca54
--- a/library/Zend/Stdlib/Hydrator/Filter/OptionalParametersFilter.php
+++ b/library/Zend/Stdlib/Hydrator/Filter/OptionalParametersFilter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link           http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Stdlib\Hydrator\Filter;
diff --git a/library/Zend/Stdlib/Hydrator/FilterEnabledInterface.php b/library/Zend/Stdlib/Hydrator/FilterEnabledInterface.php
old mode 100755
new mode 100644
index 04505bb2c..380aade05
--- a/library/Zend/Stdlib/Hydrator/FilterEnabledInterface.php
+++ b/library/Zend/Stdlib/Hydrator/FilterEnabledInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/HydrationInterface.php b/library/Zend/Stdlib/Hydrator/HydrationInterface.php
old mode 100755
new mode 100644
index 340a7663b..e7deff491
--- a/library/Zend/Stdlib/Hydrator/HydrationInterface.php
+++ b/library/Zend/Stdlib/Hydrator/HydrationInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php b/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php
old mode 100755
new mode 100644
index 598af9f1e..d64782ea4
--- a/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php
+++ b/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/HydratorAwareTrait.php b/library/Zend/Stdlib/Hydrator/HydratorAwareTrait.php
old mode 100755
new mode 100644
index 94df73070..9c772c277
--- a/library/Zend/Stdlib/Hydrator/HydratorAwareTrait.php
+++ b/library/Zend/Stdlib/Hydrator/HydratorAwareTrait.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/HydratorInterface.php b/library/Zend/Stdlib/Hydrator/HydratorInterface.php
old mode 100755
new mode 100644
index 1c7355383..bc9983d9a
--- a/library/Zend/Stdlib/Hydrator/HydratorInterface.php
+++ b/library/Zend/Stdlib/Hydrator/HydratorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/HydratorOptionsInterface.php b/library/Zend/Stdlib/Hydrator/HydratorOptionsInterface.php
old mode 100755
new mode 100644
index 0830b7581..44610f7c1
--- a/library/Zend/Stdlib/Hydrator/HydratorOptionsInterface.php
+++ b/library/Zend/Stdlib/Hydrator/HydratorOptionsInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/HydratorPluginManager.php b/library/Zend/Stdlib/Hydrator/HydratorPluginManager.php
old mode 100755
new mode 100644
index 3b01f0c99..347cce323
--- a/library/Zend/Stdlib/Hydrator/HydratorPluginManager.php
+++ b/library/Zend/Stdlib/Hydrator/HydratorPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/NamingStrategy/NamingStrategyInterface.php b/library/Zend/Stdlib/Hydrator/NamingStrategy/NamingStrategyInterface.php
old mode 100755
new mode 100644
index dacca1197..ff99385c1
--- a/library/Zend/Stdlib/Hydrator/NamingStrategy/NamingStrategyInterface.php
+++ b/library/Zend/Stdlib/Hydrator/NamingStrategy/NamingStrategyInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php b/library/Zend/Stdlib/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
old mode 100755
new mode 100644
index c6eceb531..e76e7b04f
--- a/library/Zend/Stdlib/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
+++ b/library/Zend/Stdlib/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/NamingStrategyEnabledInterface.php b/library/Zend/Stdlib/Hydrator/NamingStrategyEnabledInterface.php
old mode 100755
new mode 100644
index ab1ce7f1c..f9c6288a7
--- a/library/Zend/Stdlib/Hydrator/NamingStrategyEnabledInterface.php
+++ b/library/Zend/Stdlib/Hydrator/NamingStrategyEnabledInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/ObjectProperty.php b/library/Zend/Stdlib/Hydrator/ObjectProperty.php
old mode 100755
new mode 100644
index 20c97c4a2..c9f5260a5
--- a/library/Zend/Stdlib/Hydrator/ObjectProperty.php
+++ b/library/Zend/Stdlib/Hydrator/ObjectProperty.php
@@ -3,48 +3,56 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Stdlib\Hydrator;
 
 use Zend\Stdlib\Exception;
+use ReflectionClass;
+use ReflectionProperty;
 
 class ObjectProperty extends AbstractHydrator
 {
     /**
-     * Extract values from an object
+     * @var array[] indexed by class name and then property name
+     */
+    private static $skippedPropertiesCache = array();
+
+    /**
+     * {@inheritDoc}
      *
      * Extracts the accessible non-static properties of the given $object.
      *
-     * @param  object $object
-     * @return array
      * @throws Exception\BadMethodCallException for a non-object $object
      */
     public function extract($object)
     {
         if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(sprintf(
-                '%s expects the provided $object to be a PHP object)', __METHOD__
-            ));
+            throw new Exception\BadMethodCallException(
+                sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
+            );
         }
 
-        $data = get_object_vars($object);
-
+        $data   = get_object_vars($object);
         $filter = $this->getFilter();
+
         foreach ($data as $name => $value) {
             // Filter keys, removing any we don't want
-            if (!$filter->filter($name)) {
+            if (! $filter->filter($name)) {
                 unset($data[$name]);
                 continue;
             }
+
             // Replace name if extracted differ
             $extracted = $this->extractName($name, $object);
+
             if ($extracted !== $name) {
                 unset($data[$name]);
                 $name = $extracted;
             }
+
             $data[$name] = $this->extractValue($name, $value, $object);
         }
 
@@ -52,26 +60,51 @@ class ObjectProperty extends AbstractHydrator
     }
 
     /**
+     * {@inheritDoc}
+     *
      * Hydrate an object by populating public properties
      *
      * Hydrates an object by setting public properties of the object.
      *
-     * @param  array $data
-     * @param  object $object
-     * @return object
      * @throws Exception\BadMethodCallException for a non-object $object
      */
     public function hydrate(array $data, $object)
     {
         if (!is_object($object)) {
-            throw new Exception\BadMethodCallException(sprintf(
-                '%s expects the provided $object to be a PHP object)', __METHOD__
-            ));
+            throw new Exception\BadMethodCallException(
+                sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
+            );
         }
+
+        $properties = & self::$skippedPropertiesCache[get_class($object)];
+
+        if (! isset($properties)) {
+            $reflection = new ReflectionClass($object);
+            $properties = array_fill_keys(
+                array_map(
+                    function (ReflectionProperty $property) {
+                        return $property->getName();
+                    },
+                    $reflection->getProperties(
+                        ReflectionProperty::IS_PRIVATE
+                        + ReflectionProperty::IS_PROTECTED
+                        + ReflectionProperty::IS_STATIC
+                    )
+                ),
+                true
+            );
+        }
+
         foreach ($data as $name => $value) {
             $property = $this->hydrateName($name, $data);
+
+            if (isset($properties[$property])) {
+                continue;
+            }
+
             $object->$property = $this->hydrateValue($property, $value, $data);
         }
+
         return $object;
     }
 }
diff --git a/library/Zend/Stdlib/Hydrator/Reflection.php b/library/Zend/Stdlib/Hydrator/Reflection.php
old mode 100755
new mode 100644
index 3c066e963..ea8e2d215
--- a/library/Zend/Stdlib/Hydrator/Reflection.php
+++ b/library/Zend/Stdlib/Hydrator/Reflection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -16,7 +16,7 @@ class Reflection extends AbstractHydrator
 {
     /**
      * Simple in-memory array cache of ReflectionProperties used.
-     * @var array
+     * @var \ReflectionProperty[]
      */
     protected static $reflProperties = array();
 
@@ -67,7 +67,7 @@ class Reflection extends AbstractHydrator
      *
      * @param  string|object $input
      * @throws Exception\InvalidArgumentException
-     * @return array
+     * @return \ReflectionProperty[]
      */
     protected static function getReflProperties($input)
     {
diff --git a/library/Zend/Stdlib/Hydrator/Strategy/ClosureStrategy.php b/library/Zend/Stdlib/Hydrator/Strategy/ClosureStrategy.php
old mode 100755
new mode 100644
index 6360c868d..bf456a7fc
--- a/library/Zend/Stdlib/Hydrator/Strategy/ClosureStrategy.php
+++ b/library/Zend/Stdlib/Hydrator/Strategy/ClosureStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php b/library/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php
old mode 100755
new mode 100644
index d455f177d..b2c5c29b4
--- a/library/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php
+++ b/library/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php b/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
old mode 100755
new mode 100644
index 71375bb97..260efa308
--- a/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
+++ b/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php b/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php
old mode 100755
new mode 100644
index 03208b3ee..562ec4bd6
--- a/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php
+++ b/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php b/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php
old mode 100755
new mode 100644
index 9cb0f4ab6..6f29b16a6
--- a/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php
+++ b/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/InitializableInterface.php b/library/Zend/Stdlib/InitializableInterface.php
old mode 100755
new mode 100644
index f50343c25..f78bedef3
--- a/library/Zend/Stdlib/InitializableInterface.php
+++ b/library/Zend/Stdlib/InitializableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/JsonSerializable.php b/library/Zend/Stdlib/JsonSerializable.php
old mode 100755
new mode 100644
index 9d00b3560..6d6c2abe8
--- a/library/Zend/Stdlib/JsonSerializable.php
+++ b/library/Zend/Stdlib/JsonSerializable.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/JsonSerializable/PhpLegacyCompatibility.php b/library/Zend/Stdlib/JsonSerializable/PhpLegacyCompatibility.php
old mode 100755
new mode 100644
index a590cab67..ecc7525d4
--- a/library/Zend/Stdlib/JsonSerializable/PhpLegacyCompatibility.php
+++ b/library/Zend/Stdlib/JsonSerializable/PhpLegacyCompatibility.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Message.php b/library/Zend/Stdlib/Message.php
old mode 100755
new mode 100644
index c6c1c825c..63ba7c730
--- a/library/Zend/Stdlib/Message.php
+++ b/library/Zend/Stdlib/Message.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/MessageInterface.php b/library/Zend/Stdlib/MessageInterface.php
old mode 100755
new mode 100644
index 990ed9c83..28d8857fc
--- a/library/Zend/Stdlib/MessageInterface.php
+++ b/library/Zend/Stdlib/MessageInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/ParameterObjectInterface.php b/library/Zend/Stdlib/ParameterObjectInterface.php
old mode 100755
new mode 100644
index e03f4e6c4..676a6e2b9
--- a/library/Zend/Stdlib/ParameterObjectInterface.php
+++ b/library/Zend/Stdlib/ParameterObjectInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Parameters.php b/library/Zend/Stdlib/Parameters.php
old mode 100755
new mode 100644
index 484dde25d..f59197cbe
--- a/library/Zend/Stdlib/Parameters.php
+++ b/library/Zend/Stdlib/Parameters.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/ParametersInterface.php b/library/Zend/Stdlib/ParametersInterface.php
old mode 100755
new mode 100644
index 7dcd66778..feeda5807
--- a/library/Zend/Stdlib/ParametersInterface.php
+++ b/library/Zend/Stdlib/ParametersInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/PriorityList.php b/library/Zend/Stdlib/PriorityList.php
old mode 100755
new mode 100644
index e9cc56a22..ba206a958
--- a/library/Zend/Stdlib/PriorityList.php
+++ b/library/Zend/Stdlib/PriorityList.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -252,9 +252,9 @@ class PriorityList implements Iterator, Countable
         }
 
         return array_map(
-            self::EXTR_PRIORITY === $flag
-                ? function ($item) { return $item['priority']; }
-                : function ($item) { return $item['data']; },
+            function ($item) use ($flag) {
+                return ($flag == PriorityList::EXTR_PRIORITY) ? $item['priority'] : $item['data'];
+            },
             $this->items
         );
     }
diff --git a/library/Zend/Stdlib/PriorityQueue.php b/library/Zend/Stdlib/PriorityQueue.php
old mode 100755
new mode 100644
index 869af132f..81acaf59f
--- a/library/Zend/Stdlib/PriorityQueue.php
+++ b/library/Zend/Stdlib/PriorityQueue.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/README.md b/library/Zend/Stdlib/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Stdlib/Request.php b/library/Zend/Stdlib/Request.php
old mode 100755
new mode 100644
index 674111e31..7c0840395
--- a/library/Zend/Stdlib/Request.php
+++ b/library/Zend/Stdlib/Request.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/RequestInterface.php b/library/Zend/Stdlib/RequestInterface.php
old mode 100755
new mode 100644
index 210e48690..c2bac316d
--- a/library/Zend/Stdlib/RequestInterface.php
+++ b/library/Zend/Stdlib/RequestInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/Response.php b/library/Zend/Stdlib/Response.php
old mode 100755
new mode 100644
index 69b8818ae..f3074bad5
--- a/library/Zend/Stdlib/Response.php
+++ b/library/Zend/Stdlib/Response.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/ResponseInterface.php b/library/Zend/Stdlib/ResponseInterface.php
old mode 100755
new mode 100644
index 894986aab..fe94d3043
--- a/library/Zend/Stdlib/ResponseInterface.php
+++ b/library/Zend/Stdlib/ResponseInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/SplPriorityQueue.php b/library/Zend/Stdlib/SplPriorityQueue.php
old mode 100755
new mode 100644
index 404e4c243..029d8e9f0
--- a/library/Zend/Stdlib/SplPriorityQueue.php
+++ b/library/Zend/Stdlib/SplPriorityQueue.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -42,7 +42,6 @@ class SplPriorityQueue extends \SplPriorityQueue implements Serializable
         parent::insert($datum, $priority);
     }
 
-
     /**
      * Serialize to an array
      *
@@ -59,7 +58,6 @@ class SplPriorityQueue extends \SplPriorityQueue implements Serializable
         return $array;
     }
 
-
     /**
      * Serialize
      *
diff --git a/library/Zend/Stdlib/SplQueue.php b/library/Zend/Stdlib/SplQueue.php
old mode 100755
new mode 100644
index fe06b8847..029bc9f12
--- a/library/Zend/Stdlib/SplQueue.php
+++ b/library/Zend/Stdlib/SplQueue.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/SplStack.php b/library/Zend/Stdlib/SplStack.php
old mode 100755
new mode 100644
index 1b17acc72..fac77a5d0
--- a/library/Zend/Stdlib/SplStack.php
+++ b/library/Zend/Stdlib/SplStack.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/StringUtils.php b/library/Zend/Stdlib/StringUtils.php
old mode 100755
new mode 100644
index eed15d00c..9bbb4a46e
--- a/library/Zend/Stdlib/StringUtils.php
+++ b/library/Zend/Stdlib/StringUtils.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php b/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
old mode 100755
new mode 100644
index 74d0c55f1..3e395ccc5
--- a/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
+++ b/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -67,7 +67,6 @@ abstract class AbstractStringWrapper implements StringWrapperInterface
             );
         }
 
-
         if ($convertEncoding !== null) {
             $convertEncodingUpper = strtoupper($convertEncoding);
             if (!in_array($convertEncodingUpper, $supportedEncodings)) {
diff --git a/library/Zend/Stdlib/StringWrapper/Iconv.php b/library/Zend/Stdlib/StringWrapper/Iconv.php
old mode 100755
new mode 100644
index d240eaadd..04930ff45
--- a/library/Zend/Stdlib/StringWrapper/Iconv.php
+++ b/library/Zend/Stdlib/StringWrapper/Iconv.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/StringWrapper/Intl.php b/library/Zend/Stdlib/StringWrapper/Intl.php
old mode 100755
new mode 100644
index 77596c847..1b0127736
--- a/library/Zend/Stdlib/StringWrapper/Intl.php
+++ b/library/Zend/Stdlib/StringWrapper/Intl.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/StringWrapper/MbString.php b/library/Zend/Stdlib/StringWrapper/MbString.php
old mode 100755
new mode 100644
index fad662956..d6db18566
--- a/library/Zend/Stdlib/StringWrapper/MbString.php
+++ b/library/Zend/Stdlib/StringWrapper/MbString.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/StringWrapper/Native.php b/library/Zend/Stdlib/StringWrapper/Native.php
old mode 100755
new mode 100644
index d6e55b108..38b3c10a4
--- a/library/Zend/Stdlib/StringWrapper/Native.php
+++ b/library/Zend/Stdlib/StringWrapper/Native.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php b/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php
old mode 100755
new mode 100644
index a22c4e557..f25b3253f
--- a/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php
+++ b/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Stdlib/compatibility/autoload.php b/library/Zend/Stdlib/compatibility/autoload.php
old mode 100755
new mode 100644
index 1a237d227..f8670cc16
--- a/library/Zend/Stdlib/compatibility/autoload.php
+++ b/library/Zend/Stdlib/compatibility/autoload.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  * @deprecated
  */
diff --git a/library/Zend/Stdlib/composer.json b/library/Zend/Stdlib/composer.json
old mode 100755
new mode 100644
index cc7492ed6..642622704
--- a/library/Zend/Stdlib/composer.json
+++ b/library/Zend/Stdlib/composer.json
@@ -19,12 +19,14 @@
     "require-dev": {
         "zendframework/zend-eventmanager": "self.version",
         "zendframework/zend-serializer": "self.version",
-        "zendframework/zend-servicemanager": "self.version"
+        "zendframework/zend-servicemanager": "self.version",
+        "zendframework/zend-filter": "self.version"
     },
     "suggest": {
         "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
         "zendframework/zend-serializer": "Zend\\Serializer component",
-        "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+        "zendframework/zend-servicemanager": "To support hydrator plugin manager usage",
+        "zendframework/zend-filter": "To support naming strategy hydrator usage"
     },
     "extra": {
         "branch-alias": {
diff --git a/library/Zend/Tag/CONTRIBUTING.md b/library/Zend/Tag/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Tag/Cloud.php b/library/Zend/Tag/Cloud.php
old mode 100755
new mode 100644
index af108c5d3..3d6e2277e
--- a/library/Zend/Tag/Cloud.php
+++ b/library/Zend/Tag/Cloud.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php b/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php
old mode 100755
new mode 100644
index 3510b28b1..2b001638d
--- a/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php
+++ b/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Cloud/Decorator/AbstractDecorator.php b/library/Zend/Tag/Cloud/Decorator/AbstractDecorator.php
old mode 100755
new mode 100644
index d33db3c22..cfc913625
--- a/library/Zend/Tag/Cloud/Decorator/AbstractDecorator.php
+++ b/library/Zend/Tag/Cloud/Decorator/AbstractDecorator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Cloud/Decorator/AbstractTag.php b/library/Zend/Tag/Cloud/Decorator/AbstractTag.php
old mode 100755
new mode 100644
index b2e61d76e..c4fcaacfb
--- a/library/Zend/Tag/Cloud/Decorator/AbstractTag.php
+++ b/library/Zend/Tag/Cloud/Decorator/AbstractTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php b/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php
old mode 100755
new mode 100644
index 312e8aeee..18bc5e386
--- a/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php
+++ b/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php b/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 70dfaadc4..1526b6256
--- a/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
+++ b/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php b/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 7dca916d8..8d4d2cf46
--- a/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php
+++ b/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php b/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
old mode 100755
new mode 100644
index 1e2d84870..625d51ca0
--- a/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
+++ b/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Cloud/Decorator/HtmlTag.php b/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
old mode 100755
new mode 100644
index ebbe8dad8..b7ecf3491
--- a/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
+++ b/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Cloud/DecoratorPluginManager.php b/library/Zend/Tag/Cloud/DecoratorPluginManager.php
old mode 100755
new mode 100644
index acb74a9ca..1a951846a
--- a/library/Zend/Tag/Cloud/DecoratorPluginManager.php
+++ b/library/Zend/Tag/Cloud/DecoratorPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Exception/ExceptionInterface.php b/library/Zend/Tag/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index cd99c4e53..3a8e882a3
--- a/library/Zend/Tag/Exception/ExceptionInterface.php
+++ b/library/Zend/Tag/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Exception/InvalidArgumentException.php b/library/Zend/Tag/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 54b8c8349..88a8db566
--- a/library/Zend/Tag/Exception/InvalidArgumentException.php
+++ b/library/Zend/Tag/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Exception/InvalidAttributeNameException.php b/library/Zend/Tag/Exception/InvalidAttributeNameException.php
old mode 100755
new mode 100644
index afe351d09..44700c858
--- a/library/Zend/Tag/Exception/InvalidAttributeNameException.php
+++ b/library/Zend/Tag/Exception/InvalidAttributeNameException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Exception/InvalidElementNameException.php b/library/Zend/Tag/Exception/InvalidElementNameException.php
old mode 100755
new mode 100644
index e5a0ea48a..02f15376f
--- a/library/Zend/Tag/Exception/InvalidElementNameException.php
+++ b/library/Zend/Tag/Exception/InvalidElementNameException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Exception/OutOfBoundsException.php b/library/Zend/Tag/Exception/OutOfBoundsException.php
old mode 100755
new mode 100644
index d93d199ca..6db45d520
--- a/library/Zend/Tag/Exception/OutOfBoundsException.php
+++ b/library/Zend/Tag/Exception/OutOfBoundsException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/Item.php b/library/Zend/Tag/Item.php
old mode 100755
new mode 100644
index 35effba90..96c2ea5a6
--- a/library/Zend/Tag/Item.php
+++ b/library/Zend/Tag/Item.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/ItemList.php b/library/Zend/Tag/ItemList.php
old mode 100755
new mode 100644
index 758526017..c85a8586f
--- a/library/Zend/Tag/ItemList.php
+++ b/library/Zend/Tag/ItemList.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/README.md b/library/Zend/Tag/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Tag/TaggableInterface.php b/library/Zend/Tag/TaggableInterface.php
old mode 100755
new mode 100644
index 3a475ac9d..6489a0395
--- a/library/Zend/Tag/TaggableInterface.php
+++ b/library/Zend/Tag/TaggableInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Tag/composer.json b/library/Zend/Tag/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Test/CONTRIBUTING.md b/library/Zend/Test/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php b/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
old mode 100755
new mode 100644
index d1f1ea215..e30d948ac
--- a/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
+++ b/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
@@ -4,7 +4,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Test\PHPUnit\Controller;
@@ -29,10 +29,13 @@ abstract class AbstractConsoleControllerTestCase extends AbstractControllerTestC
     {
         $response = $this->getResponse();
         if (false === stripos($response->getContent(), $match)) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting output CONTAINS content "%s", actual content is "%s"',
-                $match, $response->getContent()
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf(
+                    'Failed asserting output CONTAINS content "%s", actual content is "%s"',
+                    $match,
+                    $response->getContent()
+                )
+            );
         }
         $this->assertNotSame(false, stripos($response->getContent(), $match));
     }
diff --git a/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
old mode 100755
new mode 100644
index 71a356a25..cccf5203d
--- a/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
+++ b/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Test\PHPUnit\Controller;
@@ -232,13 +232,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
             $query = array_merge($query, $params);
         } elseif ($method == HttpRequest::METHOD_PUT) {
             if (count($params) != 0) {
-                array_walk(
-                    $params,
-                    function (&$item, $key) {
-                        $item = $key . '=' . $item;
-                    }
-                );
-                $content = implode('&', $params);
+                $content = http_build_query($params);
                 $request->setContent($content);
             }
         } elseif ($params) {
@@ -270,9 +264,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
      */
     public function dispatch($url, $method = null, $params = array(), $isXmlHttpRequest = false)
     {
-        if ( !isset($method) &&
-             $this->getRequest() instanceof HttpRequest &&
-             $requestMethod = $this->getRequest()->getMethod()
+        if (!isset($method)
+            && $this->getRequest() instanceof HttpRequest
+            && $requestMethod = $this->getRequest()->getMethod()
         ) {
             $method = $requestMethod;
         } elseif (!isset($method)) {
@@ -354,9 +348,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $modulesLoaded = $moduleManager->getModules();
         $list          = array_diff($modules, $modulesLoaded);
         if ($list) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Several modules are not loaded "%s"', implode(', ', $list)
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Several modules are not loaded "%s"', implode(', ', $list))
+            );
         }
         $this->assertEquals(count($list), 0);
     }
@@ -372,9 +366,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $modulesLoaded = $moduleManager->getModules();
         $list          = array_intersect($modules, $modulesLoaded);
         if ($list) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Several modules WAS not loaded "%s"', implode(', ', $list)
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Several modules WAS not loaded "%s"', implode(', ', $list))
+            );
         }
         $this->assertEquals(count($list), 0);
     }
@@ -415,10 +409,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         }
         $match = $this->getResponseStatusCode();
         if ($code != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting response code "%s", actual status code is "%s"',
-                $code, $match
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting response code "%s", actual status code is "%s"', $code, $match)
+            );
         }
         $this->assertEquals($code, $match);
     }
@@ -439,10 +432,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         }
         $match = $this->getResponseStatusCode();
         if ($code == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting response code was NOT "%s"',
-                $code
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting response code was NOT "%s"', $code)
+            );
         }
         $this->assertNotEquals($code, $match);
     }
@@ -496,10 +488,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $match           = strtolower($match);
         $module          = strtolower($module);
         if ($module != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting module name "%s", actual module name is "%s"',
-                $module, $match
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting module name "%s", actual module name is "%s"', $module, $match)
+            );
         }
         $this->assertEquals($module, $match);
     }
@@ -516,10 +507,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $match           = strtolower($match);
         $module          = strtolower($module);
         if ($module == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting module was NOT "%s"',
-                $module
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting module was NOT "%s"', $module)
+            );
         }
         $this->assertNotEquals($module, $match);
     }
@@ -536,10 +526,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $match           = strtolower($match);
         $controller      = strtolower($controller);
         if ($controller != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting controller class "%s", actual controller class is "%s"',
-                $controller, $match
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting controller class "%s", actual controller class is "%s"', $controller, $match)
+            );
         }
         $this->assertEquals($controller, $match);
     }
@@ -556,10 +545,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $match           = strtolower($match);
         $controller      = strtolower($controller);
         if ($controller == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting controller class was NOT "%s"',
-                $controller
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting controller class was NOT "%s"', $controller)
+            );
         }
         $this->assertNotEquals($controller, $match);
     }
@@ -576,10 +564,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $match      = strtolower($match);
         $controller = strtolower($controller);
         if ($controller != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting controller name "%s", actual controller name is "%s"',
-                $controller, $match
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting controller name "%s", actual controller name is "%s"', $controller, $match)
+            );
         }
         $this->assertEquals($controller, $match);
     }
@@ -596,10 +583,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $match      = strtolower($match);
         $controller = strtolower($controller);
         if ($controller == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting controller name was NOT "%s"',
-                $controller
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting controller name was NOT "%s"', $controller)
+            );
         }
         $this->assertNotEquals($controller, $match);
     }
@@ -616,10 +602,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $match      = strtolower($match);
         $action     = strtolower($action);
         if ($action != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting action name "%s", actual action name is "%s"',
-                $action, $match
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting action name "%s", actual action name is "%s"', $action, $match)
+            );
         }
         $this->assertEquals($action, $match);
     }
@@ -636,10 +621,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $match      = strtolower($match);
         $action     = strtolower($action);
         if ($action == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting action name was NOT "%s"',
-                $action
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting action name was NOT "%s"', $action)
+            );
         }
         $this->assertNotEquals($action, $match);
     }
@@ -656,10 +640,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $match      = strtolower($match);
         $route      = strtolower($route);
         if ($route != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting matched route name was "%s", actual matched route name is "%s"',
-                $route, $match
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting matched route name was "%s", actual matched route name is "%s"', $route, $match)
+            );
         }
         $this->assertEquals($route, $match);
     }
@@ -676,9 +659,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
         $match      = strtolower($match);
         $route      = strtolower($route);
         if ($route == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting route matched was NOT "%s"', $route
-            ));
+            throw new PHPUnit_Framework_ExpectationFailedException(
+                sprintf('Failed asserting route matched was NOT "%s"', $route)
+            );
         }
         $this->assertNotEquals($route, $match);
     }
diff --git a/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php b/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
old mode 100755
new mode 100644
index a09f4ca9e..0c7414754
--- a/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
+++ b/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Test\PHPUnit\Controller;
@@ -381,7 +381,11 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
             $document->registerXpathNamespaces($this->xpathNamespaces);
         }
 
-        $result   = Document\Query::execute($path, $document, $useXpath ? Document\Query::TYPE_XPATH : Document\Query::TYPE_CSS);
+        $result = Document\Query::execute(
+            $path,
+            $document,
+            $useXpath ? Document\Query::TYPE_XPATH : Document\Query::TYPE_CSS
+        );
 
         return $result;
     }
diff --git a/library/Zend/Test/README.md b/library/Zend/Test/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Test/Util/ModuleLoader.php b/library/Zend/Test/Util/ModuleLoader.php
old mode 100755
new mode 100644
index 3b802cd62..671dfa2de
--- a/library/Zend/Test/Util/ModuleLoader.php
+++ b/library/Zend/Test/Util/ModuleLoader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Test\Util;
diff --git a/library/Zend/Test/composer.json b/library/Zend/Test/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Text/CONTRIBUTING.md b/library/Zend/Text/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Text/Exception/ExceptionInterface.php b/library/Zend/Text/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index dd72d9f83..efce79a61
--- a/library/Zend/Text/Exception/ExceptionInterface.php
+++ b/library/Zend/Text/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Exception/InvalidArgumentException.php b/library/Zend/Text/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 3ae73c865..68b980bc4
--- a/library/Zend/Text/Exception/InvalidArgumentException.php
+++ b/library/Zend/Text/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Exception/OutOfBoundsException.php b/library/Zend/Text/Exception/OutOfBoundsException.php
old mode 100755
new mode 100644
index 062ca8567..59e712999
--- a/library/Zend/Text/Exception/OutOfBoundsException.php
+++ b/library/Zend/Text/Exception/OutOfBoundsException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Exception/OverflowException.php b/library/Zend/Text/Exception/OverflowException.php
old mode 100755
new mode 100644
index 600a3668f..de9c1fdad
--- a/library/Zend/Text/Exception/OverflowException.php
+++ b/library/Zend/Text/Exception/OverflowException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Exception/RuntimeException.php b/library/Zend/Text/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 8b9268db2..35493d0f8
--- a/library/Zend/Text/Exception/RuntimeException.php
+++ b/library/Zend/Text/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Exception/UnexpectedValueException.php b/library/Zend/Text/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index c8f28c251..fbe71b047
--- a/library/Zend/Text/Exception/UnexpectedValueException.php
+++ b/library/Zend/Text/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Figlet/Exception/ExceptionInterface.php b/library/Zend/Text/Figlet/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index f42fa230b..5803b7e3b
--- a/library/Zend/Text/Figlet/Exception/ExceptionInterface.php
+++ b/library/Zend/Text/Figlet/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php b/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index d207be5e2..de981c984
--- a/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
+++ b/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Figlet/Exception/RuntimeException.php b/library/Zend/Text/Figlet/Exception/RuntimeException.php
old mode 100755
new mode 100644
index d8a73769c..961bf59ae
--- a/library/Zend/Text/Figlet/Exception/RuntimeException.php
+++ b/library/Zend/Text/Figlet/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php b/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index 6c1ba1657..45c60fe72
--- a/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
+++ b/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Figlet/Figlet.php b/library/Zend/Text/Figlet/Figlet.php
old mode 100755
new mode 100644
index b1e70cf32..98161e86d
--- a/library/Zend/Text/Figlet/Figlet.php
+++ b/library/Zend/Text/Figlet/Figlet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -954,8 +954,7 @@ class Figlet
         // Check if gzip support is required
         if (substr($fontFile, -3) === '.gz') {
             if (!function_exists('gzcompress')) {
-                throw new Exception\RuntimeException('GZIP library is required for '
-                                                     . 'gzip compressed font files');
+                throw new Exception\RuntimeException('GZIP library is required for gzip compressed font files');
             }
 
             $fontFile   = 'compress.zlib://' . $fontFile;
@@ -979,15 +978,17 @@ class Figlet
         $magic = $this->_readMagic($fp);
 
         // Get the header
-        $numsRead = sscanf(fgets($fp, 1000),
-                           '%*c%c %d %*d %d %d %d %d %d',
-                           $this->hardBlank,
-                           $this->charHeight,
-                           $this->maxLength,
-                           $smush,
-                           $cmtLines,
-                           $rightToLeft,
-                           $this->fontSmush);
+        $numsRead = sscanf(
+            fgets($fp, 1000),
+            '%*c%c %d %*d %d %d %d %d %d',
+            $this->hardBlank,
+            $this->charHeight,
+            $this->maxLength,
+            $smush,
+            $cmtLines,
+            $rightToLeft,
+            $this->fontSmush
+        );
 
         if ($magic !== self::FONTFILE_MAGIC_NUMBER || $numsRead < 5) {
             throw new Exception\UnexpectedValueException($fontFile . ': Not a FIGlet 2 font file');
diff --git a/library/Zend/Text/Figlet/zend-framework.flf b/library/Zend/Text/Figlet/zend-framework.flf
old mode 100755
new mode 100644
diff --git a/library/Zend/Text/MultiByte.php b/library/Zend/Text/MultiByte.php
old mode 100755
new mode 100644
index 04bc869d9..dba732a1b
--- a/library/Zend/Text/MultiByte.php
+++ b/library/Zend/Text/MultiByte.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/README.md b/library/Zend/Text/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Text/Table/Column.php b/library/Zend/Text/Table/Column.php
old mode 100755
new mode 100644
index 8c41981f6..8a2aacc95
--- a/library/Zend/Text/Table/Column.php
+++ b/library/Zend/Text/Table/Column.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/Decorator/Ascii.php b/library/Zend/Text/Table/Decorator/Ascii.php
old mode 100755
new mode 100644
index 6d049ae80..159820d10
--- a/library/Zend/Text/Table/Decorator/Ascii.php
+++ b/library/Zend/Text/Table/Decorator/Ascii.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/Decorator/Blank.php b/library/Zend/Text/Table/Decorator/Blank.php
old mode 100755
new mode 100644
index 0b4bf0879..81b058b95
--- a/library/Zend/Text/Table/Decorator/Blank.php
+++ b/library/Zend/Text/Table/Decorator/Blank.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/Decorator/DecoratorInterface.php b/library/Zend/Text/Table/Decorator/DecoratorInterface.php
old mode 100755
new mode 100644
index 31d0b5e30..9e9ec76d4
--- a/library/Zend/Text/Table/Decorator/DecoratorInterface.php
+++ b/library/Zend/Text/Table/Decorator/DecoratorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/Decorator/Unicode.php b/library/Zend/Text/Table/Decorator/Unicode.php
old mode 100755
new mode 100644
index cb12a9d69..9d2748bbf
--- a/library/Zend/Text/Table/Decorator/Unicode.php
+++ b/library/Zend/Text/Table/Decorator/Unicode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/DecoratorManager.php b/library/Zend/Text/Table/DecoratorManager.php
old mode 100755
new mode 100644
index e936230e8..10a5f00fb
--- a/library/Zend/Text/Table/DecoratorManager.php
+++ b/library/Zend/Text/Table/DecoratorManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/Exception/ExceptionInterface.php b/library/Zend/Text/Table/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index eb2c70ef3..8330046d2
--- a/library/Zend/Text/Table/Exception/ExceptionInterface.php
+++ b/library/Zend/Text/Table/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/Exception/InvalidArgumentException.php b/library/Zend/Text/Table/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 2cb5570bb..6e99a8295
--- a/library/Zend/Text/Table/Exception/InvalidArgumentException.php
+++ b/library/Zend/Text/Table/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/Exception/InvalidDecoratorException.php b/library/Zend/Text/Table/Exception/InvalidDecoratorException.php
old mode 100755
new mode 100644
index 44817bbe8..cc39ab335
--- a/library/Zend/Text/Table/Exception/InvalidDecoratorException.php
+++ b/library/Zend/Text/Table/Exception/InvalidDecoratorException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/Exception/OutOfBoundsException.php b/library/Zend/Text/Table/Exception/OutOfBoundsException.php
old mode 100755
new mode 100644
index 17e90026b..1d07b24ee
--- a/library/Zend/Text/Table/Exception/OutOfBoundsException.php
+++ b/library/Zend/Text/Table/Exception/OutOfBoundsException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/Exception/OverflowException.php b/library/Zend/Text/Table/Exception/OverflowException.php
old mode 100755
new mode 100644
index 3644d3b8d..199c7e4b9
--- a/library/Zend/Text/Table/Exception/OverflowException.php
+++ b/library/Zend/Text/Table/Exception/OverflowException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/Exception/UnexpectedValueException.php b/library/Zend/Text/Table/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index 1f0a34907..71a76254b
--- a/library/Zend/Text/Table/Exception/UnexpectedValueException.php
+++ b/library/Zend/Text/Table/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Text/Table/Row.php b/library/Zend/Text/Table/Row.php
old mode 100755
new mode 100644
index 7af59288b..21dfbbf02
--- a/library/Zend/Text/Table/Row.php
+++ b/library/Zend/Text/Table/Row.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -103,7 +103,9 @@ class Row
     public function getColumnWidths()
     {
         if ($this->columnWidths === null) {
-            throw new Exception\UnexpectedValueException('render() must be called before columnWidths can be populated');
+            throw new Exception\UnexpectedValueException(
+                'render() must be called before columnWidths can be populated'
+            );
         }
 
         return $this->columnWidths;
@@ -143,9 +145,7 @@ class Row
             }
 
             // Calculate the column width
-            $columnWidth = ($colSpan - 1 + array_sum(array_slice($columnWidths,
-                                                                 $colNum,
-                                                                 $colSpan)));
+            $columnWidth = ($colSpan - 1 + array_sum(array_slice($columnWidths, $colNum, $colSpan)));
 
             // Render the column and split it's lines into an array
             $result = explode("\n", $column->render($columnWidth, $padding));
@@ -165,8 +165,7 @@ class Row
         // it with an empty column
         if ($colNum < count($columnWidths)) {
             $remainingWidth = (count($columnWidths) - $colNum - 1) +
-                               array_sum(array_slice($columnWidths,
-                                                     $colNum));
+                               array_sum(array_slice($columnWidths, $colNum));
             $renderedColumns[] = array(str_repeat(' ', $remainingWidth));
 
             $this->columnWidths[] = $remainingWidth;
diff --git a/library/Zend/Text/Table/Table.php b/library/Zend/Text/Table/Table.php
old mode 100755
new mode 100644
index 681db1b16..6077673e7
--- a/library/Zend/Text/Table/Table.php
+++ b/library/Zend/Text/Table/Table.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -164,8 +164,7 @@ class Table
 
         foreach ($columnWidths as $columnNum => $columnWidth) {
             if (is_int($columnWidth) === false or $columnWidth < 1) {
-                throw new Exception\InvalidArgumentException('Column ' . $columnNum . ' has an invalid'
-                                                    . ' column width');
+                throw new Exception\InvalidArgumentException('Column ' . $columnNum . ' has an invalid column width');
             }
         }
 
@@ -375,8 +374,7 @@ class Table
                 $result .= $this->decorator->getTopLeft();
 
                 foreach ($columnWidths as $columnNum => $columnWidth) {
-                    $result .= str_repeat($this->decorator->getHorizontal(),
-                                          $columnWidth);
+                    $result .= str_repeat($this->decorator->getHorizontal(), $columnWidth);
 
                     if (($columnNum + 1) === $numColumns) {
                         $result .= $this->decorator->getTopRight();
@@ -412,8 +410,7 @@ class Table
                     // Loop through all column widths
                     foreach ($this->columnWidths as $columnNum => $columnWidth) {
                         // Add the horizontal line
-                        $result .= str_repeat($this->decorator->getHorizontal(),
-                                              $columnWidth);
+                        $result .= str_repeat($this->decorator->getHorizontal(), $columnWidth);
 
                         // If this is the last line, break out
                         if (($columnNum + 1) === $totalNumColumns) {
@@ -476,8 +473,7 @@ class Table
                 $result .= $this->decorator->getBottomLeft();
 
                 foreach ($columnWidths as $columnNum => $columnWidth) {
-                    $result .= str_repeat($this->decorator->getHorizontal(),
-                                          $columnWidth);
+                    $result .= str_repeat($this->decorator->getHorizontal(), $columnWidth);
 
                     if (($columnNum + 1) === $numColumns) {
                         $result .= $this->decorator->getBottomRight();
diff --git a/library/Zend/Text/composer.json b/library/Zend/Text/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Uri/CONTRIBUTING.md b/library/Zend/Uri/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Uri/Exception/ExceptionInterface.php b/library/Zend/Uri/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index f40e4239f..de4a547e3
--- a/library/Zend/Uri/Exception/ExceptionInterface.php
+++ b/library/Zend/Uri/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Uri/Exception/InvalidArgumentException.php b/library/Zend/Uri/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 2c5772d5d..dae1bec17
--- a/library/Zend/Uri/Exception/InvalidArgumentException.php
+++ b/library/Zend/Uri/Exception/InvalidArgumentException.php
@@ -3,14 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Uri\Exception;
 
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Uri/Exception/InvalidUriException.php b/library/Zend/Uri/Exception/InvalidUriException.php
old mode 100755
new mode 100644
index 9b466e413..d68dbfff5
--- a/library/Zend/Uri/Exception/InvalidUriException.php
+++ b/library/Zend/Uri/Exception/InvalidUriException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Uri/Exception/InvalidUriPartException.php b/library/Zend/Uri/Exception/InvalidUriPartException.php
old mode 100755
new mode 100644
index 0daf5b083..6f5a52a9d
--- a/library/Zend/Uri/Exception/InvalidUriPartException.php
+++ b/library/Zend/Uri/Exception/InvalidUriPartException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Uri/File.php b/library/Zend/Uri/File.php
old mode 100755
new mode 100644
index 71c21875a..f95b73925
--- a/library/Zend/Uri/File.php
+++ b/library/Zend/Uri/File.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Uri/Http.php b/library/Zend/Uri/Http.php
old mode 100755
new mode 100644
index a24851b1f..9c10a1df6
--- a/library/Zend/Uri/Http.php
+++ b/library/Zend/Uri/Http.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Uri/Mailto.php b/library/Zend/Uri/Mailto.php
old mode 100755
new mode 100644
index 8463f995c..afe61c8e1
--- a/library/Zend/Uri/Mailto.php
+++ b/library/Zend/Uri/Mailto.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Uri/README.md b/library/Zend/Uri/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Uri/Uri.php b/library/Zend/Uri/Uri.php
old mode 100755
new mode 100644
index cf8a1b18f..f6ab7f175
--- a/library/Zend/Uri/Uri.php
+++ b/library/Zend/Uri/Uri.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -560,10 +560,8 @@ class Uri implements UriInterface
             return $this;
         }
 
-        $pathParts = preg_split('|(/)|', $this->getPath(), null,
-                                PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-        $baseParts = preg_split('|(/)|', $baseUri->getPath(), null,
-                                PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        $pathParts = preg_split('|(/)|', $this->getPath(), null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        $baseParts = preg_split('|(/)|', $baseUri->getPath(), null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
         // Get the intersection of existing path parts and those from the
         // provided URI
diff --git a/library/Zend/Uri/UriFactory.php b/library/Zend/Uri/UriFactory.php
old mode 100755
new mode 100644
index d6b65a12e..f2b4b1df4
--- a/library/Zend/Uri/UriFactory.php
+++ b/library/Zend/Uri/UriFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -73,9 +73,9 @@ abstract class UriFactory
     {
         if (isset(static::$schemeClasses[$scheme])) {
             return static::$schemeClasses[$scheme];
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -103,9 +103,9 @@ abstract class UriFactory
 
         if ($scheme && ! isset(static::$schemeClasses[$scheme])) {
             throw new Exception\InvalidArgumentException(sprintf(
-                    'no class registered for scheme "%s"',
-                    $scheme
-                ));
+                'no class registered for scheme "%s"',
+                $scheme
+            ));
         }
         if ($scheme && isset(static::$schemeClasses[$scheme])) {
             $class = static::$schemeClasses[$scheme];
diff --git a/library/Zend/Uri/UriInterface.php b/library/Zend/Uri/UriInterface.php
old mode 100755
new mode 100644
index 7799f65dc..040a894c2
--- a/library/Zend/Uri/UriInterface.php
+++ b/library/Zend/Uri/UriInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Uri/composer.json b/library/Zend/Uri/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Validator/AbstractValidator.php b/library/Zend/Validator/AbstractValidator.php
old mode 100755
new mode 100644
index 3852e391f..79d9c0f56
--- a/library/Zend/Validator/AbstractValidator.php
+++ b/library/Zend/Validator/AbstractValidator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -464,9 +464,8 @@ abstract class AbstractValidator implements
      * @return void
      * @throws Exception\InvalidArgumentException
      */
-    public static function setDefaultTranslator(
-        Translator\TranslatorInterface $translator = null, $textDomain = null
-    ) {
+    public static function setDefaultTranslator(Translator\TranslatorInterface $translator = null, $textDomain = null)
+    {
         static::$defaultTranslator = $translator;
         if (null !== $textDomain) {
             self::setDefaultTranslatorTextDomain($textDomain);
@@ -570,8 +569,6 @@ abstract class AbstractValidator implements
             return $message;
         }
 
-        return $translator->translate(
-            $message, $this->getTranslatorTextDomain()
-        );
+        return $translator->translate($message, $this->getTranslatorTextDomain());
     }
 }
diff --git a/library/Zend/Validator/Barcode.php b/library/Zend/Validator/Barcode.php
old mode 100755
new mode 100644
index ee39865c8..cfa6cdc0a
--- a/library/Zend/Validator/Barcode.php
+++ b/library/Zend/Validator/Barcode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/AbstractAdapter.php b/library/Zend/Validator/Barcode/AbstractAdapter.php
old mode 100755
new mode 100644
index 1222d87ed..7cca59a19
--- a/library/Zend/Validator/Barcode/AbstractAdapter.php
+++ b/library/Zend/Validator/Barcode/AbstractAdapter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/AdapterInterface.php b/library/Zend/Validator/Barcode/AdapterInterface.php
old mode 100755
new mode 100644
index 33d244960..f30fe93ee
--- a/library/Zend/Validator/Barcode/AdapterInterface.php
+++ b/library/Zend/Validator/Barcode/AdapterInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Codabar.php b/library/Zend/Validator/Barcode/Codabar.php
old mode 100755
new mode 100644
index 1a3011c10..eca14e212
--- a/library/Zend/Validator/Barcode/Codabar.php
+++ b/library/Zend/Validator/Barcode/Codabar.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Code128.php b/library/Zend/Validator/Barcode/Code128.php
old mode 100755
new mode 100644
index 0bcbb6277..b8e3ee2d3
--- a/library/Zend/Validator/Barcode/Code128.php
+++ b/library/Zend/Validator/Barcode/Code128.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -29,51 +29,52 @@ class Code128 extends AbstractAdapter
     {
         $this->setLength(-1);
         $this->setCharacters(array(
-        'A' => array(
-             0 => ' ',  1 => '!',  2 => '"',  3 => '#',  4 => '$',  5 => '%',  6 => '&',  7 => "'",
-             8 => '(',  9 => ')', 10 => '*', 11 => '+', 12 => ',', 13 => '-', 14 => '.', 15 => '/',
-            16 => '0', 17 => '1', 18 => '2', 19 => '3', 20 => '4', 21 => '5', 22 => '6', 23 => '7',
-            24 => '8', 25 => '9', 26 => ':', 27 => ';', 28 => '<', 29 => '=', 30 => '>', 31 => '?',
-            32 => '@', 33 => 'A', 34 => 'B', 35 => 'C', 36 => 'D', 37 => 'E', 38 => 'F', 39 => 'G',
-            40 => 'H', 41 => 'I', 42 => 'J', 43 => 'K', 44 => 'L', 45 => 'M', 46 => 'N', 47 => 'O',
-            48 => 'P', 49 => 'Q', 50 => 'R', 51 => 'S', 52 => 'T', 53 => 'U', 54 => 'V', 55 => 'W',
-            56 => 'X', 57 => 'Y', 58 => 'Z', 59 => '[', 60 => '\\',61 => ']', 62 => '^', 63 => '_',
-            64 =>0x00, 65 =>0x01, 66 =>0x02, 67 =>0x03, 68 =>0x04, 69 =>0x05, 70 =>0x06, 71 =>0x07,
-            72 =>0x08, 73 =>0x09, 74 =>0x0A, 75 =>0x0B, 76 =>0x0C, 77 =>0x0D, 78 =>0x0E, 79 =>0x0F,
-            80 =>0x10, 81 =>0x11, 82 =>0x12, 83 =>0x13, 84 =>0x14, 85 =>0x15, 86 =>0x16, 87 =>0x17,
-            88 =>0x18, 89 =>0x19, 90 =>0x1A, 91 =>0x1B, 92 =>0x1C, 93 =>0x1D, 94 =>0x1E, 95 =>0x1F,
-            96 => 'Ç', 97 => 'ü', 98 => 'é', 99 => 'â',100 => 'ä',101 => 'à',102 => 'å',103 => '‡',
-           104 => 'ˆ',105 => '‰',106 => 'Š'),
-        'B' => array(
-             0 => ' ',  1 => '!',  2 => '"',  3 => '#',  4 => '$',  5 => '%',  6 => '&',  7 => "'",
-             8 => '(',  9 => ')', 10 => '*', 11 => '+', 12 => ',', 13 => '-', 14 => '.', 15 => '/',
-            16 => '0', 17 => '1', 18 => '2', 19 => '3', 20 => '4', 21 => '5', 22 => '6', 23 => '7',
-            24 => '8', 25 => '9', 26 => ':', 27 => ';', 28 => '<', 29 => '=', 30 => '>', 31 => '?',
-            32 => '@', 33 => 'A', 34 => 'B', 35 => 'C', 36 => 'D', 37 => 'E', 38 => 'F', 39 => 'G',
-            40 => 'H', 41 => 'I', 42 => 'J', 43 => 'K', 44 => 'L', 45 => 'M', 46 => 'N', 47 => 'O',
-            48 => 'P', 49 => 'Q', 50 => 'R', 51 => 'S', 52 => 'T', 53 => 'U', 54 => 'V', 55 => 'W',
-            56 => 'X', 57 => 'Y', 58 => 'Z', 59 => '[', 60 => '\\',61 => ']', 62 => '^', 63 => '_',
-            64 => '`', 65 => 'a', 66 => 'b', 67 => 'c', 68 => 'd', 69 => 'e', 70 => 'f', 71 => 'g',
-            72 => 'h', 73 => 'i', 74 => 'j', 75 => 'k', 76 => 'l', 77 => 'm', 78 => 'n', 79 => 'o',
-            80 => 'p', 81 => 'q', 82 => 'r', 83 => 's', 84 => 't', 85 => 'u', 86 => 'v', 87 => 'w',
-            88 => 'x', 89 => 'y', 90 => 'z', 91 => '{', 92 => '|', 93 => '}', 94 => '~', 95 =>0x7F,
-            96 => 'Ç', 97 => 'ü', 98 => 'é', 99 => 'â',100 => 'ä',101 => 'à',102 => 'å',103 => '‡',
-           104 => 'ˆ',105 => '‰',106 => 'Š'),
-        'C' => array(
-             0 => '00',  1 => '01',  2 => '02',  3 => '03',  4 => '04',  5 => '05',  6 => '06',  7 => '07',
-             8 => '08',  9 => '09', 10 => '10', 11 => '11', 12 => '12', 13 => '13', 14 => '14', 15 => '15',
-            16 => '16', 17 => '17', 18 => '18', 19 => '19', 20 => '20', 21 => '21', 22 => '22', 23 => '23',
-            24 => '24', 25 => '25', 26 => '26', 27 => '27', 28 => '28', 29 => '29', 30 => '30', 31 => '31',
-            32 => '32', 33 => '33', 34 => '34', 35 => '35', 36 => '36', 37 => '37', 38 => '38', 39 => '39',
-            40 => '40', 41 => '41', 42 => '42', 43 => '43', 44 => '44', 45 => '45', 46 => '46', 47 => '47',
-            48 => '48', 49 => '49', 50 => '50', 51 => '51', 52 => '52', 53 => '53', 54 => '54', 55 => '55',
-            56 => '56', 57 => '57', 58 => '58', 59 => '59', 60 => '60', 61 => '61', 62 => '62', 63 => '63',
-            64 => '64', 65 => '65', 66 => '66', 67 => '67', 68 => '68', 69 => '69', 70 => '70', 71 => '71',
-            72 => '72', 73 => '73', 74 => '74', 75 => '75', 76 => '76', 77 => '77', 78 => '78', 79 => '79',
-            80 => '80', 81 => '81', 82 => '82', 83 => '83', 84 => '84', 85 => '85', 86 => '86', 87 => '87',
-            88 => '88', 89 => '89', 90 => '90', 91 => '91', 92 => '92', 93 => '93', 94 => '94', 95 => '95',
-            96 => '96', 97 => '97', 98 => '98', 99 => '99',100 => 'ä', 101 => 'à', 102 => 'å', 103 => '‡',
-           104 => 'ˆ', 105 => '‰', 106 => 'Š')));
+            'A' => array(
+                 0 => ' ',  1 => '!',  2 => '"',  3 => '#',  4 => '$',  5 => '%',  6 => '&',  7 => "'",
+                 8 => '(',  9 => ')', 10 => '*', 11 => '+', 12 => ',', 13 => '-', 14 => '.', 15 => '/',
+                16 => '0', 17 => '1', 18 => '2', 19 => '3', 20 => '4', 21 => '5', 22 => '6', 23 => '7',
+                24 => '8', 25 => '9', 26 => ':', 27 => ';', 28 => '<', 29 => '=', 30 => '>', 31 => '?',
+                32 => '@', 33 => 'A', 34 => 'B', 35 => 'C', 36 => 'D', 37 => 'E', 38 => 'F', 39 => 'G',
+                40 => 'H', 41 => 'I', 42 => 'J', 43 => 'K', 44 => 'L', 45 => 'M', 46 => 'N', 47 => 'O',
+                48 => 'P', 49 => 'Q', 50 => 'R', 51 => 'S', 52 => 'T', 53 => 'U', 54 => 'V', 55 => 'W',
+                56 => 'X', 57 => 'Y', 58 => 'Z', 59 => '[', 60 => '\\',61 => ']', 62 => '^', 63 => '_',
+                64 =>0x00, 65 =>0x01, 66 =>0x02, 67 =>0x03, 68 =>0x04, 69 =>0x05, 70 =>0x06, 71 =>0x07,
+                72 =>0x08, 73 =>0x09, 74 =>0x0A, 75 =>0x0B, 76 =>0x0C, 77 =>0x0D, 78 =>0x0E, 79 =>0x0F,
+                80 =>0x10, 81 =>0x11, 82 =>0x12, 83 =>0x13, 84 =>0x14, 85 =>0x15, 86 =>0x16, 87 =>0x17,
+                88 =>0x18, 89 =>0x19, 90 =>0x1A, 91 =>0x1B, 92 =>0x1C, 93 =>0x1D, 94 =>0x1E, 95 =>0x1F,
+                96 => 'Ç', 97 => 'ü', 98 => 'é', 99 => 'â',100 => 'ä',101 => 'à',102 => 'å',103 => '‡',
+               104 => 'ˆ',105 => '‰',106 => 'Š'),
+            'B' => array(
+                 0 => ' ',  1 => '!',  2 => '"',  3 => '#',  4 => '$',  5 => '%',  6 => '&',  7 => "'",
+                 8 => '(',  9 => ')', 10 => '*', 11 => '+', 12 => ',', 13 => '-', 14 => '.', 15 => '/',
+                16 => '0', 17 => '1', 18 => '2', 19 => '3', 20 => '4', 21 => '5', 22 => '6', 23 => '7',
+                24 => '8', 25 => '9', 26 => ':', 27 => ';', 28 => '<', 29 => '=', 30 => '>', 31 => '?',
+                32 => '@', 33 => 'A', 34 => 'B', 35 => 'C', 36 => 'D', 37 => 'E', 38 => 'F', 39 => 'G',
+                40 => 'H', 41 => 'I', 42 => 'J', 43 => 'K', 44 => 'L', 45 => 'M', 46 => 'N', 47 => 'O',
+                48 => 'P', 49 => 'Q', 50 => 'R', 51 => 'S', 52 => 'T', 53 => 'U', 54 => 'V', 55 => 'W',
+                56 => 'X', 57 => 'Y', 58 => 'Z', 59 => '[', 60 => '\\',61 => ']', 62 => '^', 63 => '_',
+                64 => '`', 65 => 'a', 66 => 'b', 67 => 'c', 68 => 'd', 69 => 'e', 70 => 'f', 71 => 'g',
+                72 => 'h', 73 => 'i', 74 => 'j', 75 => 'k', 76 => 'l', 77 => 'm', 78 => 'n', 79 => 'o',
+                80 => 'p', 81 => 'q', 82 => 'r', 83 => 's', 84 => 't', 85 => 'u', 86 => 'v', 87 => 'w',
+                88 => 'x', 89 => 'y', 90 => 'z', 91 => '{', 92 => '|', 93 => '}', 94 => '~', 95 =>0x7F,
+                96 => 'Ç', 97 => 'ü', 98 => 'é', 99 => 'â',100 => 'ä',101 => 'à',102 => 'å',103 => '‡',
+               104 => 'ˆ',105 => '‰',106 => 'Š'),
+            'C' => array(
+                 0 => '00',  1 => '01',  2 => '02',  3 => '03',  4 => '04',  5 => '05',  6 => '06',  7 => '07',
+                 8 => '08',  9 => '09', 10 => '10', 11 => '11', 12 => '12', 13 => '13', 14 => '14', 15 => '15',
+                16 => '16', 17 => '17', 18 => '18', 19 => '19', 20 => '20', 21 => '21', 22 => '22', 23 => '23',
+                24 => '24', 25 => '25', 26 => '26', 27 => '27', 28 => '28', 29 => '29', 30 => '30', 31 => '31',
+                32 => '32', 33 => '33', 34 => '34', 35 => '35', 36 => '36', 37 => '37', 38 => '38', 39 => '39',
+                40 => '40', 41 => '41', 42 => '42', 43 => '43', 44 => '44', 45 => '45', 46 => '46', 47 => '47',
+                48 => '48', 49 => '49', 50 => '50', 51 => '51', 52 => '52', 53 => '53', 54 => '54', 55 => '55',
+                56 => '56', 57 => '57', 58 => '58', 59 => '59', 60 => '60', 61 => '61', 62 => '62', 63 => '63',
+                64 => '64', 65 => '65', 66 => '66', 67 => '67', 68 => '68', 69 => '69', 70 => '70', 71 => '71',
+                72 => '72', 73 => '73', 74 => '74', 75 => '75', 76 => '76', 77 => '77', 78 => '78', 79 => '79',
+                80 => '80', 81 => '81', 82 => '82', 83 => '83', 84 => '84', 85 => '85', 86 => '86', 87 => '87',
+                88 => '88', 89 => '89', 90 => '90', 91 => '91', 92 => '92', 93 => '93', 94 => '94', 95 => '95',
+                96 => '96', 97 => '97', 98 => '98', 99 => '99',100 => 'ä', 101 => 'à', 102 => 'å', 103 => '‡',
+               104 => 'ˆ', 105 => '‰', 106 => 'Š')
+        ));
         $this->setChecksum('code128');
     }
 
@@ -128,13 +129,13 @@ class Code128 extends AbstractAdapter
 
             switch ($char) {
                 // Function definition
-                case 'Ç' :
-                case 'ü' :
-                case 'å' :
+                case 'Ç':
+                case 'ü':
+                case 'å':
                     break;
 
                 // Switch 1 char between A and B
-                case 'é' :
+                case 'é':
                     if ($set == 'A') {
                         $read = 'B';
                     } elseif ($set == 'B') {
@@ -143,32 +144,32 @@ class Code128 extends AbstractAdapter
                     break;
 
                 // Switch to C
-                case 'â' :
+                case 'â':
                     $set = 'C';
                     $read = 'C';
                     break;
 
                 // Switch to B
-                case 'ä' :
+                case 'ä':
                     $set  = 'B';
                     $read = 'B';
                     break;
 
                 // Switch to A
-                case 'à' :
+                case 'à':
                     $set  = 'A';
                     $read = 'A';
                     break;
 
                 // Doubled start character
-                case '‡' :
-                case 'ˆ' :
-                case '‰' :
+                case '‡':
+                case 'ˆ':
+                case '‰':
                     return false;
                     break;
 
                 // Chars after the stop character
-                case 'Š' :
+                case 'Š':
                     break 2;
 
                 default:
@@ -226,45 +227,45 @@ class Code128 extends AbstractAdapter
 
             switch ($char) {
                 // Function definition
-                case 'Ç' :
-                case 'ü' :
-                case 'å' :
+                case 'Ç':
+                case 'ü':
+                case 'å':
                     $sum += ($pos * $this->ord128($char, $set));
                     break;
 
-                case 'é' :
+                case 'é':
                     $sum += ($pos * $this->ord128($char, $set));
-                     if ($set == 'A') {
-                         $read = 'B';
-                     } elseif ($set == 'B') {
-                         $read = 'A';
-                     }
+                    if ($set == 'A') {
+                        $read = 'B';
+                    } elseif ($set == 'B') {
+                        $read = 'A';
+                    }
                     break;
 
                 // Switch to C
-                case 'â' :
+                case 'â':
                     $sum += ($pos * $this->ord128($char, $set));
                     $set = 'C';
                     $read = 'C';
                     break;
 
                 // Switch to B
-                case 'ä' :
+                case 'ä':
                     $sum += ($pos * $this->ord128($char, $set));
                     $set  = 'B';
                     $read = 'B';
                     break;
 
                 // Switch to A
-                case 'à' :
+                case 'à':
                     $sum += ($pos * $this->ord128($char, $set));
                     $set  = 'A';
                     $read = 'A';
                     break;
 
-                case '‡' :
-                case 'ˆ' :
-                case '‰' :
+                case '‡':
+                case 'ˆ':
+                case '‰':
                     return false;
                     break;
 
@@ -310,13 +311,13 @@ class Code128 extends AbstractAdapter
     {
         $value = $this->getUtf8StringWrapper()->substr($value, 0, 1);
         switch ($value) {
-            case '‡' :
+            case '‡':
                 return 'A';
                 break;
-            case 'ˆ' :
+            case 'ˆ':
                 return 'B';
                 break;
-            case '‰' :
+            case '‰':
                 return 'C';
                 break;
         }
diff --git a/library/Zend/Validator/Barcode/Code25.php b/library/Zend/Validator/Barcode/Code25.php
old mode 100755
new mode 100644
index 3619f528c..8235c437d
--- a/library/Zend/Validator/Barcode/Code25.php
+++ b/library/Zend/Validator/Barcode/Code25.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Code25interleaved.php b/library/Zend/Validator/Barcode/Code25interleaved.php
old mode 100755
new mode 100644
index 77bc027d9..cb41c76e5
--- a/library/Zend/Validator/Barcode/Code25interleaved.php
+++ b/library/Zend/Validator/Barcode/Code25interleaved.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Code39.php b/library/Zend/Validator/Barcode/Code39.php
old mode 100755
new mode 100644
index 9a368c5d4..01208ce2c
--- a/library/Zend/Validator/Barcode/Code39.php
+++ b/library/Zend/Validator/Barcode/Code39.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Code39ext.php b/library/Zend/Validator/Barcode/Code39ext.php
old mode 100755
new mode 100644
index b9b14a59c..e65d491c8
--- a/library/Zend/Validator/Barcode/Code39ext.php
+++ b/library/Zend/Validator/Barcode/Code39ext.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Code93.php b/library/Zend/Validator/Barcode/Code93.php
old mode 100755
new mode 100644
index 35739a110..f312a1386
--- a/library/Zend/Validator/Barcode/Code93.php
+++ b/library/Zend/Validator/Barcode/Code93.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Code93ext.php b/library/Zend/Validator/Barcode/Code93ext.php
old mode 100755
new mode 100644
index aa8fc07b9..99503a147
--- a/library/Zend/Validator/Barcode/Code93ext.php
+++ b/library/Zend/Validator/Barcode/Code93ext.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Ean12.php b/library/Zend/Validator/Barcode/Ean12.php
old mode 100755
new mode 100644
index ee45ebb6b..4805145a1
--- a/library/Zend/Validator/Barcode/Ean12.php
+++ b/library/Zend/Validator/Barcode/Ean12.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Ean13.php b/library/Zend/Validator/Barcode/Ean13.php
old mode 100755
new mode 100644
index b1dc05e14..e271cbea6
--- a/library/Zend/Validator/Barcode/Ean13.php
+++ b/library/Zend/Validator/Barcode/Ean13.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Ean14.php b/library/Zend/Validator/Barcode/Ean14.php
old mode 100755
new mode 100644
index fe20366ac..9d8168bb2
--- a/library/Zend/Validator/Barcode/Ean14.php
+++ b/library/Zend/Validator/Barcode/Ean14.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Ean18.php b/library/Zend/Validator/Barcode/Ean18.php
old mode 100755
new mode 100644
index 774df712a..7388b7326
--- a/library/Zend/Validator/Barcode/Ean18.php
+++ b/library/Zend/Validator/Barcode/Ean18.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Ean2.php b/library/Zend/Validator/Barcode/Ean2.php
old mode 100755
new mode 100644
index 9d8a527a0..99a87bfe2
--- a/library/Zend/Validator/Barcode/Ean2.php
+++ b/library/Zend/Validator/Barcode/Ean2.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Ean5.php b/library/Zend/Validator/Barcode/Ean5.php
old mode 100755
new mode 100644
index 01f597d15..8ef2d519a
--- a/library/Zend/Validator/Barcode/Ean5.php
+++ b/library/Zend/Validator/Barcode/Ean5.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Ean8.php b/library/Zend/Validator/Barcode/Ean8.php
old mode 100755
new mode 100644
index 6af4cccf9..a34c8b45f
--- a/library/Zend/Validator/Barcode/Ean8.php
+++ b/library/Zend/Validator/Barcode/Ean8.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Gtin12.php b/library/Zend/Validator/Barcode/Gtin12.php
old mode 100755
new mode 100644
index b3c97d3df..44464445e
--- a/library/Zend/Validator/Barcode/Gtin12.php
+++ b/library/Zend/Validator/Barcode/Gtin12.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Gtin13.php b/library/Zend/Validator/Barcode/Gtin13.php
old mode 100755
new mode 100644
index 049849792..b8dcd095b
--- a/library/Zend/Validator/Barcode/Gtin13.php
+++ b/library/Zend/Validator/Barcode/Gtin13.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Gtin14.php b/library/Zend/Validator/Barcode/Gtin14.php
old mode 100755
new mode 100644
index 70e3cc5b5..862d3e147
--- a/library/Zend/Validator/Barcode/Gtin14.php
+++ b/library/Zend/Validator/Barcode/Gtin14.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Identcode.php b/library/Zend/Validator/Barcode/Identcode.php
old mode 100755
new mode 100644
index 08c398dd6..5b3927155
--- a/library/Zend/Validator/Barcode/Identcode.php
+++ b/library/Zend/Validator/Barcode/Identcode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Intelligentmail.php b/library/Zend/Validator/Barcode/Intelligentmail.php
old mode 100755
new mode 100644
index 665d2035a..d26cce68a
--- a/library/Zend/Validator/Barcode/Intelligentmail.php
+++ b/library/Zend/Validator/Barcode/Intelligentmail.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Issn.php b/library/Zend/Validator/Barcode/Issn.php
old mode 100755
new mode 100644
index 52434ed1b..e66451a1a
--- a/library/Zend/Validator/Barcode/Issn.php
+++ b/library/Zend/Validator/Barcode/Issn.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Itf14.php b/library/Zend/Validator/Barcode/Itf14.php
old mode 100755
new mode 100644
index 195d84dd2..b17eb705d
--- a/library/Zend/Validator/Barcode/Itf14.php
+++ b/library/Zend/Validator/Barcode/Itf14.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Leitcode.php b/library/Zend/Validator/Barcode/Leitcode.php
old mode 100755
new mode 100644
index 29503a92a..c1b82c3c2
--- a/library/Zend/Validator/Barcode/Leitcode.php
+++ b/library/Zend/Validator/Barcode/Leitcode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Planet.php b/library/Zend/Validator/Barcode/Planet.php
old mode 100755
new mode 100644
index ecdff2db2..0708b7c81
--- a/library/Zend/Validator/Barcode/Planet.php
+++ b/library/Zend/Validator/Barcode/Planet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Postnet.php b/library/Zend/Validator/Barcode/Postnet.php
old mode 100755
new mode 100644
index acc84da59..2942d4ca0
--- a/library/Zend/Validator/Barcode/Postnet.php
+++ b/library/Zend/Validator/Barcode/Postnet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Royalmail.php b/library/Zend/Validator/Barcode/Royalmail.php
old mode 100755
new mode 100644
index 538efa610..77555ed5a
--- a/library/Zend/Validator/Barcode/Royalmail.php
+++ b/library/Zend/Validator/Barcode/Royalmail.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Sscc.php b/library/Zend/Validator/Barcode/Sscc.php
old mode 100755
new mode 100644
index d3b33637b..57f9c8a37
--- a/library/Zend/Validator/Barcode/Sscc.php
+++ b/library/Zend/Validator/Barcode/Sscc.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Upca.php b/library/Zend/Validator/Barcode/Upca.php
old mode 100755
new mode 100644
index 4c5f623f1..afb2a7a44
--- a/library/Zend/Validator/Barcode/Upca.php
+++ b/library/Zend/Validator/Barcode/Upca.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Barcode/Upce.php b/library/Zend/Validator/Barcode/Upce.php
old mode 100755
new mode 100644
index 646c739a7..32a573f1c
--- a/library/Zend/Validator/Barcode/Upce.php
+++ b/library/Zend/Validator/Barcode/Upce.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Between.php b/library/Zend/Validator/Between.php
old mode 100755
new mode 100644
index 327115eea..550ee72d7
--- a/library/Zend/Validator/Between.php
+++ b/library/Zend/Validator/Between.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Bitwise.php b/library/Zend/Validator/Bitwise.php
old mode 100755
new mode 100644
index 8abbffb3d..7f676cff5
--- a/library/Zend/Validator/Bitwise.php
+++ b/library/Zend/Validator/Bitwise.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/CONTRIBUTING.md b/library/Zend/Validator/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Validator/Callback.php b/library/Zend/Validator/Callback.php
old mode 100755
new mode 100644
index e4b389de7..7a5005bb2
--- a/library/Zend/Validator/Callback.php
+++ b/library/Zend/Validator/Callback.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/CreditCard.php b/library/Zend/Validator/CreditCard.php
old mode 100755
new mode 100644
index e54a17c2e..0f637f379
--- a/library/Zend/Validator/CreditCard.php
+++ b/library/Zend/Validator/CreditCard.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -84,7 +84,7 @@ class CreditCard extends AbstractValidator
         self::DINERS_CLUB      => array(14),
         self::DINERS_CLUB_US   => array(16),
         self::DISCOVER         => array(16),
-        self::JCB              => array(16),
+        self::JCB              => array(15, 16),
         self::LASER            => array(16, 17, 18, 19),
         self::MAESTRO          => array(12, 13, 14, 15, 16, 17, 18, 19),
         self::MASTERCARD       => array(16),
@@ -108,7 +108,7 @@ class CreditCard extends AbstractValidator
                                         '62290', '62291', '622920', '622921', '622922', '622923',
                                         '622924', '622925', '644', '645', '646', '647', '648',
                                         '649', '65'),
-        self::JCB              => array('3528', '3529', '353', '354', '355', '356', '357', '358'),
+        self::JCB              => array('1800', '2131', '3528', '3529', '353', '354', '355', '356', '357', '358'),
         self::LASER            => array('6304', '6706', '6771', '6709'),
         self::MAESTRO          => array('5018', '5020', '5038', '6304', '6759', '6761', '6762', '6763',
                                         '6764', '6765', '6766'),
diff --git a/library/Zend/Validator/Csrf.php b/library/Zend/Validator/Csrf.php
old mode 100755
new mode 100644
index 6272c0be7..49af145db
--- a/library/Zend/Validator/Csrf.php
+++ b/library/Zend/Validator/Csrf.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Date.php b/library/Zend/Validator/Date.php
old mode 100755
new mode 100644
index 044a6ce34..456bde8b1
--- a/library/Zend/Validator/Date.php
+++ b/library/Zend/Validator/Date.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/DateStep.php b/library/Zend/Validator/DateStep.php
old mode 100755
new mode 100644
index e1ff846a6..83c64505b
--- a/library/Zend/Validator/DateStep.php
+++ b/library/Zend/Validator/DateStep.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -211,11 +211,16 @@ class DateStep extends Date
         // Handle intervals of just one date or time unit.
         $intervalParts = explode('|', $step->format('%y|%m|%d|%h|%i|%s'));
         $partCounts    = array_count_values($intervalParts);
+
+        $unitKeys = array('years', 'months', 'days', 'hours', 'minutes', 'seconds');
+        $intervalParts = array_combine($unitKeys, $intervalParts);
+
+        // Get absolute time difference
+        $timeDiff  = $valueDate->diff($baseDate, true);
+        $diffParts = array_combine($unitKeys, explode('|', $timeDiff->format('%y|%m|%d|%h|%i|%s')));
+
         if (5 === $partCounts["0"]) {
             // Find the unit with the non-zero interval
-            $unitKeys = array('years', 'months', 'days', 'hours', 'minutes', 'seconds');
-            $intervalParts = array_combine($unitKeys, $intervalParts);
-
             $intervalUnit = null;
             $stepValue    = null;
             foreach ($intervalParts as $key => $value) {
@@ -226,17 +231,12 @@ class DateStep extends Date
                 }
             }
 
-            // Get absolute time difference
-            $timeDiff  = $valueDate->diff($baseDate, true);
-            $diffParts = explode('|', $timeDiff->format('%y|%m|%d|%h|%i|%s'));
-            $diffParts = array_combine($unitKeys, $diffParts);
-
             // Check date units
             if (in_array($intervalUnit, array('years', 'months', 'days'))) {
                 switch ($intervalUnit) {
                     case 'years':
-                        if (   0 == $diffParts['months']  && 0 == $diffParts['days']
-                            && 0 == $diffParts['hours']   && 0 == $diffParts['minutes']
+                        if (0 == $diffParts['months'] && 0 == $diffParts['days']
+                            && 0 == $diffParts['hours'] && 0 == $diffParts['minutes']
                             && 0 == $diffParts['seconds']
                         ) {
                             if (($diffParts['years'] % $stepValue) === 0) {
@@ -245,7 +245,7 @@ class DateStep extends Date
                         }
                         break;
                     case 'months':
-                        if (   0 == $diffParts['days']    && 0 == $diffParts['hours']
+                        if (0 == $diffParts['days'] && 0 == $diffParts['hours']
                             && 0 == $diffParts['minutes'] && 0 == $diffParts['seconds']
                         ) {
                             $months = ($diffParts['years'] * 12) + $diffParts['months'];
@@ -255,7 +255,7 @@ class DateStep extends Date
                         }
                         break;
                     case 'days':
-                        if (   0 == $diffParts['hours'] && 0 == $diffParts['minutes']
+                        if (0 == $diffParts['hours'] && 0 == $diffParts['minutes']
                             && 0 == $diffParts['seconds']
                         ) {
                             $days = $timeDiff->format('%a'); // Total days
@@ -282,6 +282,10 @@ class DateStep extends Date
                     } elseif ('seconds' === $intervalUnit) {
                         return true;
                     }
+
+                    $this->error(self::NOT_STEP);
+
+                    return false;
                 }
 
                 // Simple test for same day, when using default baseDate
@@ -305,7 +309,7 @@ class DateStep extends Date
                             }
                             break;
                         case 'seconds':
-                            $seconds = ($diffParts['hours'] * 60)
+                            $seconds = ($diffParts['hours'] * 60 * 60)
                                        + ($diffParts['minutes'] * 60)
                                        + $diffParts['seconds'];
                             if (($seconds % $stepValue) === 0) {
@@ -319,26 +323,154 @@ class DateStep extends Date
             }
         }
 
-        // Fall back to slower (but accurate) method for complex intervals.
-        // Keep adding steps to the base date until a match is found
-        // or until the value is exceeded.
-        if ($baseDate < $valueDate) {
-            while ($baseDate < $valueDate) {
-                $baseDate->add($step);
-                if ($baseDate == $valueDate) {
-                    return true;
-                }
-            }
-        } else {
-            while ($baseDate > $valueDate) {
-                $baseDate->sub($step);
-                if ($baseDate == $valueDate) {
-                    return true;
-                }
+        return $this->fallbackIncrementalIterationLogic($baseDate, $valueDate, $intervalParts, $diffParts, $step);
+    }
+
+    /**
+     * Fall back to slower (but accurate) method for complex intervals.
+     * Keep adding steps to the base date until a match is found
+     * or until the value is exceeded.
+     *
+     * This is really slow if the interval is small, especially if the
+     * default base date of 1/1/1970 is used. We can skip a chunk of
+     * iterations by starting at the lower bound of steps needed to reach
+     * the target
+     *
+     * @param DateTime     $baseDate
+     * @param DateTime     $valueDate
+     * @param int[]        $intervalParts
+     * @param int[]        $diffParts
+     * @param DateInterval $step
+     *
+     * @return bool
+     */
+    private function fallbackIncrementalIterationLogic(
+        DateTime $baseDate,
+        DateTime $valueDate,
+        array $intervalParts,
+        array $diffParts,
+        DateInterval $step
+    ) {
+        list($minSteps, $requiredIterations) = $this->computeMinStepAndRequiredIterations($intervalParts, $diffParts);
+        $minimumInterval                     = $this->computeMinimumInterval($intervalParts, $minSteps);
+        $isIncrementalStepping               = $baseDate < $valueDate;
+        $dateModificationOperation           = $isIncrementalStepping ? 'add' : 'sub';
+
+        for ($offsetIterations = 0; $offsetIterations < $requiredIterations; $offsetIterations += 1) {
+            $baseDate->{$dateModificationOperation}($minimumInterval);
+        }
+
+        while (($isIncrementalStepping && $baseDate < $valueDate)
+            || (! $isIncrementalStepping && $baseDate > $valueDate)
+        ) {
+            $baseDate->{$dateModificationOperation}($step);
+
+            if ($baseDate == $valueDate) {
+                return true;
             }
         }
 
         $this->error(self::NOT_STEP);
+
         return false;
     }
+
+    /**
+     * Computes minimum interval to use for iterations while checking steps
+     *
+     * @param int[] $intervalParts
+     * @param int   $minSteps
+     *
+     * @return DateInterval
+     */
+    private function computeMinimumInterval(array $intervalParts, $minSteps)
+    {
+        return new DateInterval(sprintf(
+            'P%dY%dM%dDT%dH%dM%dS',
+            $intervalParts['years'] * $minSteps,
+            $intervalParts['months'] * $minSteps,
+            $intervalParts['days'] * $minSteps,
+            $intervalParts['hours'] * $minSteps,
+            $intervalParts['minutes'] * $minSteps,
+            $intervalParts['seconds'] * $minSteps
+        ));
+    }
+
+    /**
+     * @param int[] $intervalParts
+     * @param int[] $diffParts
+     *
+     * @return int[] (ordered tuple containing minimum steps and required step iterations
+     */
+    private function computeMinStepAndRequiredIterations(array $intervalParts, array $diffParts)
+    {
+        $minSteps = $this->computeMinSteps($intervalParts, $diffParts);
+
+        // If we use PHP_INT_MAX DateInterval::__construct falls over with a bad format error
+        // before we reach the max on 64 bit machines
+        $maxInteger             = min(pow(2, 31), PHP_INT_MAX);
+        // check for integer overflow and split $minimum interval if needed
+        $maximumInterval        = max($intervalParts);
+        $requiredStepIterations = 1;
+
+        if (($minSteps * $maximumInterval) > $maxInteger) {
+            $requiredStepIterations = ceil(($minSteps * $maximumInterval) / $maxInteger);
+            $minSteps               = floor($minSteps / $requiredStepIterations);
+        }
+
+        return array($minSteps, $minSteps ? $requiredStepIterations : 0);
+    }
+
+    /**
+     * Multiply the step interval by the lower bound of steps to reach the target
+     *
+     * @param int[] $intervalParts
+     * @param int[] $diffParts
+     *
+     * @return int
+     */
+    private function computeMinSteps(array $intervalParts, array $diffParts)
+    {
+        $intervalMaxSeconds = $this->computeIntervalMaxSeconds($intervalParts);
+
+        return (0 == $intervalMaxSeconds)
+            ? 0
+            : max(floor($this->computeDiffMinSeconds($diffParts) / $intervalMaxSeconds) - 1, 0);
+    }
+
+    /**
+     * Get upper bound of the given interval in seconds
+     * Converts a given `$intervalParts` array into seconds
+     *
+     * @param int[] $intervalParts
+     *
+     * @return int
+     */
+    private function computeIntervalMaxSeconds(array $intervalParts)
+    {
+        return ($intervalParts['years'] * 60 * 60 * 24 * 366)
+            + ($intervalParts['months'] * 60 * 60 * 24 * 31)
+            + ($intervalParts['days'] * 60 * 60 * 24)
+            + ($intervalParts['hours'] * 60 * 60)
+            + ($intervalParts['minutes'] * 60)
+            + $intervalParts['seconds'];
+    }
+
+    /**
+     * Get lower bound of difference in secondss
+     * Converts a given `$diffParts` array into seconds
+     *
+     * @param int[] $diffParts
+     *
+     * @return int
+     */
+    private function computeDiffMinSeconds(array $diffParts)
+    {
+        return ($diffParts['years'] * 60 * 60 * 24 * 365)
+            + ($diffParts['months'] * 60 * 60 * 24 * 28)
+            + ($diffParts['days'] * 60 * 60 * 24)
+            + ($diffParts['hours'] * 60 * 60)
+            + ($diffParts['minutes'] * 60)
+            + $diffParts['seconds'];
+    }
 }
diff --git a/library/Zend/Validator/Db/AbstractDb.php b/library/Zend/Validator/Db/AbstractDb.php
old mode 100755
new mode 100644
index 4214910be..9dac88853
--- a/library/Zend/Validator/Db/AbstractDb.php
+++ b/library/Zend/Validator/Db/AbstractDb.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Db/NoRecordExists.php b/library/Zend/Validator/Db/NoRecordExists.php
old mode 100755
new mode 100644
index 8a5dd727f..e87fdd685
--- a/library/Zend/Validator/Db/NoRecordExists.php
+++ b/library/Zend/Validator/Db/NoRecordExists.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Db/RecordExists.php b/library/Zend/Validator/Db/RecordExists.php
old mode 100755
new mode 100644
index dfae6b2d1..a7d06d33c
--- a/library/Zend/Validator/Db/RecordExists.php
+++ b/library/Zend/Validator/Db/RecordExists.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Digits.php b/library/Zend/Validator/Digits.php
old mode 100755
new mode 100644
index a4afe833f..94210c917
--- a/library/Zend/Validator/Digits.php
+++ b/library/Zend/Validator/Digits.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/EmailAddress.php b/library/Zend/Validator/EmailAddress.php
old mode 100755
new mode 100644
index 1c9d0b00b..a20d99996
--- a/library/Zend/Validator/EmailAddress.php
+++ b/library/Zend/Validator/EmailAddress.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Exception/BadMethodCallException.php b/library/Zend/Validator/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 8293c5eec..a4aa15f41
--- a/library/Zend/Validator/Exception/BadMethodCallException.php
+++ b/library/Zend/Validator/Exception/BadMethodCallException.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Validator\Exception;
 
-class BadMethodCallException extends \BadMethodCallException
-    implements ExceptionInterface
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Validator/Exception/ExceptionInterface.php b/library/Zend/Validator/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 6fb223fb3..7f4f0b1af
--- a/library/Zend/Validator/Exception/ExceptionInterface.php
+++ b/library/Zend/Validator/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Exception/ExtensionNotLoadedException.php b/library/Zend/Validator/Exception/ExtensionNotLoadedException.php
old mode 100755
new mode 100644
index 02b2c3c81..4a6b7c03b
--- a/library/Zend/Validator/Exception/ExtensionNotLoadedException.php
+++ b/library/Zend/Validator/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Exception/InvalidArgumentException.php b/library/Zend/Validator/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 94f49393e..b6518b03d
--- a/library/Zend/Validator/Exception/InvalidArgumentException.php
+++ b/library/Zend/Validator/Exception/InvalidArgumentException.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Validator\Exception;
 
-class InvalidArgumentException extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php b/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
old mode 100755
new mode 100644
index 41baecc7c..4e65bd86a
--- a/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
+++ b/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Exception/RuntimeException.php b/library/Zend/Validator/Exception/RuntimeException.php
old mode 100755
new mode 100644
index c52d2cdf7..a6319e059
--- a/library/Zend/Validator/Exception/RuntimeException.php
+++ b/library/Zend/Validator/Exception/RuntimeException.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Validator\Exception;
 
-class RuntimeException extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/Validator/Explode.php b/library/Zend/Validator/Explode.php
old mode 100755
new mode 100644
index 9a26f7f4d..13b3b019c
--- a/library/Zend/Validator/Explode.php
+++ b/library/Zend/Validator/Explode.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/Count.php b/library/Zend/Validator/File/Count.php
old mode 100755
new mode 100644
index 0bbf6be6f..a4ce28e00
--- a/library/Zend/Validator/File/Count.php
+++ b/library/Zend/Validator/File/Count.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -121,8 +121,9 @@ class Count extends AbstractValidator
 
         $min = (int) $min;
         if (($this->getMax() !== null) && ($min > $this->getMax())) {
-            throw new Exception\InvalidArgumentException("The minimum must be less than or equal to the maximum file count, but $min >"
-                                            . " {$this->getMax()}");
+            throw new Exception\InvalidArgumentException(
+                "The minimum must be less than or equal to the maximum file count, but $min > {$this->getMax()}"
+            );
         }
 
         $this->options['min'] = $min;
@@ -158,8 +159,9 @@ class Count extends AbstractValidator
 
         $max = (int) $max;
         if (($this->getMin() !== null) && ($max < $this->getMin())) {
-            throw new Exception\InvalidArgumentException("The maximum must be greater than or equal to the minimum file count, but "
-                                            . "$max < {$this->getMin()}");
+            throw new Exception\InvalidArgumentException(
+                "The maximum must be greater than or equal to the minimum file count, but $max < {$this->getMin()}"
+            );
         }
 
         $this->options['max'] = $max;
diff --git a/library/Zend/Validator/File/Crc32.php b/library/Zend/Validator/File/Crc32.php
old mode 100755
new mode 100644
index 737521c22..a5f3de874
--- a/library/Zend/Validator/File/Crc32.php
+++ b/library/Zend/Validator/File/Crc32.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/ExcludeExtension.php b/library/Zend/Validator/File/ExcludeExtension.php
old mode 100755
new mode 100644
index 0d24b1857..e73d25bdc
--- a/library/Zend/Validator/File/ExcludeExtension.php
+++ b/library/Zend/Validator/File/ExcludeExtension.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/ExcludeMimeType.php b/library/Zend/Validator/File/ExcludeMimeType.php
old mode 100755
new mode 100644
index dedcee9fc..f0bd4f8cc
--- a/library/Zend/Validator/File/ExcludeMimeType.php
+++ b/library/Zend/Validator/File/ExcludeMimeType.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/Exists.php b/library/Zend/Validator/File/Exists.php
old mode 100755
new mode 100644
index c868aefc9..f141b8240
--- a/library/Zend/Validator/File/Exists.php
+++ b/library/Zend/Validator/File/Exists.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/Extension.php b/library/Zend/Validator/File/Extension.php
old mode 100755
new mode 100644
index 2ceeebc73..a779832fe
--- a/library/Zend/Validator/File/Extension.php
+++ b/library/Zend/Validator/File/Extension.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -13,6 +13,7 @@ use Traversable;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Validator\AbstractValidator;
 use Zend\Validator\Exception;
+
 /**
  * Validator for the file extension of a file
  */
diff --git a/library/Zend/Validator/File/FilesSize.php b/library/Zend/Validator/File/FilesSize.php
old mode 100755
new mode 100644
index f2d2afd0d..a31011174
--- a/library/Zend/Validator/File/FilesSize.php
+++ b/library/Zend/Validator/File/FilesSize.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/Hash.php b/library/Zend/Validator/File/Hash.php
old mode 100755
new mode 100644
index b77b1e19f..99b9bca05
--- a/library/Zend/Validator/File/Hash.php
+++ b/library/Zend/Validator/File/Hash.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/ImageSize.php b/library/Zend/Validator/File/ImageSize.php
old mode 100755
new mode 100644
index 921abfb1f..018e5f908
--- a/library/Zend/Validator/File/ImageSize.php
+++ b/library/Zend/Validator/File/ImageSize.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -130,8 +130,10 @@ class ImageSize extends AbstractValidator
     public function setMinWidth($minWidth)
     {
         if (($this->getMaxWidth() !== null) && ($minWidth > $this->getMaxWidth())) {
-            throw new Exception\InvalidArgumentException("The minimum image width must be less than or equal to the "
-                . " maximum image width, but {$minWidth} > {$this->getMaxWidth()}");
+            throw new Exception\InvalidArgumentException(
+                "The minimum image width must be less than or equal to the "
+                . " maximum image width, but {$minWidth} > {$this->getMaxWidth()}"
+            );
         }
 
         $this->options['minWidth']  = (int) $minWidth;
@@ -158,8 +160,10 @@ class ImageSize extends AbstractValidator
     public function setMaxWidth($maxWidth)
     {
         if (($this->getMinWidth() !== null) && ($maxWidth < $this->getMinWidth())) {
-            throw new Exception\InvalidArgumentException("The maximum image width must be greater than or equal to the "
-                . "minimum image width, but {$maxWidth} < {$this->getMinWidth()}");
+            throw new Exception\InvalidArgumentException(
+                "The maximum image width must be greater than or equal to the "
+                . "minimum image width, but {$maxWidth} < {$this->getMinWidth()}"
+            );
         }
 
         $this->options['maxWidth']  = (int) $maxWidth;
@@ -186,8 +190,10 @@ class ImageSize extends AbstractValidator
     public function setMinHeight($minHeight)
     {
         if (($this->getMaxHeight() !== null) && ($minHeight > $this->getMaxHeight())) {
-            throw new Exception\InvalidArgumentException("The minimum image height must be less than or equal to the "
-                . " maximum image height, but {$minHeight} > {$this->getMaxHeight()}");
+            throw new Exception\InvalidArgumentException(
+                "The minimum image height must be less than or equal to the "
+                . " maximum image height, but {$minHeight} > {$this->getMaxHeight()}"
+            );
         }
 
         $this->options['minHeight']  = (int) $minHeight;
@@ -214,8 +220,10 @@ class ImageSize extends AbstractValidator
     public function setMaxHeight($maxHeight)
     {
         if (($this->getMinHeight() !== null) && ($maxHeight < $this->getMinHeight())) {
-            throw new Exception\InvalidArgumentException("The maximum image height must be greater than or equal to the "
-                . "minimum image height, but {$maxHeight} < {$this->getMinHeight()}");
+            throw new Exception\InvalidArgumentException(
+                "The maximum image height must be greater than or equal to the "
+                . "minimum image height, but {$maxHeight} < {$this->getMinHeight()}"
+            );
         }
 
         $this->options['maxHeight']  = (int) $maxHeight;
diff --git a/library/Zend/Validator/File/IsCompressed.php b/library/Zend/Validator/File/IsCompressed.php
old mode 100755
new mode 100644
index 34bdf6692..ebd2e77da
--- a/library/Zend/Validator/File/IsCompressed.php
+++ b/library/Zend/Validator/File/IsCompressed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/IsImage.php b/library/Zend/Validator/File/IsImage.php
old mode 100755
new mode 100644
index 20fa6c802..a13bc043d
--- a/library/Zend/Validator/File/IsImage.php
+++ b/library/Zend/Validator/File/IsImage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/Md5.php b/library/Zend/Validator/File/Md5.php
old mode 100755
new mode 100644
index 5d9fc34b4..e1d1e973e
--- a/library/Zend/Validator/File/Md5.php
+++ b/library/Zend/Validator/File/Md5.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/MimeType.php b/library/Zend/Validator/File/MimeType.php
old mode 100755
new mode 100644
index 53fb948dd..a91c4dda8
--- a/library/Zend/Validator/File/MimeType.php
+++ b/library/Zend/Validator/File/MimeType.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/NotExists.php b/library/Zend/Validator/File/NotExists.php
old mode 100755
new mode 100644
index 17aa7da74..e50adef6c
--- a/library/Zend/Validator/File/NotExists.php
+++ b/library/Zend/Validator/File/NotExists.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/Sha1.php b/library/Zend/Validator/File/Sha1.php
old mode 100755
new mode 100644
index 984139450..7d172da43
--- a/library/Zend/Validator/File/Sha1.php
+++ b/library/Zend/Validator/File/Sha1.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/Size.php b/library/Zend/Validator/File/Size.php
old mode 100755
new mode 100644
index 2c00f06ee..e709fb5a8
--- a/library/Zend/Validator/File/Size.php
+++ b/library/Zend/Validator/File/Size.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -149,8 +149,8 @@ class Size extends AbstractValidator
         $max = $this->getMax(true);
         if (($max !== null) && ($min > $max)) {
             throw new Exception\InvalidArgumentException(
-                'The minimum must be less than or equal to the maximum file'
-                ." size, but $min > $max");
+                "The minimum must be less than or equal to the maximum file size, but $min > $max"
+            );
         }
 
         $this->options['min'] = $min;
@@ -194,8 +194,8 @@ class Size extends AbstractValidator
         $min = $this->getMin(true);
         if (($min !== null) && ($max < $min)) {
             throw new Exception\InvalidArgumentException(
-                'The maximum must be greater than or equal to the minimum file'
-                 ." size, but $max < $min");
+                "The maximum must be greater than or equal to the minimum file size, but $max < $min"
+            );
         }
 
         $this->options['max'] = $max;
diff --git a/library/Zend/Validator/File/Upload.php b/library/Zend/Validator/File/Upload.php
old mode 100755
new mode 100644
index 748b482ee..1524e4ca6
--- a/library/Zend/Validator/File/Upload.php
+++ b/library/Zend/Validator/File/Upload.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -115,7 +115,7 @@ class Upload extends AbstractValidator
             $this->options['files'] = $files;
         }
 
-        if ($this->options['files'] === NULL) {
+        if ($this->options['files'] === null) {
             $this->options['files'] = array();
         }
 
diff --git a/library/Zend/Validator/File/UploadFile.php b/library/Zend/Validator/File/UploadFile.php
old mode 100755
new mode 100644
index 4371c12bb..f34958fce
--- a/library/Zend/Validator/File/UploadFile.php
+++ b/library/Zend/Validator/File/UploadFile.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/File/WordCount.php b/library/Zend/Validator/File/WordCount.php
old mode 100755
new mode 100644
index f3d58016d..460b06a69
--- a/library/Zend/Validator/File/WordCount.php
+++ b/library/Zend/Validator/File/WordCount.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -116,8 +116,8 @@ class WordCount extends AbstractValidator
         $min = (int) $min;
         if (($this->getMax() !== null) && ($min > $this->getMax())) {
             throw new Exception\InvalidArgumentException(
-                "The minimum must be less than or equal to the maximum word count, but $min >"
-                . " {$this->getMax()}");
+                "The minimum must be less than or equal to the maximum word count, but $min > {$this->getMax()}"
+            );
         }
 
         $this->options['min'] = $min;
@@ -154,8 +154,8 @@ class WordCount extends AbstractValidator
         $max = (int) $max;
         if (($this->getMin() !== null) && ($max < $this->getMin())) {
             throw new Exception\InvalidArgumentException(
-                "The maximum must be greater than or equal to the minimum word count, but "
-                . "$max < {$this->getMin()}");
+                "The maximum must be greater than or equal to the minimum word count, but $max < {$this->getMin()}"
+            );
         }
 
         $this->options['max'] = $max;
diff --git a/library/Zend/Validator/GreaterThan.php b/library/Zend/Validator/GreaterThan.php
old mode 100755
new mode 100644
index 6a06ae8d2..7f106e8c5
--- a/library/Zend/Validator/GreaterThan.php
+++ b/library/Zend/Validator/GreaterThan.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Hex.php b/library/Zend/Validator/Hex.php
old mode 100755
new mode 100644
index e7b591c8b..64ae8930d
--- a/library/Zend/Validator/Hex.php
+++ b/library/Zend/Validator/Hex.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Hostname.php b/library/Zend/Validator/Hostname.php
old mode 100755
new mode 100644
index cdc98104f..95abee9e9
--- a/library/Zend/Validator/Hostname.php
+++ b/library/Zend/Validator/Hostname.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\Validator;
 
-use Zend\Stdlib\ErrorHandler;
 use Zend\Stdlib\StringUtils;
 
 /**
@@ -74,41 +73,758 @@ class Hostname extends AbstractValidator
      * @var array
      */
     protected $validTlds = array(
-        'ac', 'academy', 'actor', 'ad', 'ae', 'aero', 'af', 'ag', 'agency', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar',
-        'arpa', 'as', 'asia', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bar', 'bargains', 'bb', 'bd', 'be', 'berlin', 'best',
-        'bf', 'bg', 'bh', 'bi', 'bike', 'biz', 'bj', 'bl', 'blue', 'bm', 'bn', 'bo', 'boutique', 'bq', 'br', 'bs', 'bt',
-        'build', 'builders', 'buzz', 'bv', 'bw', 'by', 'bz', 'ca', 'cab', 'camera', 'camp', 'cards', 'careers', 'cat',
-        'catering', 'cc', 'cd', 'center', 'ceo', 'cf', 'cg', 'ch', 'cheap', 'christmas', 'ci', 'ck', 'cl', 'cleaning',
-        'clothing', 'club', 'cm', 'cn', 'co', 'codes', 'coffee', 'com', 'community', 'company', 'computer',
-        'construction', 'contractors', 'cool', 'coop', 'cr', 'cruises', 'cu', 'cv', 'cw', 'cx', 'cy', 'cz', 'dance',
-        'dating', 'de', 'democrat', 'diamonds', 'directory', 'dj', 'dk', 'dm', 'do', 'domains', 'dz', 'ec', 'edu',
-        'education', 'ee', 'eg', 'eh', 'email', 'enterprises', 'equipment', 'er', 'es', 'estate', 'et', 'eu', 'events',
-        'expert', 'exposed', 'farm', 'fi', 'fish', 'fj', 'fk', 'flights', 'florist', 'fm', 'fo', 'foundation', 'fr',
-        'futbol', 'ga', 'gallery', 'gb', 'gd', 'ge', 'gf', 'gg', 'gh', 'gi', 'gift', 'gl', 'glass', 'gm', 'gn', 'gov',
-        'gp', 'gq', 'gr', 'graphics', 'gs', 'gt', 'gu', 'guitars', 'guru', 'gw', 'gy', 'hk', 'hm', 'hn', 'holdings',
-        'holiday', 'house', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'immobilien', 'in', 'industries', 'info',
-        'institute', 'int', 'international', 'io', 'iq', 'ir', 'is', 'it', 'je', 'jm', 'jo', 'jobs', 'jp', 'kaufen',
-        'ke', 'kg', 'kh', 'ki', 'kim', 'kitchen', 'kiwi', 'km', 'kn', 'kp', 'kr', 'kred', 'kw', 'ky', 'kz', 'la',
-        'land', 'lb', 'lc', 'li', 'lighting', 'limo', 'link', 'lk', 'lr', 'ls', 'lt', 'lu', 'luxury', 'lv', 'ly', 'ma',
-        'management', 'mango', 'marketing', 'mc', 'md', 'me', 'menu', 'mf', 'mg', 'mh', 'mil', 'mk', 'ml', 'mm', 'mn',
-        'mo', 'mobi', 'moda', 'monash', 'mp', 'mq', 'mr', 'ms', 'mt', 'mu', 'museum', 'mv', 'mw', 'mx', 'my', 'mz',
-        'na', 'nagoya', 'name', 'nc', 'ne', 'net', 'neustar', 'nf', 'ng', 'ni', 'ninja', 'nl', 'no', 'np', 'nr', 'nu',
-        'nz', 'om', 'onl', 'org', 'pa', 'partners', 'parts', 'pe', 'pf', 'pg', 'ph', 'photo', 'photography', 'photos',
-        'pics', 'pink', 'pk', 'pl', 'plumbing', 'pm', 'pn', 'post', 'pr', 'pro', 'productions', 'properties', 'ps',
-        'pt', 'pub', 'pw', 'py', 'qa', 'qpon', 're', 'recipes', 'red', 'rentals', 'repair', 'report', 'reviews', 'rich',
-        'ro', 'rs', 'ru', 'ruhr', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sexy', 'sg', 'sh', 'shiksha', 'shoes', 'si',
-        'singles', 'sj', 'sk', 'sl', 'sm', 'sn', 'so', 'social', 'solar', 'solutions', 'sr', 'ss', 'st', 'su',
-        'supplies', 'supply', 'support', 'sv', 'sx', 'sy', 'systems', 'sz', 'tattoo', 'tc', 'td', 'technology', 'tel',
-        'tf', 'tg', 'th', 'tienda', 'tips', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'today', 'tokyo', 'tools', 'tp', 'tr',
-        'training', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua', 'ug', 'uk', 'um', 'uno', 'us', 'uy', 'uz', 'va',
-        'vacations', 'vc', 've', 'ventures', 'vg', 'vi', 'viajes', 'villas', 'vision', 'vn', 'voting', 'voyage', 'vu',
-        'wang', 'watch', 'wed', 'wf', 'wien', 'wiki', 'works', 'ws', '测试', 'परीक्षा', '集团', '在线', '한국', 'ভারত',
-        'বাংলা', '公益', '公司', '移动', '我爱你', 'испытание', 'қаз', 'онлайн', 'сайт', 'срб', '테스트', '삼성',
-        'சிங்கப்பூர்', 'дети', 'טעסט', '中文网', '中信', '中国', '中國', 'భారత్', 'ලංකා', '測試', 'ભારત', 'भारत',
-        'آزمایشی', 'பரிட்சை', '网络', 'укр', '香港', 'δοκιμή', 'إختبار', '台湾', '台灣', 'мон',
-        'الجزائر', 'عمان', 'ایران', 'امارات', 'بازار', 'پاکستان', 'الاردن', 'بھارت', 'المغرب', 'السعودية', 'سودان', 'مليسيا', 'شبكة', 'გე',
-        'ไทย', 'سورية', 'рф', 'تونس', 'みんな', 'ਭਾਰਤ', '游戏', 'مصر', 'قطر', 'இலங்கை', 'இந்தியா', '新加坡', 'فلسطين',
-        'テスト', '政务', 'xxx', 'xyz', 'ye', 'yt', 'za', 'zm', 'zone', 'zw'
+        'abogado',
+        'ac',
+        'academy',
+        'accountants',
+        'active',
+        'actor',
+        'ad',
+        'ae',
+        'aero',
+        'af',
+        'ag',
+        'agency',
+        'ai',
+        'airforce',
+        'al',
+        'allfinanz',
+        'alsace',
+        'am',
+        'an',
+        'android',
+        'ao',
+        'aq',
+        'ar',
+        'archi',
+        'army',
+        'arpa',
+        'as',
+        'asia',
+        'associates',
+        'at',
+        'attorney',
+        'au',
+        'auction',
+        'audio',
+        'autos',
+        'aw',
+        'ax',
+        'axa',
+        'az',
+        'ba',
+        'band',
+        'bar',
+        'bargains',
+        'bayern',
+        'bb',
+        'bd',
+        'be',
+        'beer',
+        'berlin',
+        'best',
+        'bf',
+        'bg',
+        'bh',
+        'bi',
+        'bid',
+        'bike',
+        'bio',
+        'biz',
+        'bj',
+        'black',
+        'blackfriday',
+        'bloomberg',
+        'blue',
+        'bm',
+        'bmw',
+        'bn',
+        'bnpparibas',
+        'bo',
+        'boo',
+        'boutique',
+        'br',
+        'brussels',
+        'bs',
+        'bt',
+        'budapest',
+        'build',
+        'builders',
+        'business',
+        'buzz',
+        'bv',
+        'bw',
+        'by',
+        'bz',
+        'bzh',
+        'ca',
+        'cab',
+        'cal',
+        'camera',
+        'camp',
+        'cancerresearch',
+        'capetown',
+        'capital',
+        'caravan',
+        'cards',
+        'care',
+        'career',
+        'careers',
+        'casa',
+        'cash',
+        'cat',
+        'catering',
+        'cc',
+        'cd',
+        'center',
+        'ceo',
+        'cern',
+        'cf',
+        'cg',
+        'ch',
+        'channel',
+        'cheap',
+        'christmas',
+        'chrome',
+        'church',
+        'ci',
+        'citic',
+        'city',
+        'ck',
+        'cl',
+        'claims',
+        'cleaning',
+        'click',
+        'clinic',
+        'clothing',
+        'club',
+        'cm',
+        'cn',
+        'co',
+        'coach',
+        'codes',
+        'coffee',
+        'college',
+        'cologne',
+        'com',
+        'community',
+        'company',
+        'computer',
+        'condos',
+        'construction',
+        'consulting',
+        'contractors',
+        'cooking',
+        'cool',
+        'coop',
+        'country',
+        'cr',
+        'credit',
+        'creditcard',
+        'cricket',
+        'crs',
+        'cruises',
+        'cu',
+        'cuisinella',
+        'cv',
+        'cw',
+        'cx',
+        'cy',
+        'cymru',
+        'cz',
+        'dad',
+        'dance',
+        'dating',
+        'day',
+        'de',
+        'deals',
+        'degree',
+        'delivery',
+        'democrat',
+        'dental',
+        'dentist',
+        'desi',
+        'diamonds',
+        'diet',
+        'digital',
+        'direct',
+        'directory',
+        'discount',
+        'dj',
+        'dk',
+        'dm',
+        'dnp',
+        'do',
+        'domains',
+        'durban',
+        'dvag',
+        'dz',
+        'eat',
+        'ec',
+        'edu',
+        'education',
+        'ee',
+        'eg',
+        'email',
+        'emerck',
+        'energy',
+        'engineer',
+        'engineering',
+        'enterprises',
+        'equipment',
+        'er',
+        'es',
+        'esq',
+        'estate',
+        'et',
+        'eu',
+        'eus',
+        'events',
+        'everbank',
+        'exchange',
+        'expert',
+        'exposed',
+        'fail',
+        'farm',
+        'feedback',
+        'fi',
+        'finance',
+        'financial',
+        'firmdale',
+        'fish',
+        'fishing',
+        'fitness',
+        'fj',
+        'fk',
+        'flights',
+        'florist',
+        'flsmidth',
+        'fly',
+        'fm',
+        'fo',
+        'foo',
+        'forsale',
+        'foundation',
+        'fr',
+        'frl',
+        'frogans',
+        'fund',
+        'furniture',
+        'futbol',
+        'ga',
+        'gal',
+        'gallery',
+        'gb',
+        'gbiz',
+        'gd',
+        'ge',
+        'gent',
+        'gf',
+        'gg',
+        'gh',
+        'gi',
+        'gift',
+        'gifts',
+        'gives',
+        'gl',
+        'glass',
+        'gle',
+        'global',
+        'globo',
+        'gm',
+        'gmail',
+        'gmo',
+        'gmx',
+        'gn',
+        'google',
+        'gop',
+        'gov',
+        'gp',
+        'gq',
+        'gr',
+        'graphics',
+        'gratis',
+        'green',
+        'gripe',
+        'gs',
+        'gt',
+        'gu',
+        'guide',
+        'guitars',
+        'guru',
+        'gw',
+        'gy',
+        'hamburg',
+        'haus',
+        'healthcare',
+        'help',
+        'here',
+        'hiphop',
+        'hiv',
+        'hk',
+        'hm',
+        'hn',
+        'holdings',
+        'holiday',
+        'homes',
+        'horse',
+        'host',
+        'hosting',
+        'house',
+        'how',
+        'hr',
+        'ht',
+        'hu',
+        'ibm',
+        'id',
+        'ie',
+        'il',
+        'im',
+        'immo',
+        'immobilien',
+        'in',
+        'industries',
+        'info',
+        'ing',
+        'ink',
+        'institute',
+        'insure',
+        'int',
+        'international',
+        'investments',
+        'io',
+        'iq',
+        'ir',
+        'is',
+        'it',
+        'je',
+        'jetzt',
+        'jm',
+        'jo',
+        'jobs',
+        'joburg',
+        'jp',
+        'juegos',
+        'kaufen',
+        'ke',
+        'kg',
+        'kh',
+        'ki',
+        'kim',
+        'kitchen',
+        'kiwi',
+        'km',
+        'kn',
+        'koeln',
+        'kp',
+        'kr',
+        'krd',
+        'kred',
+        'kw',
+        'ky',
+        'kz',
+        'la',
+        'lacaixa',
+        'land',
+        'lawyer',
+        'lb',
+        'lc',
+        'lds',
+        'lease',
+        'legal',
+        'lgbt',
+        'li',
+        'life',
+        'lighting',
+        'limited',
+        'limo',
+        'link',
+        'lk',
+        'loans',
+        'london',
+        'lotto',
+        'lr',
+        'ls',
+        'lt',
+        'ltda',
+        'lu',
+        'luxe',
+        'luxury',
+        'lv',
+        'ly',
+        'ma',
+        'madrid',
+        'maison',
+        'management',
+        'mango',
+        'market',
+        'marketing',
+        'mc',
+        'md',
+        'me',
+        'media',
+        'meet',
+        'melbourne',
+        'meme',
+        'memorial',
+        'menu',
+        'mg',
+        'mh',
+        'miami',
+        'mil',
+        'mini',
+        'mk',
+        'ml',
+        'mm',
+        'mn',
+        'mo',
+        'mobi',
+        'moda',
+        'moe',
+        'monash',
+        'money',
+        'mormon',
+        'mortgage',
+        'moscow',
+        'motorcycles',
+        'mov',
+        'mp',
+        'mq',
+        'mr',
+        'ms',
+        'mt',
+        'mu',
+        'museum',
+        'mv',
+        'mw',
+        'mx',
+        'my',
+        'mz',
+        'na',
+        'nagoya',
+        'name',
+        'navy',
+        'nc',
+        'ne',
+        'net',
+        'network',
+        'neustar',
+        'new',
+        'nexus',
+        'nf',
+        'ng',
+        'ngo',
+        'nhk',
+        'ni',
+        'ninja',
+        'nl',
+        'no',
+        'np',
+        'nr',
+        'nra',
+        'nrw',
+        'nu',
+        'nyc',
+        'nz',
+        'okinawa',
+        'om',
+        'ong',
+        'onl',
+        'ooo',
+        'org',
+        'organic',
+        'otsuka',
+        'ovh',
+        'pa',
+        'paris',
+        'partners',
+        'parts',
+        'party',
+        'pe',
+        'pf',
+        'pg',
+        'ph',
+        'pharmacy',
+        'photo',
+        'photography',
+        'photos',
+        'physio',
+        'pics',
+        'pictures',
+        'pink',
+        'pizza',
+        'pk',
+        'pl',
+        'place',
+        'plumbing',
+        'pm',
+        'pn',
+        'pohl',
+        'poker',
+        'post',
+        'pr',
+        'praxi',
+        'press',
+        'pro',
+        'prod',
+        'productions',
+        'prof',
+        'properties',
+        'property',
+        'ps',
+        'pt',
+        'pub',
+        'pw',
+        'py',
+        'qa',
+        'qpon',
+        'quebec',
+        're',
+        'realtor',
+        'recipes',
+        'red',
+        'rehab',
+        'reise',
+        'reisen',
+        'reit',
+        'ren',
+        'rentals',
+        'repair',
+        'report',
+        'republican',
+        'rest',
+        'restaurant',
+        'reviews',
+        'rich',
+        'rio',
+        'rip',
+        'ro',
+        'rocks',
+        'rodeo',
+        'rs',
+        'rsvp',
+        'ru',
+        'ruhr',
+        'rw',
+        'ryukyu',
+        'sa',
+        'saarland',
+        'sarl',
+        'sb',
+        'sc',
+        'sca',
+        'scb',
+        'schmidt',
+        'schule',
+        'science',
+        'scot',
+        'sd',
+        'se',
+        'services',
+        'sexy',
+        'sg',
+        'sh',
+        'shiksha',
+        'shoes',
+        'si',
+        'singles',
+        'sj',
+        'sk',
+        'sl',
+        'sm',
+        'sn',
+        'so',
+        'social',
+        'software',
+        'sohu',
+        'solar',
+        'solutions',
+        'soy',
+        'space',
+        'spiegel',
+        'sr',
+        'st',
+        'su',
+        'supplies',
+        'supply',
+        'support',
+        'surf',
+        'surgery',
+        'suzuki',
+        'sv',
+        'sx',
+        'sy',
+        'sydney',
+        'systems',
+        'sz',
+        'taipei',
+        'tatar',
+        'tattoo',
+        'tax',
+        'tc',
+        'td',
+        'technology',
+        'tel',
+        'tf',
+        'tg',
+        'th',
+        'tienda',
+        'tips',
+        'tirol',
+        'tj',
+        'tk',
+        'tl',
+        'tm',
+        'tn',
+        'to',
+        'today',
+        'tokyo',
+        'tools',
+        'top',
+        'town',
+        'toys',
+        'tp',
+        'tr',
+        'trade',
+        'training',
+        'travel',
+        'tt',
+        'tui',
+        'tv',
+        'tw',
+        'tz',
+        'ua',
+        'ug',
+        'uk',
+        'university',
+        'uno',
+        'uol',
+        'us',
+        'uy',
+        'uz',
+        'va',
+        'vacations',
+        'vc',
+        've',
+        'vegas',
+        'ventures',
+        'versicherung',
+        'vet',
+        'vg',
+        'vi',
+        'viajes',
+        'villas',
+        'vision',
+        'vlaanderen',
+        'vn',
+        'vodka',
+        'vote',
+        'voting',
+        'voto',
+        'voyage',
+        'vu',
+        'wales',
+        'wang',
+        'watch',
+        'webcam',
+        'website',
+        'wed',
+        'wedding',
+        'wf',
+        'whoswho',
+        'wien',
+        'wiki',
+        'williamhill',
+        'wme',
+        'work',
+        'works',
+        'world',
+        'ws',
+        'wtc',
+        'wtf',
+        '测试',
+        'परीक्षा',
+        '集团',
+        '在线',
+        '한국',
+        'ভারত',
+        'বাংলা',
+        '公益',
+        '公司',
+        '移动',
+        '我爱你',
+        'испытание',
+        'қаз',
+        'онлайн',
+        'сайт',
+        'срб',
+        '테스트',
+        '삼성',
+        'சிங்கப்பூர்',
+        'дети',
+        'טעסט',
+        '中文网',
+        '中信',
+        '中国',
+        '中國',
+        'భారత్',
+        'ලංකා',
+        '測試',
+        'ભારત',
+        'भारत',
+        'آزمایشی',
+         'பரிட்சை',
+        '网络',
+        'укр',
+        '香港',
+        'δοκιμή',
+        'إختبار',
+        '台湾',
+        '台灣',
+        'мон',
+        'الجزا',
+        'عمان',
+        'ایران',
+        'امارات',
+        'بازار',
+        'پاکستا',
+        'الاردن',
+        'بھارت',
+        'المغرب',
+        'السعودية',
+        'سودان',
+        'مليسيا',
+        'شبكة',
+        'გე',
+        'ไทย',
+        'سورية',
+        'рф',
+        'تونس',
+        'みんな',
+        'ਭਾਰਤ',
+        '游戏',
+        'مصر',
+        'قطر',
+        'இலங்கை',
+        'இந்தியா',
+        '新加坡',
+        'فلسطين',
+        'テスト',
+        '政务',
+        'xxx',
+        'xyz',
+        'yachts',
+        'yandex',
+        'ye',
+        'yoga',
+        'yokohama',
+        'youtube',
+        'yt',
+        'za',
+        'zip',
+        'zm',
+        'zone',
+        'zw'
     );
 
     /**
@@ -478,15 +1194,15 @@ class Hostname extends AbstractValidator
 
         $this->setValue($value);
         // Check input against IP address schema
-        if (preg_match('/^[0-9a-f:.]*$/i', $value) && $this->getIpValidator()
-            ->setTranslator($this->getTranslator())
-            ->isValid($value)) {
+        if (preg_match('/^[0-9a-f:.]*$/i', $value)
+            && $this->getIpValidator()->setTranslator($this->getTranslator())->isValid($value)
+        ) {
             if (!($this->getAllow() & self::ALLOW_IP)) {
                 $this->error(self::IP_ADDRESS_NOT_ALLOWED);
                 return false;
-            } else {
-                return true;
             }
+
+            return true;
         }
 
         // Local hostnames are allowed to be partial (ending '.')
@@ -504,18 +1220,18 @@ class Hostname extends AbstractValidator
         $domainParts = explode('.', $value);
 
         // Prevent partial IP V4 addresses (ending '.')
-        if ((count($domainParts) == 4) && preg_match('/^[0-9.a-e:.]*$/i', $value) && $this->getIpValidator()
-            ->setTranslator($this->getTranslator())
-            ->isValid($value)) {
+        if (count($domainParts) == 4 && preg_match('/^[0-9.a-e:.]*$/i', $value)
+            && $this->getIpValidator()->setTranslator($this->getTranslator())->isValid($value)
+        ) {
             $this->error(self::INVALID_LOCAL_NAME);
         }
 
         $utf8StrWrapper = StringUtils::getWrapper('UTF-8');
 
         // Check input against DNS hostname schema
-        if ((count($domainParts) > 1)
-            && ($utf8StrWrapper->strlen($value) >= 4)
-            && ($utf8StrWrapper->strlen($value) <= 254)
+        if (count($domainParts) > 1
+            && $utf8StrWrapper->strlen($value) >= 4
+            && $utf8StrWrapper->strlen($value) <= 254
         ) {
             $status = false;
 
@@ -523,7 +1239,8 @@ class Hostname extends AbstractValidator
                 // First check TLD
                 $matches = array();
                 if (preg_match('/([^.]{2,63})$/iu', end($domainParts), $matches)
-                    || (array_key_exists(end($domainParts), $this->validIdns))) {
+                    || (array_key_exists(end($domainParts), $this->validIdns))
+                ) {
                     reset($domainParts);
 
                     // Hostname characters are: *(label dot)(label dot label); max 254 chars
@@ -572,9 +1289,13 @@ class Hostname extends AbstractValidator
                         }
 
                         // Check dash (-) does not start, end or appear in 3rd and 4th positions
-                        if (($utf8StrWrapper->strpos($domainPart, '-') === 0)
-                            || (($utf8StrWrapper->strlen($domainPart) > 2) && ($utf8StrWrapper->strpos($domainPart, '-', 2) == 2) && ($utf8StrWrapper->strpos($domainPart, '-', 3) == 3))
-                            || ($utf8StrWrapper->strpos($domainPart, '-') === ($utf8StrWrapper->strlen($domainPart) - 1))) {
+                        if ($utf8StrWrapper->strpos($domainPart, '-') === 0
+                            || ($utf8StrWrapper->strlen($domainPart) > 2
+                                && $utf8StrWrapper->strpos($domainPart, '-', 2) == 2
+                                && $utf8StrWrapper->strpos($domainPart, '-', 3) == 3
+                            )
+                            || ($utf8StrWrapper->strpos($domainPart, '-') === ($utf8StrWrapper->strlen($domainPart) - 1))
+                        ) {
                             $this->error(self::INVALID_DASH);
                             $status = false;
                             break 2;
@@ -583,13 +1304,12 @@ class Hostname extends AbstractValidator
                         // Check each domain part
                         $checked = false;
                         foreach ($regexChars as $regexKey => $regexChar) {
-                            ErrorHandler::start();
                             $status = preg_match($regexChar, $domainPart);
-                            ErrorHandler::stop();
                             if ($status > 0) {
                                 $length = 63;
                                 if (array_key_exists($this->tld, $this->idnLength)
-                                    && (array_key_exists($regexKey, $this->idnLength[$this->tld]))) {
+                                    && array_key_exists($regexKey, $this->idnLength[$this->tld])
+                                ) {
                                     $length = $this->idnLength[$this->tld];
                                 }
 
@@ -634,16 +1354,14 @@ class Hostname extends AbstractValidator
         if ($this->getAllow() & self::ALLOW_URI) {
             if (preg_match("/^([a-zA-Z0-9-._~!$&\'()*+,;=]|%[[:xdigit:]]{2}){1,254}$/i", $value)) {
                 return true;
-            } else {
-                $this->error(self::INVALID_URI);
             }
+
+            $this->error(self::INVALID_URI);
         }
 
         // Check input against local network name schema; last chance to pass validation
-        ErrorHandler::start();
         $regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}[\x2e]{0,1}){1,254}$/';
         $status = preg_match($regexLocal, $value);
-        ErrorHandler::stop();
 
         // If the input passes as a local network name, and local network names are allowed, then the
         // hostname passes validation
diff --git a/library/Zend/Validator/Hostname/Biz.php b/library/Zend/Validator/Hostname/Biz.php
old mode 100755
new mode 100644
index cadf8e3f7..fd755c748
--- a/library/Zend/Validator/Hostname/Biz.php
+++ b/library/Zend/Validator/Hostname/Biz.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Hostname/Cn.php b/library/Zend/Validator/Hostname/Cn.php
old mode 100755
new mode 100644
index 2a6418555..64f6af61a
--- a/library/Zend/Validator/Hostname/Cn.php
+++ b/library/Zend/Validator/Hostname/Cn.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Hostname/Com.php b/library/Zend/Validator/Hostname/Com.php
old mode 100755
new mode 100644
index a86e806c9..93f3834b6
--- a/library/Zend/Validator/Hostname/Com.php
+++ b/library/Zend/Validator/Hostname/Com.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -169,8 +169,6 @@ return array(
     68 => '/^[\x{A000}-\x{A48F}]{1,63}$/iu',
     69 => '/^[\x{A490}-\x{A4CF}]{1,63}$/iu',
     70 => '/^[\x{AC00}-\x{D7AF}]{1,63}$/iu',
-    71 => '/^[\x{D800}-\x{DB7F}]{1,63}$/iu',
-    72 => '/^[\x{DC00}-\x{DFFF}]{1,63}$/iu',
     73 => '/^[\x{F900}-\x{FAFF}]{1,63}$/iu',
     74 => '/^[\x{FB00}-\x{FB4F}]{1,63}$/iu',
     75 => '/^[\x{FB50}-\x{FDFF}]{1,63}$/iu',
diff --git a/library/Zend/Validator/Hostname/Jp.php b/library/Zend/Validator/Hostname/Jp.php
old mode 100755
new mode 100644
index f1cf75fb0..e0d871e5e
--- a/library/Zend/Validator/Hostname/Jp.php
+++ b/library/Zend/Validator/Hostname/Jp.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Iban.php b/library/Zend/Validator/Iban.php
old mode 100755
new mode 100644
index 6a96f74c0..f6d542a1c
--- a/library/Zend/Validator/Iban.php
+++ b/library/Zend/Validator/Iban.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Identical.php b/library/Zend/Validator/Identical.php
old mode 100755
new mode 100644
index 25927163b..cbd19158e
--- a/library/Zend/Validator/Identical.php
+++ b/library/Zend/Validator/Identical.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/InArray.php b/library/Zend/Validator/InArray.php
old mode 100755
new mode 100644
index 2460151b5..f2ac33af3
--- a/library/Zend/Validator/InArray.php
+++ b/library/Zend/Validator/InArray.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Ip.php b/library/Zend/Validator/Ip.php
old mode 100755
new mode 100644
index 9253a8189..aac208282
--- a/library/Zend/Validator/Ip.php
+++ b/library/Zend/Validator/Ip.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/IsInstanceOf.php b/library/Zend/Validator/IsInstanceOf.php
old mode 100755
new mode 100644
index 89219e50c..d45fabdae
--- a/library/Zend/Validator/IsInstanceOf.php
+++ b/library/Zend/Validator/IsInstanceOf.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\Validator;
diff --git a/library/Zend/Validator/Isbn.php b/library/Zend/Validator/Isbn.php
old mode 100755
new mode 100644
index 966153754..48ef5b102
--- a/library/Zend/Validator/Isbn.php
+++ b/library/Zend/Validator/Isbn.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/LessThan.php b/library/Zend/Validator/LessThan.php
old mode 100755
new mode 100644
index 7925fd8e1..0dbaee1a6
--- a/library/Zend/Validator/LessThan.php
+++ b/library/Zend/Validator/LessThan.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/NotEmpty.php b/library/Zend/Validator/NotEmpty.php
old mode 100755
new mode 100644
index 52a23f59d..d7d1a8ce0
--- a/library/Zend/Validator/NotEmpty.php
+++ b/library/Zend/Validator/NotEmpty.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/README.md b/library/Zend/Validator/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Validator/Regex.php b/library/Zend/Validator/Regex.php
old mode 100755
new mode 100644
index 0f484fff5..b8dfb2fa2
--- a/library/Zend/Validator/Regex.php
+++ b/library/Zend/Validator/Regex.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -98,7 +98,11 @@ class Regex extends AbstractValidator
         $error         = ErrorHandler::stop();
 
         if (false === $status) {
-            throw new Exception\InvalidArgumentException("Internal error parsing the pattern '{$this->pattern}'", 0, $error);
+            throw new Exception\InvalidArgumentException(
+                "Internal error parsing the pattern '{$this->pattern}'",
+                0,
+                $error
+            );
         }
 
         return $this;
diff --git a/library/Zend/Validator/Sitemap/Changefreq.php b/library/Zend/Validator/Sitemap/Changefreq.php
old mode 100755
new mode 100644
index a959b023d..090d8042e
--- a/library/Zend/Validator/Sitemap/Changefreq.php
+++ b/library/Zend/Validator/Sitemap/Changefreq.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Sitemap/Lastmod.php b/library/Zend/Validator/Sitemap/Lastmod.php
old mode 100755
new mode 100644
index ace679fdc..49293ab72
--- a/library/Zend/Validator/Sitemap/Lastmod.php
+++ b/library/Zend/Validator/Sitemap/Lastmod.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Sitemap/Loc.php b/library/Zend/Validator/Sitemap/Loc.php
old mode 100755
new mode 100644
index 481b286e9..549191782
--- a/library/Zend/Validator/Sitemap/Loc.php
+++ b/library/Zend/Validator/Sitemap/Loc.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Sitemap/Priority.php b/library/Zend/Validator/Sitemap/Priority.php
old mode 100755
new mode 100644
index d5313f374..ea536934b
--- a/library/Zend/Validator/Sitemap/Priority.php
+++ b/library/Zend/Validator/Sitemap/Priority.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/StaticValidator.php b/library/Zend/Validator/StaticValidator.php
old mode 100755
new mode 100644
index 84eca5635..dea88364c
--- a/library/Zend/Validator/StaticValidator.php
+++ b/library/Zend/Validator/StaticValidator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Step.php b/library/Zend/Validator/Step.php
old mode 100755
new mode 100644
index 8b82bfd45..84a2b252d
--- a/library/Zend/Validator/Step.php
+++ b/library/Zend/Validator/Step.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/StringLength.php b/library/Zend/Validator/StringLength.php
old mode 100755
new mode 100644
index 53a162c6c..1e0b9bcb6
--- a/library/Zend/Validator/StringLength.php
+++ b/library/Zend/Validator/StringLength.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -87,8 +87,9 @@ class StringLength extends AbstractValidator
     public function setMin($min)
     {
         if (null !== $this->getMax() && $min > $this->getMax()) {
-            throw new Exception\InvalidArgumentException("The minimum must be less than or equal to the maximum length, but $min >"
-                                            . " " . $this->getMax());
+            throw new Exception\InvalidArgumentException(
+                "The minimum must be less than or equal to the maximum length, but $min >" . " " . $this->getMax()
+            );
         }
 
         $this->options['min'] = max(0, (int) $min);
@@ -117,8 +118,9 @@ class StringLength extends AbstractValidator
         if (null === $max) {
             $this->options['max'] = null;
         } elseif ($max < $this->getMin()) {
-            throw new Exception\InvalidArgumentException("The maximum must be greater than or equal to the minimum length, but "
-                                            . "$max < " . $this->getMin());
+            throw new Exception\InvalidArgumentException(
+                "The maximum must be greater than or equal to the minimum length, but $max < " . $this->getMin()
+            );
         } else {
             $this->options['max'] = (int) $max;
         }
diff --git a/library/Zend/Validator/Translator/TranslatorAwareInterface.php b/library/Zend/Validator/Translator/TranslatorAwareInterface.php
old mode 100755
new mode 100644
index a9fb45d3b..fd0af1fd3
--- a/library/Zend/Validator/Translator/TranslatorAwareInterface.php
+++ b/library/Zend/Validator/Translator/TranslatorAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *;
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Translator/TranslatorInterface.php b/library/Zend/Validator/Translator/TranslatorInterface.php
old mode 100755
new mode 100644
index 01981d378..3439e91a5
--- a/library/Zend/Validator/Translator/TranslatorInterface.php
+++ b/library/Zend/Validator/Translator/TranslatorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/Uri.php b/library/Zend/Validator/Uri.php
old mode 100755
new mode 100644
index 6bd3e7c92..a6e5eab2b
--- a/library/Zend/Validator/Uri.php
+++ b/library/Zend/Validator/Uri.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/ValidatorChain.php b/library/Zend/Validator/ValidatorChain.php
old mode 100755
new mode 100644
index 0ff337cb3..a3b8c5b84
--- a/library/Zend/Validator/ValidatorChain.php
+++ b/library/Zend/Validator/ValidatorChain.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/ValidatorInterface.php b/library/Zend/Validator/ValidatorInterface.php
old mode 100755
new mode 100644
index d48aa1586..6424ef7a6
--- a/library/Zend/Validator/ValidatorInterface.php
+++ b/library/Zend/Validator/ValidatorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/ValidatorPluginManager.php b/library/Zend/Validator/ValidatorPluginManager.php
old mode 100755
new mode 100644
index d2b62a4e6..e16a76377
--- a/library/Zend/Validator/ValidatorPluginManager.php
+++ b/library/Zend/Validator/ValidatorPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php b/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php
old mode 100755
new mode 100644
index 4d9c8d097..b5436b82b
--- a/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php
+++ b/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/Validator/composer.json b/library/Zend/Validator/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/Version/CONTRIBUTING.md b/library/Zend/Version/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Version/README.md b/library/Zend/Version/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/Version/Version.php b/library/Zend/Version/Version.php
old mode 100755
new mode 100644
index d66926b1b..7b27667e1
--- a/library/Zend/Version/Version.php
+++ b/library/Zend/Version/Version.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -20,7 +20,7 @@ final class Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '2.3.4dev';
+    const VERSION = '2.3.4';
 
     /**
      * Github Service Identifier for version information is retrieved from
diff --git a/library/Zend/Version/composer.json b/library/Zend/Version/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/View/CONTRIBUTING.md b/library/Zend/View/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/View/Exception/BadMethodCallException.php b/library/Zend/View/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index 2c52e7c15..8d3e7b1e0
--- a/library/Zend/View/Exception/BadMethodCallException.php
+++ b/library/Zend/View/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Exception/DomainException.php b/library/Zend/View/Exception/DomainException.php
old mode 100755
new mode 100644
index fd23205b8..b485db616
--- a/library/Zend/View/Exception/DomainException.php
+++ b/library/Zend/View/Exception/DomainException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Exception/ExceptionInterface.php b/library/Zend/View/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 6ddee6fe0..469e0f48e
--- a/library/Zend/View/Exception/ExceptionInterface.php
+++ b/library/Zend/View/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Exception/InvalidArgumentException.php b/library/Zend/View/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 2204ae4a7..dd4dbe2b5
--- a/library/Zend/View/Exception/InvalidArgumentException.php
+++ b/library/Zend/View/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Exception/InvalidHelperException.php b/library/Zend/View/Exception/InvalidHelperException.php
old mode 100755
new mode 100644
index 01c989106..49b392329
--- a/library/Zend/View/Exception/InvalidHelperException.php
+++ b/library/Zend/View/Exception/InvalidHelperException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Exception/RuntimeException.php b/library/Zend/View/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 579aa45ac..efb80bcb9
--- a/library/Zend/View/Exception/RuntimeException.php
+++ b/library/Zend/View/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Exception/UnexpectedValueException.php b/library/Zend/View/Exception/UnexpectedValueException.php
old mode 100755
new mode 100644
index 95761b5cb..b6d047362
--- a/library/Zend/View/Exception/UnexpectedValueException.php
+++ b/library/Zend/View/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/AbstractHelper.php b/library/Zend/View/Helper/AbstractHelper.php
old mode 100755
new mode 100644
index 18ea1a970..ba7fe2515
--- a/library/Zend/View/Helper/AbstractHelper.php
+++ b/library/Zend/View/Helper/AbstractHelper.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/AbstractHtmlElement.php b/library/Zend/View/Helper/AbstractHtmlElement.php
old mode 100755
new mode 100644
index 9da54a841..3cf73e9ff
--- a/library/Zend/View/Helper/AbstractHtmlElement.php
+++ b/library/Zend/View/Helper/AbstractHtmlElement.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/BasePath.php b/library/Zend/View/Helper/BasePath.php
old mode 100755
new mode 100644
index ddca8c71a..d71a34534
--- a/library/Zend/View/Helper/BasePath.php
+++ b/library/Zend/View/Helper/BasePath.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Cycle.php b/library/Zend/View/Helper/Cycle.php
old mode 100755
new mode 100644
index 524002f23..992f9f340
--- a/library/Zend/View/Helper/Cycle.php
+++ b/library/Zend/View/Helper/Cycle.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/DeclareVars.php b/library/Zend/View/Helper/DeclareVars.php
old mode 100755
new mode 100644
index b3f35fc5f..4be8129dd
--- a/library/Zend/View/Helper/DeclareVars.php
+++ b/library/Zend/View/Helper/DeclareVars.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Doctype.php b/library/Zend/View/Helper/Doctype.php
old mode 100755
new mode 100644
index f270756b9..814fcb186
--- a/library/Zend/View/Helper/Doctype.php
+++ b/library/Zend/View/Helper/Doctype.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/EscapeCss.php b/library/Zend/View/Helper/EscapeCss.php
old mode 100755
new mode 100644
index 133f73caf..86b5d6cb7
--- a/library/Zend/View/Helper/EscapeCss.php
+++ b/library/Zend/View/Helper/EscapeCss.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/EscapeHtml.php b/library/Zend/View/Helper/EscapeHtml.php
old mode 100755
new mode 100644
index 177ce6c08..9bcf1ecff
--- a/library/Zend/View/Helper/EscapeHtml.php
+++ b/library/Zend/View/Helper/EscapeHtml.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/EscapeHtmlAttr.php b/library/Zend/View/Helper/EscapeHtmlAttr.php
old mode 100755
new mode 100644
index 774f90b4b..5ed9fe512
--- a/library/Zend/View/Helper/EscapeHtmlAttr.php
+++ b/library/Zend/View/Helper/EscapeHtmlAttr.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/EscapeJs.php b/library/Zend/View/Helper/EscapeJs.php
old mode 100755
new mode 100644
index 806fab691..1ccc03983
--- a/library/Zend/View/Helper/EscapeJs.php
+++ b/library/Zend/View/Helper/EscapeJs.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/EscapeUrl.php b/library/Zend/View/Helper/EscapeUrl.php
old mode 100755
new mode 100644
index b8af34e9a..9b9ae0382
--- a/library/Zend/View/Helper/EscapeUrl.php
+++ b/library/Zend/View/Helper/EscapeUrl.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Escaper/AbstractHelper.php b/library/Zend/View/Helper/Escaper/AbstractHelper.php
old mode 100755
new mode 100644
index 373e7ea9b..7dc8aa718
--- a/library/Zend/View/Helper/Escaper/AbstractHelper.php
+++ b/library/Zend/View/Helper/Escaper/AbstractHelper.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -39,9 +39,11 @@ abstract class AbstractHelper extends Helper\AbstractHelper
      * Invoke this helper: escape a value
      *
      * @param  mixed $value
-     * @param  int   $recurse Expects one of the recursion constants; used to decide whether or not to recurse the given value when escaping
+     * @param  int   $recurse Expects one of the recursion constants;
+     *                        used to decide whether or not to recurse the given value when escaping
      * @throws Exception\InvalidArgumentException
-     * @return mixed Given a scalar, a scalar value is returned. Given an object, with the $recurse flag not allowing object recursion, returns a string. Otherwise, returns an array.
+     * @return mixed Given a scalar, a scalar value is returned. Given an object, with the $recurse flag not
+     *               allowing object recursion, returns a string. Otherwise, returns an array.
      */
     public function __invoke($value, $recurse = self::RECURSE_NONE)
     {
@@ -100,7 +102,7 @@ abstract class AbstractHelper extends Helper\AbstractHelper
         if (null !== $this->escaper) {
             throw new Exception\InvalidArgumentException(
                 'Character encoding settings cannot be changed once the Helper has been used or '
-                    . ' if a Zend\Escaper\Escaper object (with preset encoding option) is set.'
+                . ' if a Zend\Escaper\Escaper object (with preset encoding option) is set.'
             );
         }
 
diff --git a/library/Zend/View/Helper/FlashMessenger.php b/library/Zend/View/Helper/FlashMessenger.php
old mode 100755
new mode 100644
index 9c36a1fbd..102de9147
--- a/library/Zend/View/Helper/FlashMessenger.php
+++ b/library/Zend/View/Helper/FlashMessenger.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -126,8 +126,11 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
      * @param  array $classes
      * @return string
      */
-    protected function renderMessages($namespace = PluginFlashMessenger::NAMESPACE_DEFAULT, array $messages = array(), array $classes = array())
-    {
+    protected function renderMessages(
+        $namespace = PluginFlashMessenger::NAMESPACE_DEFAULT,
+        array $messages = array(),
+        array $classes = array()
+    ) {
         // Prepare classes for opening tag
         if (empty($classes)) {
             if (isset($this->classMessages[$namespace])) {
@@ -142,21 +145,27 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
         $messagesToPrint = array();
         $translator = $this->getTranslator();
         $translatorTextDomain = $this->getTranslatorTextDomain();
-        array_walk_recursive($messages, function ($item) use (&$messagesToPrint, $escapeHtml, $translator, $translatorTextDomain) {
-            if ($translator !== null) {
-                $item = $translator->translate(
-                    $item,
-                    $translatorTextDomain
-                );
+        array_walk_recursive(
+            $messages,
+            function ($item) use (&$messagesToPrint, $escapeHtml, $translator, $translatorTextDomain) {
+                if ($translator !== null) {
+                    $item = $translator->translate(
+                        $item,
+                        $translatorTextDomain
+                    );
+                }
+                $messagesToPrint[] = $escapeHtml($item);
             }
-            $messagesToPrint[] = $escapeHtml($item);
-        });
+        );
         if (empty($messagesToPrint)) {
             return '';
         }
         // Generate markup
         $markup  = sprintf($this->getMessageOpenFormat(), ' class="' . implode(' ', $classes) . '"');
-        $markup .= implode(sprintf($this->getMessageSeparatorString(), ' class="' . implode(' ', $classes) . '"'), $messagesToPrint);
+        $markup .= implode(
+            sprintf($this->getMessageSeparatorString(), ' class="' . implode(' ', $classes) . '"'),
+            $messagesToPrint
+        );
         $markup .= $this->getMessageCloseString();
         return $markup;
     }
diff --git a/library/Zend/View/Helper/Gravatar.php b/library/Zend/View/Helper/Gravatar.php
old mode 100755
new mode 100644
index a14c2941f..a748cf19f
--- a/library/Zend/View/Helper/Gravatar.php
+++ b/library/Zend/View/Helper/Gravatar.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/HeadLink.php b/library/Zend/View/Helper/HeadLink.php
old mode 100755
new mode 100644
index 853bdf83e..4e78dcbad
--- a/library/Zend/View/Helper/HeadLink.php
+++ b/library/Zend/View/Helper/HeadLink.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -33,9 +33,21 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
     /**
      * Allowed attributes
      *
-     * @var array
+     * @var string[]
      */
-    protected $itemKeys = array('charset', 'href', 'hreflang', 'id', 'media', 'rel', 'rev', 'type', 'title', 'extras');
+    protected $itemKeys = array(
+        'charset',
+        'href',
+        'hreflang',
+        'id',
+        'media',
+        'rel',
+        'rev',
+        'sizes',
+        'type',
+        'title',
+        'extras'
+    );
 
     /**
      * Registry key for placeholder
@@ -283,7 +295,11 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
                         $link .= sprintf(' %s="%s"', $key, ($this->autoEscape) ? $this->escape($value) : $value);
                     }
                 } else {
-                    $link .= sprintf(' %s="%s"', $itemKey, ($this->autoEscape) ? $this->escape($attributes[$itemKey]) : $attributes[$itemKey]);
+                    $link .= sprintf(
+                        ' %s="%s"',
+                        $itemKey,
+                        ($this->autoEscape) ? $this->escape($attributes[$itemKey]) : $attributes[$itemKey]
+                    );
                 }
             }
         }
@@ -298,7 +314,10 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
             return '';
         }
 
-        if (isset($attributes['conditionalStylesheet']) && !empty($attributes['conditionalStylesheet']) && is_string($attributes['conditionalStylesheet'])) {
+        if (isset($attributes['conditionalStylesheet'])
+            && !empty($attributes['conditionalStylesheet'])
+            && is_string($attributes['conditionalStylesheet'])
+        ) {
             // inner wrap with comment end and start if !IE
             if (str_replace(' ', '', $attributes['conditionalStylesheet']) === '!IE') {
                 $link = '<!-->' . $link . '<!--';
diff --git a/library/Zend/View/Helper/HeadMeta.php b/library/Zend/View/Helper/HeadMeta.php
old mode 100755
new mode 100644
index 66a0dff59..23560effd
--- a/library/Zend/View/Helper/HeadMeta.php
+++ b/library/Zend/View/Helper/HeadMeta.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -85,8 +85,13 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
      * @param  string $placement
      * @return HeadMeta
      */
-    public function __invoke($content = null, $keyValue = null, $keyType = 'name', $modifiers = array(), $placement = Placeholder\Container\AbstractContainer::APPEND)
-    {
+    public function __invoke(
+        $content = null,
+        $keyValue = null,
+        $keyType = 'name',
+        $modifiers = array(),
+        $placement = Placeholder\Container\AbstractContainer::APPEND
+    ) {
         if ((null !== $content) && (null !== $keyValue)) {
             $item   = $this->createData($keyType, $keyValue, $content, $modifiers);
             $action = strtolower($placement);
@@ -261,7 +266,10 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
             $modifiersString
         );
 
-        if (isset($item->modifiers['conditional']) && !empty($item->modifiers['conditional']) && is_string($item->modifiers['conditional'])) {
+        if (isset($item->modifiers['conditional'])
+            && !empty($item->modifiers['conditional'])
+            && is_string($item->modifiers['conditional'])
+        ) {
             // inner wrap with comment end and start if !IE
             if (str_replace(' ', '', $item->modifiers['conditional']) === '!IE') {
                 $meta = '<!-->' . $meta . '<!--';
diff --git a/library/Zend/View/Helper/HeadScript.php b/library/Zend/View/Helper/HeadScript.php
old mode 100755
new mode 100644
index eca0475d3..f250f3fc7
--- a/library/Zend/View/Helper/HeadScript.php
+++ b/library/Zend/View/Helper/HeadScript.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -83,7 +83,13 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
      *
      * @var array
      */
-    protected $optionalAttributes = array('charset', 'defer', 'language', 'src');
+    protected $optionalAttributes = array(
+        'charset',
+        'crossorigin',
+        'defer',
+        'language',
+        'src',
+    );
 
     /**
      * Required attributes for script tag
@@ -125,8 +131,13 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
      * @param  string $type      Script type and/or array of script attributes
      * @return HeadScript
      */
-    public function __invoke($mode = self::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
-    {
+    public function __invoke(
+        $mode = self::FILE,
+        $spec = null,
+        $placement = 'APPEND',
+        array $attrs = array(),
+        $type = 'text/javascript'
+    ) {
         if ((null !== $spec) && is_string($spec)) {
             $action    = ucfirst(strtolower($mode));
             $placement = strtolower($placement);
@@ -260,8 +271,11 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
      * @throws Exception\RuntimeException
      * @return void
      */
-    public function captureStart($captureType = Placeholder\Container\AbstractContainer::APPEND, $type = 'text/javascript', $attrs = array())
-    {
+    public function captureStart(
+        $captureType = Placeholder\Container\AbstractContainer::APPEND,
+        $type = 'text/javascript',
+        $attrs = array()
+    ) {
         if ($this->captureLock) {
             throw new Exception\RuntimeException('Cannot nest headScript captures');
         }
@@ -328,7 +342,10 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
     protected function isDuplicate($file)
     {
         foreach ($this->getContainer() as $item) {
-            if (($item->source === null) && array_key_exists('src', $item->attributes) && ($file == $item->attributes['src'])) {
+            if (($item->source === null)
+                && array_key_exists('src', $item->attributes)
+                && ($file == $item->attributes['src'])
+            ) {
                 return true;
             }
         }
@@ -344,7 +361,11 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
      */
     protected function isValid($value)
     {
-        if ((!$value instanceof stdClass) || !isset($value->type) || (!isset($value->source) && !isset($value->attributes))) {
+        if ((!$value instanceof stdClass)
+            || !isset($value->type)
+            || (!isset($value->source)
+                && !isset($value->attributes))
+        ) {
             return false;
         }
 
@@ -376,10 +397,11 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
             }
         }
 
-        $addScriptEscape = !(isset($item->attributes['noescape']) && filter_var($item->attributes['noescape'], FILTER_VALIDATE_BOOLEAN));
+        $addScriptEscape = !(isset($item->attributes['noescape'])
+            && filter_var($item->attributes['noescape'], FILTER_VALIDATE_BOOLEAN));
 
         $type = ($this->autoEscape) ? $this->escape($item->type) : $item->type;
-        $html  = '<script type="' . $type . '"' . $attrString . '>';
+        $html = '<script type="' . $type . '"' . $attrString . '>';
         if (!empty($item->source)) {
             $html .= PHP_EOL;
 
@@ -397,7 +419,10 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
         }
         $html .= '</script>';
 
-        if (isset($item->attributes['conditional']) && !empty($item->attributes['conditional']) && is_string($item->attributes['conditional'])) {
+        if (isset($item->attributes['conditional'])
+            && !empty($item->attributes['conditional'])
+            && is_string($item->attributes['conditional'])
+        ) {
             // inner wrap with comment end and start if !IE
             if (str_replace(' ', '', $item->attributes['conditional']) === '!IE') {
                 $html = '<!-->' . $html . '<!--';
@@ -421,7 +446,8 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
     {
         if (!$this->isValid($value)) {
             throw new Exception\InvalidArgumentException(
-                'Invalid argument passed to append(); please use one of the helper methods, appendScript() or appendFile()'
+                'Invalid argument passed to append(); '
+                . 'please use one of the helper methods, appendScript() or appendFile()'
             );
         }
 
@@ -439,7 +465,8 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
     {
         if (!$this->isValid($value)) {
             throw new Exception\InvalidArgumentException(
-                'Invalid argument passed to prepend(); please use one of the helper methods, prependScript() or prependFile()'
+                'Invalid argument passed to prepend(); '
+                . 'please use one of the helper methods, prependScript() or prependFile()'
             );
         }
 
@@ -476,7 +503,8 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
     {
         if (!$this->isValid($value)) {
             throw new Exception\InvalidArgumentException(
-                'Invalid argument passed to offsetSet(); please use one of the helper methods, offsetSetScript() or offsetSetFile()'
+                'Invalid argument passed to offsetSet(); '
+                . 'please use one of the helper methods, offsetSetScript() or offsetSetFile()'
             );
         }
 
diff --git a/library/Zend/View/Helper/HeadStyle.php b/library/Zend/View/Helper/HeadStyle.php
old mode 100755
new mode 100644
index c6cce3a70..6e90d4a63
--- a/library/Zend/View/Helper/HeadStyle.php
+++ b/library/Zend/View/Helper/HeadStyle.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/HeadTitle.php b/library/Zend/View/Helper/HeadTitle.php
old mode 100755
new mode 100644
index 2ea8d78dd..dfcf17a84
--- a/library/Zend/View/Helper/HeadTitle.php
+++ b/library/Zend/View/Helper/HeadTitle.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/HelperInterface.php b/library/Zend/View/Helper/HelperInterface.php
old mode 100755
new mode 100644
index 2d58c01f9..a3deba701
--- a/library/Zend/View/Helper/HelperInterface.php
+++ b/library/Zend/View/Helper/HelperInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/HtmlFlash.php b/library/Zend/View/Helper/HtmlFlash.php
old mode 100755
new mode 100644
index 7b0aafca3..dc948d105
--- a/library/Zend/View/Helper/HtmlFlash.php
+++ b/library/Zend/View/Helper/HtmlFlash.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/HtmlList.php b/library/Zend/View/Helper/HtmlList.php
old mode 100755
new mode 100644
index 29c79c73c..318e6c072
--- a/library/Zend/View/Helper/HtmlList.php
+++ b/library/Zend/View/Helper/HtmlList.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/HtmlObject.php b/library/Zend/View/Helper/HtmlObject.php
old mode 100755
new mode 100644
index 17c2822f3..ea4d2dcdf
--- a/library/Zend/View/Helper/HtmlObject.php
+++ b/library/Zend/View/Helper/HtmlObject.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -24,10 +24,18 @@ class HtmlObject extends AbstractHtmlElement
      * @throws InvalidArgumentException
      * @return string
      */
-    public function __invoke($data = null, $type = null, array $attribs = array(), array $params = array(), $content = null)
-    {
+    public function __invoke(
+        $data = null,
+        $type = null,
+        array $attribs = array(),
+        array $params = array(),
+        $content = null
+    ) {
         if ($data == null || $type == null) {
-            throw new InvalidArgumentException('HTMLObject: missing argument. $data and $type are required in htmlObject($data, $type, array $attribs = array(), array $params = array(), $content = null)');
+            throw new InvalidArgumentException(
+                'HTMLObject: missing argument. $data and $type are required in '
+                . 'htmlObject($data, $type, array $attribs = array(), array $params = array(), $content = null)'
+            );
         }
 
         // Merge data and type
diff --git a/library/Zend/View/Helper/HtmlPage.php b/library/Zend/View/Helper/HtmlPage.php
old mode 100755
new mode 100644
index ee170c1b0..356132ed5
--- a/library/Zend/View/Helper/HtmlPage.php
+++ b/library/Zend/View/Helper/HtmlPage.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/HtmlQuicktime.php b/library/Zend/View/Helper/HtmlQuicktime.php
old mode 100755
new mode 100644
index 629d6efa3..cecda28bc
--- a/library/Zend/View/Helper/HtmlQuicktime.php
+++ b/library/Zend/View/Helper/HtmlQuicktime.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Identity.php b/library/Zend/View/Helper/Identity.php
old mode 100755
new mode 100644
index 4fe145373..e36863aad
--- a/library/Zend/View/Helper/Identity.php
+++ b/library/Zend/View/Helper/Identity.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/InlineScript.php b/library/Zend/View/Helper/InlineScript.php
old mode 100755
new mode 100644
index 57dace7d6..537d04c1e
--- a/library/Zend/View/Helper/InlineScript.php
+++ b/library/Zend/View/Helper/InlineScript.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -35,8 +35,13 @@ class InlineScript extends HeadScript
      * @param  string $type      Script type and/or array of script attributes
      * @return InlineScript
      */
-    public function __invoke($mode = self::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
-    {
+    public function __invoke(
+        $mode = self::FILE,
+        $spec = null,
+        $placement = 'APPEND',
+        array $attrs = array(),
+        $type = 'text/javascript'
+    ) {
         return parent::__invoke($mode, $spec, $placement, $attrs, $type);
     }
 }
diff --git a/library/Zend/View/Helper/Json.php b/library/Zend/View/Helper/Json.php
old mode 100755
new mode 100644
index 8e42fa8cf..e30aa59bd
--- a/library/Zend/View/Helper/Json.php
+++ b/library/Zend/View/Helper/Json.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Layout.php b/library/Zend/View/Helper/Layout.php
old mode 100755
new mode 100644
index 65b630fb2..6554b1693
--- a/library/Zend/View/Helper/Layout.php
+++ b/library/Zend/View/Helper/Layout.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Navigation.php b/library/Zend/View/Helper/Navigation.php
old mode 100755
new mode 100644
index 015a5ec02..f455ef378
--- a/library/Zend/View/Helper/Navigation.php
+++ b/library/Zend/View/Helper/Navigation.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Navigation/AbstractHelper.php b/library/Zend/View/Helper/Navigation/AbstractHelper.php
old mode 100755
new mode 100644
index 1b997683f..87b603207
--- a/library/Zend/View/Helper/Navigation/AbstractHelper.php
+++ b/library/Zend/View/Helper/Navigation/AbstractHelper.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -147,7 +147,8 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
     {
         return call_user_func_array(
             array($this->getContainer(), $method),
-            $arguments);
+            $arguments
+        );
     }
 
     /**
@@ -283,8 +284,8 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
 
         if (!$container instanceof Navigation\AbstractContainer) {
             throw new  Exception\InvalidArgumentException(
-                'Container must be a string alias or an instance of ' .
-                    'Zend\Navigation\AbstractContainer'
+                'Container must be a string alias or an instance of '
+                . 'Zend\Navigation\AbstractContainer'
             );
         }
     }
@@ -706,7 +707,7 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
         } else {
             throw new Exception\InvalidArgumentException(sprintf(
                 '$role must be a string, null, or an instance of '
-                    .  'Zend\Permissions\Role\RoleInterface; %s given',
+                . 'Zend\Permissions\Role\RoleInterface; %s given',
                 (is_object($role) ? get_class($role) : gettype($role))
             ));
         }
diff --git a/library/Zend/View/Helper/Navigation/Breadcrumbs.php b/library/Zend/View/Helper/Navigation/Breadcrumbs.php
old mode 100755
new mode 100644
index 5337ca8e0..1dc1b47b8
--- a/library/Zend/View/Helper/Navigation/Breadcrumbs.php
+++ b/library/Zend/View/Helper/Navigation/Breadcrumbs.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Navigation/HelperInterface.php b/library/Zend/View/Helper/Navigation/HelperInterface.php
old mode 100755
new mode 100644
index 8b52c8c1d..8e46157dd
--- a/library/Zend/View/Helper/Navigation/HelperInterface.php
+++ b/library/Zend/View/Helper/Navigation/HelperInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Navigation/Links.php b/library/Zend/View/Helper/Navigation/Links.php
old mode 100755
new mode 100644
index a5be2a6f7..656acd8bd
--- a/library/Zend/View/Helper/Navigation/Links.php
+++ b/library/Zend/View/Helper/Navigation/Links.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -125,9 +125,7 @@ class Links extends AbstractHelper
         $result = preg_match('/find(Rel|Rev)(.+)/', $method, $match);
         ErrorHandler::stop();
         if ($result) {
-            return $this->findRelation($arguments[0],
-                                       strtolower($match[1]),
-                                       strtolower($match[2]));
+            return $this->findRelation($arguments[0], strtolower($match[1]), strtolower($match[2]));
         }
 
         return parent::__call($method, $arguments);
@@ -409,8 +407,7 @@ class Links extends AbstractHelper
     {
         $found = null;
         $break = false;
-        $iterator = new RecursiveIteratorIterator($this->findRoot($page),
-                RecursiveIteratorIterator::SELF_FIRST);
+        $iterator = new RecursiveIteratorIterator($this->findRoot($page), RecursiveIteratorIterator::SELF_FIRST);
         foreach ($iterator as $intermediate) {
             if ($intermediate === $page) {
                 // current page; break at next accepted page
@@ -443,8 +440,9 @@ class Links extends AbstractHelper
         $found = null;
         $prev = null;
         $iterator = new RecursiveIteratorIterator(
-                $this->findRoot($page),
-                RecursiveIteratorIterator::SELF_FIRST);
+            $this->findRoot($page),
+            RecursiveIteratorIterator::SELF_FIRST
+        );
         foreach ($iterator as $intermediate) {
             if (!$this->accept($intermediate)) {
                 continue;
diff --git a/library/Zend/View/Helper/Navigation/Listener/AclListener.php b/library/Zend/View/Helper/Navigation/Listener/AclListener.php
old mode 100755
new mode 100644
index 5c8656084..95c853092
--- a/library/Zend/View/Helper/Navigation/Listener/AclListener.php
+++ b/library/Zend/View/Helper/Navigation/Listener/AclListener.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Navigation/Menu.php b/library/Zend/View/Helper/Navigation/Menu.php
old mode 100755
new mode 100644
index 29d719923..7951c9b3d
--- a/library/Zend/View/Helper/Navigation/Menu.php
+++ b/library/Zend/View/Helper/Navigation/Menu.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -209,7 +209,8 @@ class Menu extends AbstractHelper
         $options = $this->normalizeOptions($options);
 
         if ($options['onlyActiveBranch'] && !$options['renderParents']) {
-            $html = $this->renderDeepestMenu($container,
+            $html = $this->renderDeepestMenu(
+                $container,
                 $options['ulClass'],
                 $options['indent'],
                 $options['minDepth'],
@@ -219,7 +220,8 @@ class Menu extends AbstractHelper
                 $options['liActiveClass']
             );
         } else {
-            $html = $this->renderNormalMenu($container,
+            $html = $this->renderNormalMenu(
+                $container,
                 $options['ulClass'],
                 $options['indent'],
                 $options['minDepth'],
@@ -274,8 +276,10 @@ class Menu extends AbstractHelper
         }
 
         // create iterator
-        $iterator = new RecursiveIteratorIterator($container,
-            RecursiveIteratorIterator::SELF_FIRST);
+        $iterator = new RecursiveIteratorIterator(
+            $container,
+            RecursiveIteratorIterator::SELF_FIRST
+        );
         if (is_int($maxDepth)) {
             $iterator->setMaxDepth($maxDepth);
         }
@@ -418,8 +422,8 @@ class Menu extends AbstractHelper
             if (count($partial) != 2) {
                 throw new Exception\InvalidArgumentException(
                     'Unable to render menu: A view partial supplied as '
-                        .  'an array must contain two values: partial view '
-                        .  'script and module where script can be found'
+                    .  'an array must contain two values: partial view '
+                    .  'script and module where script can be found'
                 );
             }
 
diff --git a/library/Zend/View/Helper/Navigation/PluginManager.php b/library/Zend/View/Helper/Navigation/PluginManager.php
old mode 100755
new mode 100644
index 8faf86eb3..dc0bc01ee
--- a/library/Zend/View/Helper/Navigation/PluginManager.php
+++ b/library/Zend/View/Helper/Navigation/PluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Navigation/Sitemap.php b/library/Zend/View/Helper/Navigation/Sitemap.php
old mode 100755
new mode 100644
index 2ba2b4a4b..99d1f4300
--- a/library/Zend/View/Helper/Navigation/Sitemap.php
+++ b/library/Zend/View/Helper/Navigation/Sitemap.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -158,8 +158,7 @@ class Sitemap extends AbstractHelper
         $dom->appendChild($urlSet);
 
         // create iterator
-        $iterator = new RecursiveIteratorIterator($container,
-            RecursiveIteratorIterator::SELF_FIRST);
+        $iterator = new RecursiveIteratorIterator($container, RecursiveIteratorIterator::SELF_FIRST);
 
         $maxDepth = $this->getMaxDepth();
         if (is_int($maxDepth)) {
@@ -198,8 +197,7 @@ class Sitemap extends AbstractHelper
             }
 
             // put url in 'loc' element
-            $urlNode->appendChild($dom->createElementNS(self::SITEMAP_NS,
-                'loc', $url));
+            $urlNode->appendChild($dom->createElementNS(self::SITEMAP_NS, 'loc', $url));
 
             // add 'lastmod' element if a valid lastmod is set in page
             if (isset($page->lastmod)) {
@@ -213,8 +211,7 @@ class Sitemap extends AbstractHelper
                 if (!$this->getUseSitemapValidators() ||
                     $lastmodValidator->isValid($lastmod)) {
                     $urlNode->appendChild(
-                        $dom->createElementNS(self::SITEMAP_NS, 'lastmod',
-                            $lastmod)
+                        $dom->createElementNS(self::SITEMAP_NS, 'lastmod', $lastmod)
                     );
                 }
             }
@@ -225,8 +222,7 @@ class Sitemap extends AbstractHelper
                 if (!$this->getUseSitemapValidators() ||
                     $changefreqValidator->isValid($changefreq)) {
                     $urlNode->appendChild(
-                        $dom->createElementNS(self::SITEMAP_NS, 'changefreq',
-                            $changefreq)
+                        $dom->createElementNS(self::SITEMAP_NS, 'changefreq', $changefreq)
                     );
                 }
             }
diff --git a/library/Zend/View/Helper/PaginationControl.php b/library/Zend/View/Helper/PaginationControl.php
old mode 100755
new mode 100644
index 9963fdd35..65403983a
--- a/library/Zend/View/Helper/PaginationControl.php
+++ b/library/Zend/View/Helper/PaginationControl.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -42,10 +42,17 @@ class PaginationControl extends AbstractHelper
      * @throws Exception\InvalidArgumentException if partial is invalid array
      * @return string
      */
-    public function __invoke(Paginator\Paginator $paginator = null, $scrollingStyle = null, $partial = null, $params = null)
-    {
+    public function __invoke(
+        Paginator\Paginator $paginator = null,
+        $scrollingStyle = null,
+        $partial = null,
+        $params = null
+    ) {
         if ($paginator === null) {
-            if (isset($this->view->paginator) and $this->view->paginator !== null and $this->view->paginator instanceof Paginator\Paginator) {
+            if (isset($this->view->paginator)
+                && $this->view->paginator !== null
+                && $this->view->paginator instanceof Paginator\Paginator
+            ) {
                 $paginator = $this->view->paginator;
             } else {
                 throw new Exception\RuntimeException('No paginator instance provided or incorrect type');
diff --git a/library/Zend/View/Helper/Partial.php b/library/Zend/View/Helper/Partial.php
old mode 100755
new mode 100644
index 444f161b9..68ffe677c
--- a/library/Zend/View/Helper/Partial.php
+++ b/library/Zend/View/Helper/Partial.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -64,8 +64,9 @@ class Partial extends AbstractHelper
     /**
      * Set object key
      *
-     * @param  string $key
-     * @return Partial
+     * @param string|null $key
+     *
+     * @return self
      */
     public function setObjectKey($key)
     {
diff --git a/library/Zend/View/Helper/PartialLoop.php b/library/Zend/View/Helper/PartialLoop.php
old mode 100755
new mode 100644
index f66297e67..96a9d3801
--- a/library/Zend/View/Helper/PartialLoop.php
+++ b/library/Zend/View/Helper/PartialLoop.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -26,6 +26,22 @@ class PartialLoop extends Partial
      */
     protected $partialCounter = 0;
 
+    /**
+     * The current nesting level
+     *
+     * @var int
+     */
+    private $nestingLevel = 0;
+
+    /**
+     * Stack with object keys for each nested level
+     *
+     * @var array indexed by nesting level
+     */
+    private $objectKeyStack = array(
+        0 => null,
+    );
+
     /**
      * Renders a template fragment within a variable scope distinct from the
      * calling View object.
@@ -43,23 +59,17 @@ class PartialLoop extends Partial
             return $this;
         }
 
-        if (!is_array($values)) {
-            if ($values instanceof Traversable) {
-                $values = ArrayUtils::iteratorToArray($values, false);
-            } elseif (is_object($values) && method_exists($values, 'toArray')) {
-                $values = $values->toArray();
-            } else {
-                throw new Exception\InvalidArgumentException('PartialLoop helper requires iterable data');
-            }
-        }
-
         // reset the counter if it's called again
         $this->partialCounter = 0;
         $content = '';
 
-        foreach ($values as $item) {
+        foreach ($this->extractViewVariables($values) as $item) {
+            $this->nestObjectKey();
+
             $this->partialCounter++;
             $content .= parent::__invoke($name, $item);
+
+            $this->unNestObjectKey();
         }
 
         return $content;
@@ -74,4 +84,78 @@ class PartialLoop extends Partial
     {
         return $this->partialCounter;
     }
+
+    /**
+     * Set object key in this loop and any child loop
+     *
+     * {@inheritDoc}
+     *
+     * @param string|null $key
+     *
+     * @return self
+     */
+    public function setObjectKey($key)
+    {
+        if (null === $key) {
+            unset($this->objectKeyStack[$this->nestingLevel]);
+        } else {
+            $this->objectKeyStack[$this->nestingLevel] = (string) $key;
+        }
+
+        return parent::setObjectKey($key);
+    }
+
+    /**
+     * Increment nestedLevel and default objectKey to parent's value
+     *
+     * @return self
+     */
+    private function nestObjectKey()
+    {
+        $this->nestingLevel += 1;
+
+        $this->setObjectKey($this->getObjectKey());
+
+        return $this;
+    }
+
+    /**
+     * Decrement nestedLevel and restore objectKey to parent's value
+     *
+     * @return self
+     */
+    private function unNestObjectKey()
+    {
+        $this->setObjectKey(null);
+
+        $this->nestingLevel -= 1;
+        $this->objectKey = $this->objectKeyStack[$this->nestingLevel];
+
+        return $this;
+    }
+
+    /**
+     * @param mixed $values
+     *
+     * @return array Variables to populate in the view
+     */
+    private function extractViewVariables($values)
+    {
+        if ($values instanceof Traversable) {
+            return ArrayUtils::iteratorToArray($values, false);
+        }
+
+        if (is_array($values)) {
+            return $values;
+        }
+
+        if (is_object($values) && method_exists($values, 'toArray')) {
+            return $values->toArray();
+        }
+
+        throw new Exception\InvalidArgumentException(sprintf(
+            'PartialLoop helper requires iterable data, %s given',
+            is_object($values) ? get_class($values) : gettype($values)
+        ));
+    }
 }
diff --git a/library/Zend/View/Helper/Placeholder.php b/library/Zend/View/Helper/Placeholder.php
old mode 100755
new mode 100644
index 297c17a55..8fda0a88a
--- a/library/Zend/View/Helper/Placeholder.php
+++ b/library/Zend/View/Helper/Placeholder.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -43,7 +43,9 @@ class Placeholder extends AbstractHelper
     public function __invoke($name = null)
     {
         if ($name == null) {
-            throw new InvalidArgumentException('Placeholder: missing argument.  $name is required by placeholder($name)');
+            throw new InvalidArgumentException(
+                'Placeholder: missing argument. $name is required by placeholder($name)'
+            );
         }
 
         $name = (string) $name;
diff --git a/library/Zend/View/Helper/Placeholder/Container.php b/library/Zend/View/Helper/Placeholder/Container.php
old mode 100755
new mode 100644
index 35220176c..07619819b
--- a/library/Zend/View/Helper/Placeholder/Container.php
+++ b/library/Zend/View/Helper/Placeholder/Container.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php b/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
old mode 100755
new mode 100644
index 86d5c6689..aec2f7d0f
--- a/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
+++ b/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php b/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
old mode 100755
new mode 100644
index 619ba7073..8c99c95e5
--- a/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
+++ b/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Placeholder/Registry.php b/library/Zend/View/Helper/Placeholder/Registry.php
old mode 100755
new mode 100644
index f86b4e1ad..3eb6f2514
--- a/library/Zend/View/Helper/Placeholder/Registry.php
+++ b/library/Zend/View/Helper/Placeholder/Registry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/RenderChildModel.php b/library/Zend/View/Helper/RenderChildModel.php
old mode 100755
new mode 100644
index d59edfe05..ee6e5ba31
--- a/library/Zend/View/Helper/RenderChildModel.php
+++ b/library/Zend/View/Helper/RenderChildModel.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/RenderToPlaceholder.php b/library/Zend/View/Helper/RenderToPlaceholder.php
old mode 100755
new mode 100644
index 3707995b3..cab6c33fc
--- a/library/Zend/View/Helper/RenderToPlaceholder.php
+++ b/library/Zend/View/Helper/RenderToPlaceholder.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/ServerUrl.php b/library/Zend/View/Helper/ServerUrl.php
old mode 100755
new mode 100644
index ae846a9ba..2cd80efdb
--- a/library/Zend/View/Helper/ServerUrl.php
+++ b/library/Zend/View/Helper/ServerUrl.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Service/FlashMessengerFactory.php b/library/Zend/View/Helper/Service/FlashMessengerFactory.php
old mode 100755
new mode 100644
index fbaf53e8b..ba69c4480
--- a/library/Zend/View/Helper/Service/FlashMessengerFactory.php
+++ b/library/Zend/View/Helper/Service/FlashMessengerFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Service/IdentityFactory.php b/library/Zend/View/Helper/Service/IdentityFactory.php
old mode 100755
new mode 100644
index a065a1d9d..180e37b69
--- a/library/Zend/View/Helper/Service/IdentityFactory.php
+++ b/library/Zend/View/Helper/Service/IdentityFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/Url.php b/library/Zend/View/Helper/Url.php
old mode 100755
new mode 100644
index 9b2af7e97..e5a71e951
--- a/library/Zend/View/Helper/Url.php
+++ b/library/Zend/View/Helper/Url.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Helper/ViewModel.php b/library/Zend/View/Helper/ViewModel.php
old mode 100755
new mode 100644
index 49b130649..4cf266072
--- a/library/Zend/View/Helper/ViewModel.php
+++ b/library/Zend/View/Helper/ViewModel.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/HelperPluginManager.php b/library/Zend/View/HelperPluginManager.php
old mode 100755
new mode 100644
index d2ddc6904..4c67a967c
--- a/library/Zend/View/HelperPluginManager.php
+++ b/library/Zend/View/HelperPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Model/ClearableModelInterface.php b/library/Zend/View/Model/ClearableModelInterface.php
old mode 100755
new mode 100644
index 2edfe719e..b72b848a9
--- a/library/Zend/View/Model/ClearableModelInterface.php
+++ b/library/Zend/View/Model/ClearableModelInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Model/ConsoleModel.php b/library/Zend/View/Model/ConsoleModel.php
old mode 100755
new mode 100644
index 5aa373397..fc446b1e7
--- a/library/Zend/View/Model/ConsoleModel.php
+++ b/library/Zend/View/Model/ConsoleModel.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Model/FeedModel.php b/library/Zend/View/Model/FeedModel.php
old mode 100755
new mode 100644
index fc8351cd0..3226e3b8f
--- a/library/Zend/View/Model/FeedModel.php
+++ b/library/Zend/View/Model/FeedModel.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Model/JsonModel.php b/library/Zend/View/Model/JsonModel.php
old mode 100755
new mode 100644
index 191d3f5ec..b16fcd533
--- a/library/Zend/View/Model/JsonModel.php
+++ b/library/Zend/View/Model/JsonModel.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Model/ModelInterface.php b/library/Zend/View/Model/ModelInterface.php
old mode 100755
new mode 100644
index 810540d70..fa409677d
--- a/library/Zend/View/Model/ModelInterface.php
+++ b/library/Zend/View/Model/ModelInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Model/RetrievableChildrenInterface.php b/library/Zend/View/Model/RetrievableChildrenInterface.php
old mode 100755
new mode 100644
index fadd06daf..55f72c869
--- a/library/Zend/View/Model/RetrievableChildrenInterface.php
+++ b/library/Zend/View/Model/RetrievableChildrenInterface.php
@@ -4,7 +4,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 namespace Zend\View\Model;
diff --git a/library/Zend/View/Model/ViewModel.php b/library/Zend/View/Model/ViewModel.php
old mode 100755
new mode 100644
index f6d4e1c3a..9179e5d10
--- a/library/Zend/View/Model/ViewModel.php
+++ b/library/Zend/View/Model/ViewModel.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/README.md b/library/Zend/View/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/View/Renderer/ConsoleRenderer.php b/library/Zend/View/Renderer/ConsoleRenderer.php
old mode 100755
new mode 100644
index 5f0cf10b2..c54da407d
--- a/library/Zend/View/Renderer/ConsoleRenderer.php
+++ b/library/Zend/View/Renderer/ConsoleRenderer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Renderer/FeedRenderer.php b/library/Zend/View/Renderer/FeedRenderer.php
old mode 100755
new mode 100644
index b91964683..444b8b786
--- a/library/Zend/View/Renderer/FeedRenderer.php
+++ b/library/Zend/View/Renderer/FeedRenderer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Renderer/JsonRenderer.php b/library/Zend/View/Renderer/JsonRenderer.php
old mode 100755
new mode 100644
index 9666261db..edc8f84f4
--- a/library/Zend/View/Renderer/JsonRenderer.php
+++ b/library/Zend/View/Renderer/JsonRenderer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Renderer/PhpRenderer.php b/library/Zend/View/Renderer/PhpRenderer.php
old mode 100755
new mode 100644
index 87baf3d98..7d6e9d7e0
--- a/library/Zend/View/Renderer/PhpRenderer.php
+++ b/library/Zend/View/Renderer/PhpRenderer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Renderer/RendererInterface.php b/library/Zend/View/Renderer/RendererInterface.php
old mode 100755
new mode 100644
index d3dfa77f7..70228c938
--- a/library/Zend/View/Renderer/RendererInterface.php
+++ b/library/Zend/View/Renderer/RendererInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Renderer/TreeRendererInterface.php b/library/Zend/View/Renderer/TreeRendererInterface.php
old mode 100755
new mode 100644
index ead6ffcb0..c2f18f3d9
--- a/library/Zend/View/Renderer/TreeRendererInterface.php
+++ b/library/Zend/View/Renderer/TreeRendererInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Resolver/AggregateResolver.php b/library/Zend/View/Resolver/AggregateResolver.php
old mode 100755
new mode 100644
index f918cbac1..7163b9dde
--- a/library/Zend/View/Resolver/AggregateResolver.php
+++ b/library/Zend/View/Resolver/AggregateResolver.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Resolver/ResolverInterface.php b/library/Zend/View/Resolver/ResolverInterface.php
old mode 100755
new mode 100644
index 8ffe130c6..d3d8270e1
--- a/library/Zend/View/Resolver/ResolverInterface.php
+++ b/library/Zend/View/Resolver/ResolverInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Resolver/TemplateMapResolver.php b/library/Zend/View/Resolver/TemplateMapResolver.php
old mode 100755
new mode 100644
index 61d9ab7a1..51cb9b9b0
--- a/library/Zend/View/Resolver/TemplateMapResolver.php
+++ b/library/Zend/View/Resolver/TemplateMapResolver.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Resolver/TemplatePathStack.php b/library/Zend/View/Resolver/TemplatePathStack.php
old mode 100755
new mode 100644
index 359be18f3..6a5405a80
--- a/library/Zend/View/Resolver/TemplatePathStack.php
+++ b/library/Zend/View/Resolver/TemplatePathStack.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Strategy/FeedStrategy.php b/library/Zend/View/Strategy/FeedStrategy.php
old mode 100755
new mode 100644
index 40140da5a..aec779ea8
--- a/library/Zend/View/Strategy/FeedStrategy.php
+++ b/library/Zend/View/Strategy/FeedStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Strategy/JsonStrategy.php b/library/Zend/View/Strategy/JsonStrategy.php
old mode 100755
new mode 100644
index 7cf4b91f0..1a3406b9e
--- a/library/Zend/View/Strategy/JsonStrategy.php
+++ b/library/Zend/View/Strategy/JsonStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Strategy/PhpRendererStrategy.php b/library/Zend/View/Strategy/PhpRendererStrategy.php
old mode 100755
new mode 100644
index e8e04ceb3..cf41e630d
--- a/library/Zend/View/Strategy/PhpRendererStrategy.php
+++ b/library/Zend/View/Strategy/PhpRendererStrategy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Stream.php b/library/Zend/View/Stream.php
old mode 100755
new mode 100644
index 42bb7a962..b4994f2dc
--- a/library/Zend/View/Stream.php
+++ b/library/Zend/View/Stream.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/Variables.php b/library/Zend/View/Variables.php
old mode 100755
new mode 100644
index 17b14724c..d889b3dda
--- a/library/Zend/View/Variables.php
+++ b/library/Zend/View/Variables.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -134,7 +134,8 @@ class Variables extends ArrayObject
         if (!$this->offsetExists($key)) {
             if ($this->isStrict()) {
                 trigger_error(sprintf(
-                    'View variable "%s" does not exist', $key
+                    'View variable "%s" does not exist',
+                    $key
                 ), E_USER_NOTICE);
             }
             return null;
diff --git a/library/Zend/View/View.php b/library/Zend/View/View.php
old mode 100755
new mode 100644
index aebae58a0..242adea99
--- a/library/Zend/View/View.php
+++ b/library/Zend/View/View.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/ViewEvent.php b/library/Zend/View/ViewEvent.php
old mode 100755
new mode 100644
index 34baa2136..84a7a3774
--- a/library/Zend/View/ViewEvent.php
+++ b/library/Zend/View/ViewEvent.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/View/composer.json b/library/Zend/View/composer.json
old mode 100755
new mode 100644
diff --git a/library/Zend/XmlRpc/AbstractValue.php b/library/Zend/XmlRpc/AbstractValue.php
old mode 100755
new mode 100644
index 221238a09..bc01223ed
--- a/library/Zend/XmlRpc/AbstractValue.php
+++ b/library/Zend/XmlRpc/AbstractValue.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -371,7 +371,11 @@ abstract class AbstractValue
                 }
 
                 if (null === $data) {
-                    throw new Exception\ValueException('Invalid XML for XML-RPC native '. self::XMLRPC_TYPE_ARRAY .' type: ARRAY tag must contain DATA tag');
+                    throw new Exception\ValueException(
+                        'Invalid XML for XML-RPC native '
+                        . self::XMLRPC_TYPE_ARRAY
+                        . ' type: ARRAY tag must contain DATA tag'
+                    );
                 }
                 $values = array();
                 // Parse all the elements of the array from the XML string
@@ -397,7 +401,9 @@ abstract class AbstractValue
                 $xmlrpcValue = new Value\Struct($values);
                 break;
             default:
-                throw new Exception\ValueException('Value type \''. $type .'\' parsed from the XML string is not a known XML-RPC native type');
+                throw new Exception\ValueException(
+                    'Value type \'' . $type . '\' parsed from the XML string is not a known XML-RPC native type'
+                );
                 break;
         }
         $xmlrpcValue->_setXML($xml->asXML());
@@ -415,7 +421,11 @@ abstract class AbstractValue
             $xml = new \SimpleXMLElement($xml);
         } catch (\Exception $e) {
             // The given string is not a valid XML
-            throw new Exception\ValueException('Failed to create XML-RPC value from XML string: ' . $e->getMessage(), $e->getCode(), $e);
+            throw new Exception\ValueException(
+                'Failed to create XML-RPC value from XML string: ' . $e->getMessage(),
+                $e->getCode(),
+                $e
+            );
         }
     }
 
diff --git a/library/Zend/XmlRpc/CONTRIBUTING.md b/library/Zend/XmlRpc/CONTRIBUTING.md
old mode 100755
new mode 100644
diff --git a/library/Zend/XmlRpc/Client.php b/library/Zend/XmlRpc/Client.php
old mode 100755
new mode 100644
index 504a3bf23..4dd260f6c
--- a/library/Zend/XmlRpc/Client.php
+++ b/library/Zend/XmlRpc/Client.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
@@ -126,7 +126,7 @@ class Client implements ServerClient
     }
 
 
-   /**
+    /**
      * The request of the last method call
      *
      * @return \Zend\XmlRpc\Request
@@ -251,7 +251,7 @@ class Client implements ServerClient
      * @return mixed
      * @throws \Zend\XmlRpc\Client\Exception\FaultException
      */
-    public function call($method, $params=array())
+    public function call($method, $params = array())
     {
         if (!$this->skipSystemLookup() && ('system.' != substr($method, 0, 7))) {
             // Ensure empty array/struct params are cast correctly
@@ -323,7 +323,7 @@ class Client implements ServerClient
             throw new Client\Exception\FaultException(
                 $fault->getMessage(),
                 $fault->getCode()
-                );
+            );
         }
 
         return $this->lastResponse->getReturnValue();
diff --git a/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php b/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 03c09959c..9279478f9
--- a/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
+++ b/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Client/Exception/FaultException.php b/library/Zend/XmlRpc/Client/Exception/FaultException.php
old mode 100755
new mode 100644
index 7f07e03f6..f8fc603e6
--- a/library/Zend/XmlRpc/Client/Exception/FaultException.php
+++ b/library/Zend/XmlRpc/Client/Exception/FaultException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Client/Exception/HttpException.php b/library/Zend/XmlRpc/Client/Exception/HttpException.php
old mode 100755
new mode 100644
index 9078aab39..2e2a7b74d
--- a/library/Zend/XmlRpc/Client/Exception/HttpException.php
+++ b/library/Zend/XmlRpc/Client/Exception/HttpException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Client/Exception/IntrospectException.php b/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
old mode 100755
new mode 100644
index 29bdec944..e9b92198a
--- a/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
+++ b/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Client/Exception/InvalidArgumentException.php b/library/Zend/XmlRpc/Client/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index f7b237e9c..3dc6fc6c8
--- a/library/Zend/XmlRpc/Client/Exception/InvalidArgumentException.php
+++ b/library/Zend/XmlRpc/Client/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Client/Exception/RuntimeException.php b/library/Zend/XmlRpc/Client/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 556feffd2..10cdf6dda
--- a/library/Zend/XmlRpc/Client/Exception/RuntimeException.php
+++ b/library/Zend/XmlRpc/Client/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Client/ServerIntrospection.php b/library/Zend/XmlRpc/Client/ServerIntrospection.php
old mode 100755
new mode 100644
index 98fbac6af..8172cd88b
--- a/library/Zend/XmlRpc/Client/ServerIntrospection.php
+++ b/library/Zend/XmlRpc/Client/ServerIntrospection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Client/ServerProxy.php b/library/Zend/XmlRpc/Client/ServerProxy.php
old mode 100755
new mode 100644
index 861b61590..d4154699c
--- a/library/Zend/XmlRpc/Client/ServerProxy.php
+++ b/library/Zend/XmlRpc/Client/ServerProxy.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Exception/BadMethodCallException.php b/library/Zend/XmlRpc/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index db36424ab..2fea32b9c
--- a/library/Zend/XmlRpc/Exception/BadMethodCallException.php
+++ b/library/Zend/XmlRpc/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Exception/ExceptionInterface.php b/library/Zend/XmlRpc/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index 2443d4fa5..b28a0605b
--- a/library/Zend/XmlRpc/Exception/ExceptionInterface.php
+++ b/library/Zend/XmlRpc/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Exception/InvalidArgumentException.php b/library/Zend/XmlRpc/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index cb2c3d266..19a12e5b8
--- a/library/Zend/XmlRpc/Exception/InvalidArgumentException.php
+++ b/library/Zend/XmlRpc/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Exception/RuntimeException.php b/library/Zend/XmlRpc/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 1ece2b80f..e3e64031c
--- a/library/Zend/XmlRpc/Exception/RuntimeException.php
+++ b/library/Zend/XmlRpc/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Exception/ValueException.php b/library/Zend/XmlRpc/Exception/ValueException.php
old mode 100755
new mode 100644
index af0a6e8b2..683a84398
--- a/library/Zend/XmlRpc/Exception/ValueException.php
+++ b/library/Zend/XmlRpc/Exception/ValueException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Fault.php b/library/Zend/XmlRpc/Fault.php
old mode 100755
new mode 100644
index bb1880118..468a722dc
--- a/library/Zend/XmlRpc/Fault.php
+++ b/library/Zend/XmlRpc/Fault.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Generator/AbstractGenerator.php b/library/Zend/XmlRpc/Generator/AbstractGenerator.php
old mode 100755
new mode 100644
index 693f026c0..3ee99c4f2
--- a/library/Zend/XmlRpc/Generator/AbstractGenerator.php
+++ b/library/Zend/XmlRpc/Generator/AbstractGenerator.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Generator/DomDocument.php b/library/Zend/XmlRpc/Generator/DomDocument.php
old mode 100755
new mode 100644
index 47e7a7223..08cbe07e6
--- a/library/Zend/XmlRpc/Generator/DomDocument.php
+++ b/library/Zend/XmlRpc/Generator/DomDocument.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Generator/GeneratorInterface.php b/library/Zend/XmlRpc/Generator/GeneratorInterface.php
old mode 100755
new mode 100644
index ca2af243b..6bf712f4e
--- a/library/Zend/XmlRpc/Generator/GeneratorInterface.php
+++ b/library/Zend/XmlRpc/Generator/GeneratorInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Generator/XmlWriter.php b/library/Zend/XmlRpc/Generator/XmlWriter.php
old mode 100755
new mode 100644
index e64688aea..69c755674
--- a/library/Zend/XmlRpc/Generator/XmlWriter.php
+++ b/library/Zend/XmlRpc/Generator/XmlWriter.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/README.md b/library/Zend/XmlRpc/README.md
old mode 100755
new mode 100644
diff --git a/library/Zend/XmlRpc/Request.php b/library/Zend/XmlRpc/Request.php
old mode 100755
new mode 100644
index 82a7eedbe..121791919
--- a/library/Zend/XmlRpc/Request.php
+++ b/library/Zend/XmlRpc/Request.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Request/Http.php b/library/Zend/XmlRpc/Request/Http.php
old mode 100755
new mode 100644
index d42a8331d..2566d452b
--- a/library/Zend/XmlRpc/Request/Http.php
+++ b/library/Zend/XmlRpc/Request/Http.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Request/Stdin.php b/library/Zend/XmlRpc/Request/Stdin.php
old mode 100755
new mode 100644
index bcf748e95..efc08793f
--- a/library/Zend/XmlRpc/Request/Stdin.php
+++ b/library/Zend/XmlRpc/Request/Stdin.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Response.php b/library/Zend/XmlRpc/Response.php
old mode 100755
new mode 100644
index f8537584e..1d33d6e3b
--- a/library/Zend/XmlRpc/Response.php
+++ b/library/Zend/XmlRpc/Response.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Response/Http.php b/library/Zend/XmlRpc/Response/Http.php
old mode 100755
new mode 100644
index 00ae07cc9..311f38213
--- a/library/Zend/XmlRpc/Response/Http.php
+++ b/library/Zend/XmlRpc/Response/Http.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Server.php b/library/Zend/XmlRpc/Server.php
old mode 100755
new mode 100644
index e2cfcea6b..62f876127
--- a/library/Zend/XmlRpc/Server.php
+++ b/library/Zend/XmlRpc/Server.php
@@ -3,13 +3,12 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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
  */
 
 namespace Zend\XmlRpc;
 
-use ReflectionClass;
 use Zend\Server\AbstractServer;
 use Zend\Server\Definition;
 use Zend\Server\Reflection;
@@ -330,7 +329,10 @@ class Server extends AbstractServer
             } else {
                 $type = gettype($definition);
             }
-            throw new Server\Exception\InvalidArgumentException('Unable to load server definition; must be an array or Zend\Server\Definition, received ' . $type, 612);
+            throw new Server\Exception\InvalidArgumentException(
+                'Unable to load server definition; must be an array or Zend\Server\Definition, received ' . $type,
+                612
+            );
         }
 
         $this->table->clearMethods();
@@ -433,7 +435,7 @@ class Server extends AbstractServer
      */
     public function setResponseClass($class)
     {
-        if (!class_exists($class) || !static::isSubclassOf($class, 'Zend\XmlRpc\Response')) {
+        if (!class_exists($class) || !is_subclass_of($class, 'Zend\XmlRpc\Response')) {
             throw new Server\Exception\InvalidArgumentException('Invalid response class');
         }
         $this->responseClass = $class;
@@ -588,22 +590,14 @@ class Server extends AbstractServer
      * @see https://bugs.php.net/bug.php?id=53727
      * @see https://github.com/zendframework/zf2/pull/1807
      *
+     * @deprecated since zf 2.3 requires PHP >= 5.3.23
+     *
      * @param string $className
      * @param string $type
      * @return bool
      */
     protected static function isSubclassOf($className, $type)
     {
-        if (is_subclass_of($className, $type)) {
-            return true;
-        }
-        if (PHP_VERSION_ID >= 50307) {
-            return false;
-        }
-        if (!interface_exists($type)) {
-            return false;
-        }
-        $r = new ReflectionClass($className);
-        return $r->implementsInterface($type);
+        return is_subclass_of($className, $type);
     }
 }
diff --git a/library/Zend/XmlRpc/Server/Cache.php b/library/Zend/XmlRpc/Server/Cache.php
old mode 100755
new mode 100644
index f4e643ea6..b14800473
--- a/library/Zend/XmlRpc/Server/Cache.php
+++ b/library/Zend/XmlRpc/Server/Cache.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Server/Exception/BadMethodCallException.php b/library/Zend/XmlRpc/Server/Exception/BadMethodCallException.php
old mode 100755
new mode 100644
index d0828491c..214e4bd87
--- a/library/Zend/XmlRpc/Server/Exception/BadMethodCallException.php
+++ b/library/Zend/XmlRpc/Server/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php b/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
old mode 100755
new mode 100644
index f0f3fcdd2..5770fc6c1
--- a/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
+++ b/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Server/Exception/InvalidArgumentException.php b/library/Zend/XmlRpc/Server/Exception/InvalidArgumentException.php
old mode 100755
new mode 100644
index 059cab0f0..086af1dfe
--- a/library/Zend/XmlRpc/Server/Exception/InvalidArgumentException.php
+++ b/library/Zend/XmlRpc/Server/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Server/Exception/RuntimeException.php b/library/Zend/XmlRpc/Server/Exception/RuntimeException.php
old mode 100755
new mode 100644
index 285a40231..37e11763b
--- a/library/Zend/XmlRpc/Server/Exception/RuntimeException.php
+++ b/library/Zend/XmlRpc/Server/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Server/Fault.php b/library/Zend/XmlRpc/Server/Fault.php
old mode 100755
new mode 100644
index 37061ebf3..1bf5b35cc
--- a/library/Zend/XmlRpc/Server/Fault.php
+++ b/library/Zend/XmlRpc/Server/Fault.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Server/System.php b/library/Zend/XmlRpc/Server/System.php
old mode 100755
new mode 100644
index 8a57838b1..c6aee9664
--- a/library/Zend/XmlRpc/Server/System.php
+++ b/library/Zend/XmlRpc/Server/System.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/AbstractCollection.php b/library/Zend/XmlRpc/Value/AbstractCollection.php
old mode 100755
new mode 100644
index ed4f8193f..c394df60f
--- a/library/Zend/XmlRpc/Value/AbstractCollection.php
+++ b/library/Zend/XmlRpc/Value/AbstractCollection.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/AbstractScalar.php b/library/Zend/XmlRpc/Value/AbstractScalar.php
old mode 100755
new mode 100644
index 3e7b8eacb..13abd3c51
--- a/library/Zend/XmlRpc/Value/AbstractScalar.php
+++ b/library/Zend/XmlRpc/Value/AbstractScalar.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/ArrayValue.php b/library/Zend/XmlRpc/Value/ArrayValue.php
old mode 100755
new mode 100644
index 99d77437b..93e663489
--- a/library/Zend/XmlRpc/Value/ArrayValue.php
+++ b/library/Zend/XmlRpc/Value/ArrayValue.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/Base64.php b/library/Zend/XmlRpc/Value/Base64.php
old mode 100755
new mode 100644
index 9ba44acea..84de515e9
--- a/library/Zend/XmlRpc/Value/Base64.php
+++ b/library/Zend/XmlRpc/Value/Base64.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/BigInteger.php b/library/Zend/XmlRpc/Value/BigInteger.php
old mode 100755
new mode 100644
index e85ef9537..b7057882e
--- a/library/Zend/XmlRpc/Value/BigInteger.php
+++ b/library/Zend/XmlRpc/Value/BigInteger.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/Boolean.php b/library/Zend/XmlRpc/Value/Boolean.php
old mode 100755
new mode 100644
index 5ec6b7932..49d21a77e
--- a/library/Zend/XmlRpc/Value/Boolean.php
+++ b/library/Zend/XmlRpc/Value/Boolean.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/DateTime.php b/library/Zend/XmlRpc/Value/DateTime.php
old mode 100755
new mode 100644
index 9ec7253e6..fa9e525c8
--- a/library/Zend/XmlRpc/Value/DateTime.php
+++ b/library/Zend/XmlRpc/Value/DateTime.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/Double.php b/library/Zend/XmlRpc/Value/Double.php
old mode 100755
new mode 100644
index 722012000..4c71d81b7
--- a/library/Zend/XmlRpc/Value/Double.php
+++ b/library/Zend/XmlRpc/Value/Double.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/Integer.php b/library/Zend/XmlRpc/Value/Integer.php
old mode 100755
new mode 100644
index 40d938664..6a28b2f0e
--- a/library/Zend/XmlRpc/Value/Integer.php
+++ b/library/Zend/XmlRpc/Value/Integer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/Nil.php b/library/Zend/XmlRpc/Value/Nil.php
old mode 100755
new mode 100644
index 49f3c7511..e3b33b663
--- a/library/Zend/XmlRpc/Value/Nil.php
+++ b/library/Zend/XmlRpc/Value/Nil.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/String.php b/library/Zend/XmlRpc/Value/String.php
old mode 100755
new mode 100644
index 66fa441b0..9a94505cb
--- a/library/Zend/XmlRpc/Value/String.php
+++ b/library/Zend/XmlRpc/Value/String.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/Value/Struct.php b/library/Zend/XmlRpc/Value/Struct.php
old mode 100755
new mode 100644
index 99d55bb84..c58d23f52
--- a/library/Zend/XmlRpc/Value/Struct.php
+++ b/library/Zend/XmlRpc/Value/Struct.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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/library/Zend/XmlRpc/composer.json b/library/Zend/XmlRpc/composer.json
old mode 100755
new mode 100644
index 1520a41e4..b0131ee25
--- a/library/Zend/XmlRpc/composer.json
+++ b/library/Zend/XmlRpc/composer.json
@@ -21,6 +21,9 @@
         "zendframework/zend-stdlib": "self.version",
         "zendframework/zendxml": "1.*"
     },
+    "suggest": {
+        "zendframework/zend-cache": "To support Zend\\XmlRpc\\Server\\Cache usage"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.3-dev",
diff --git a/library/config.php b/library/config.php
index 4af6afe64..91000723f 100644
--- a/library/config.php
+++ b/library/config.php
@@ -74,7 +74,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 $bb_cfg['tp_version'] = '2.1.6';
 $bb_cfg['tp_release_date'] = '**-01-2015';
 $bb_cfg['tp_release_state'] = 'ALPHA';
-$bb_cfg['tp_zf_version'] = '2.3.3';
+$bb_cfg['tp_zf_version'] = '2.3.4';
 
 // Database
 $charset  = 'utf8';