Merge branch 'master' of https://github.com/zendframework/zf1

README.md

@@ -7,8 +7,18 @@ Master: [![Build Status](https://api.travis-ci.org/zendframework/zf1.png?branch=
 RELEASE INFORMATION
 ===================
 
-Zend Framework 1.12.4 Release.
-Released on March 06, 2014.
+Zend Framework 1.12.7dev Release.
+Released on MMMMM DD, YYYY.
+
+IMPORTANT FIXES FOR 1.12.6
+--------------------------
+
+- [#307](https://github.com/zendframework/zf1/pull/307) fixes a backwards
+  compatibility break in the `Zend_Locale` component. 1.12.4 updated the
+  [CLDR](http://cldr.unicode.org) version used by Zend Framework 1, which
+  resulted in the removal of several locales we previously supported. The patch
+  in #307 adds locale aliases for these to the new locales supported in recent
+  versions of the CLDR, ensuring backwards compatibility for ZF1 users.
 
 SECURITY FIXES FOR 1.12.4
 -------------------------
@@ -245,9 +255,9 @@ We’d like to particularly thank Adam Lundrigan, Frank Brückner and
 Martin Hujer for their efforts in making this happen. Thanks also to the
 many people who ran the ZF1 unit tests and reported their results!
 
-For a complete list, visit:
+For a complete list of closed issues beginning with 1.12.3, visit:
 
- * http://framework.zend.com/issues/secure/IssueNavigator.jspa?requestId=12877
+ * https://github.com/zendframework/zf1/issues?labels=&milestone=&page=1&state=closed
  * http://framework.zend.com/changelog/
 
 MIGRATION NOTES

library/Zend/Application/Bootstrap/BootstrapAbstract.php

@@ -104,7 +104,6 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
      * initializer methods.
      *
      * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
-     * @return void
      * @throws Zend_Application_Bootstrap_Exception When invalid application is provided
      */
     public function __construct($application)
@@ -327,8 +326,9 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
     /**
      * Get a registered plugin resource
      *
-     * @param  string $resourceName
+     * @param string $resource
      * @return Zend_Application_Resource_Resource
+     * @throws Zend_Application_Bootstrap_Exception
      */
     public function getPluginResource($resource)
     {
@@ -441,6 +441,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
      *
      * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
      * @return Zend_Application_Bootstrap_BootstrapAbstract
+     * @throws Zend_Application_Bootstrap_Exception
      */
     public function setApplication($application)
     {
@@ -491,6 +492,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
      *
      * @param  object $container
      * @return Zend_Application_Bootstrap_BootstrapAbstract
+     * @throws Zend_Application_Bootstrap_Exception
      */
     public function setContainer($container)
     {
@@ -554,7 +556,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
     }
 
     /**
-     * Implement PHP's magic to retrieve a ressource
+     * Implement PHP's magic to retrieve a resource
      * in the bootstrap
      *
      * @param string $prop
@@ -567,7 +569,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
 
     /**
      * Implement PHP's magic to ask for the
-     * existence of a ressource in the bootstrap
+     * existence of a resource in the bootstrap
      *
      * @param string $prop
      * @return bool
@@ -602,7 +604,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
      *
      * @param  string $method
      * @param  array  $args
-     * @return void
+     * @return Zend_Application_Bootstrap_BootstrapAbstract
      * @throws Zend_Application_Bootstrap_Exception On invalid method name
      */
     public function __call($method, $args)

library/Zend/Application/Bootstrap/Bootstrapper.php

@@ -35,7 +35,6 @@ interface Zend_Application_Bootstrap_Bootstrapper
      * Constructor
      *
      * @param  Zend_Application $application
-     * @return void
      */
     public function __construct($application);
 

library/Zend/Version.php

@@ -32,7 +32,7 @@ final class Zend_Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '1.12.4';
+    const VERSION = '1.12.7dev';
 
     /**
      * The latest stable version Zend Framework available

resources/languages/es/Zend_Validate.php

@@ -68,7 +68,7 @@ return array(
 
     // Zend_Validate_Db_Abstract
     "No record matching %value% was found" => "No fue encontrado ningun registro que coincida con %value%",
-    "A record matching %value% was found" => "Se encontro un registro coincidente con %value%",
+    "A record matching '%value%' was found" => "Se encontro un registro coincidente con %value%",
 
     // Zend_Validate_Digits
     "Invalid type given, value should be string, integer or float" => "El tipo especificado no es válido, el valor debe ser una cadena de texto, entero o float",

resources/languages/hr/Zend_Validate.php

@@ -67,7 +67,7 @@ return array(
 
     // Zend_Validate_Db_Abstract
     "No record matching %value% was found" => "Nije pronađen zapis koji se podudara sa %value%",
-    "A record matching %value% was found" => "Zapis koji se podudara sa %value% je pronađen",
+    "A record matching '%value%' was found" => "Zapis koji se podudara sa %value% je pronađen",
 
     // Zend_Validate_Digits
     "Invalid type given, value should be string, integer or float" => "Neispravan tip, vrijednost bi trebala biti niz slova, brojki ili realni broj",

resources/languages/it/Zend_Validate.php

@@ -68,7 +68,7 @@ return array(
 
     // Zend_Validate_Db_Abstract
     "No record matching %value% was found" => "Non è stato trovato una riga con valore %value%",
-    "A record matching %value% was found" => "E' già stata trovata una riga con valore %value%",
+    "A record matching '%value%' was found" => "E' già stata trovata una riga con valore %value%",
 
     // Zend_Validate_Digits
     "Invalid type given, value should be float, string, or integer" => "Tipo di dato non valido: il dato dev'essere di tipo float, stringa o intero.",

resources/languages/nl/Zend_Validate.php

@@ -68,7 +68,7 @@ return array(
 
     // Zend_Validate_Db_Abstract
     "No record matching %value% was found" => "Er kon geen record gevonden wat overeenkomt met %value%",
-    "A record matching %value% was found" => "Een record wat overeenkomt met %value% is gevonden",
+    "A record matching '%value%' was found" => "Een record wat overeenkomt met %value% is gevonden",
 
     // Zend_Validate_Digits
     "Invalid type given, value should be string, integer or float" => "Ongeldig type opgegeven, waarde moet een string, integer of float zijn",

resources/languages/pt_BR/Zend_Validate.php

@@ -68,7 +68,7 @@ return array(
 
     // Zend_Validate_Db_Abstract
     "No record matching %value% was found" => "Não foram encontrados registros para %value%",
-    "A record matching %value% was found" => "Um registro foi encontrado para %value%",
+    "A record matching '%value%' was found" => "Um registro foi encontrado para %value%",
 
     // Zend_Validate_Digits
     "Invalid type given, value should be string, integer or float" => "O tipo especificado é inválido, o valor deve ser string, inteiro ou float",

resources/languages/ru/Zend_Validate.php

@@ -68,7 +68,7 @@ return array(
 
     // Zend_Validate_Db_Abstract
     "No record matching %value% was found" => "Не найдено записей, совпадающих с '%value%'",
-    "A record matching %value% was found" => "Найдена запись, совпадающая со значением '%value%'",
+    "A record matching '%value%' was found" => "Найдена запись, совпадающая со значением '%value%'",
 
     // Zend_Validate_Digits
     "Invalid type given, value should be string, integer or float" => "Недопустимый тип данных, значение должно быть числом с плавающей точкой, строкой, или целым числом",

resources/languages/sr/Zend_Validate.php

@@ -68,7 +68,7 @@ return array(
 
     // Zend_Validate_Db_Abstract
     "No record matching %value% was found" => "Zapis koji se poklapa sa %value% nije pronađen",
-    "A record matching %value% was found" => "Zapis koji se poklapa sa %value% je pronađen",
+    "A record matching '%value%' was found" => "Zapis koji se poklapa sa %value% je pronađen",
 
     // Zend_Validate_Digits
     "Invalid type given, value should be string, integer or float" => "Nevalidan tip, vrednost treba da bude tekst ili broj",

resources/languages/uk/Zend_Validate.php

@@ -68,7 +68,7 @@ return array(
 
     // Zend_Validate_Db_Abstract
     "No record matching %value% was found" => "Не знайдено записів, що відповідають '%value%'",
-    "A record matching %value% was found" => "Знайдено запис, що відповідає '%value%'",
+    "A record matching '%value%' was found" => "Знайдено запис, що відповідає '%value%'",
 
     // Zend_Validate_Digits
     "Invalid type given, value should be string, integer or float" => "Неприпустимий тип даних, значення повинно бути числом з плаваючою крапкою, рядком чи цілим числом",