Merge remote-tracking branch 'upstream/master'

zendframework · May 9, 2013 · adf262d · adf262d
commit adf262d
Show file tree

Hide file tree

Showing 43 changed files with 1,636 additions and 958 deletions.
diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,17 @@
+<?php
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->notName('TestSampleClass10.php')
+    ->exclude('demos')
+    ->exclude('resources')
+    ->filter(function (SplFileInfo $file) {
+        if (strstr($file->getPath(), 'compatibility')) {
+            return false;
+        }
+    })
+    ->in(__DIR__ . '/library')
+    ->in(__DIR__ . '/tests')
+    ->in(__DIR__ . '/bin');
+$config = Symfony\CS\Config\Config::create();
+$config->fixers(Symfony\CS\FixerInterface::PSR2_LEVEL);
+$config->finder($finder);
+return $config;
diff --git a/.travis.yml b/.travis.yml
@@ -4,17 +4,17 @@ php:
   - 5.3.3
   - 5.3
   - 5.4
+  - 5.5
+
+matrix:
+  allow_failures:
+    - php: 5.5
 
 before_install:
  - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
- - composer install --dev
- - wget http://cs.sensiolabs.org/get/php-cs-fixer.phar
 
 script:
- - php ./tests/run-tests.php
- - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 library); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
- - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 tests); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
- - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 bin); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
+ - ant travis -keep-going
 
 notifications:
   irc: "irc.freenode.org#zftalk.dev"

diff --git a/languages/ar/Zend_Captcha.php b/languages/ar/Zend_Captcha.php
@@ -12,10 +12,7 @@
  * obtain it through the world-wide-web, please send an email
  * to license@zend.com so we can send you a copy immediately.
  *
- * @category   Zend
- * @package    Zend_Translate
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/languages/ar/Zend_Validate.php b/languages/ar/Zend_Validate.php
@@ -12,10 +12,7 @@
  * obtain it through the world-wide-web, please send an email
  * to license@zend.com so we can send you a copy immediately.
  *
- * @category   Zend
- * @package    Zend_Translator
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -175,7 +172,7 @@
 
     // Zend_Validate_File_WordCount
     "Too much words, maximum '%max%' are allowed but '%count%' were counted" => "'%count%' كلمات أكثر من العدد الأقصى المسموح به وهو '%max%' كلمات",
-    "Too less words, minimum '%min%' are expected but '%count%' were counted" => "'%count%' كلمات أقل من العدد الأدنى المسموح وهو '%min%' كلمات",
+    "Too few words, minimum '%min%' are expected but '%count%' were counted" => "'%count%' كلمات أقل من العدد الأدنى المسموح وهو '%min%' كلمات",
     "File '%value%' is not readable or does not exist" => "الملف '%value%' لا يمكن قراءته أو أنه غير موجود",
 
     // Zend_Validate_Float

diff --git a/languages/bg/Zend_Captcha.php b/languages/bg/Zend_Captcha.php
@@ -12,10 +12,7 @@
  * obtain it through the world-wide-web, please send an email
  * to license@zend.com so we can send you a copy immediately.
  *
- * @category   Zend
- * @package    Zend_Translate
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 

diff --git a/languages/bg/Zend_Validate.php b/languages/bg/Zend_Validate.php
@@ -12,10 +12,7 @@
  * obtain it through the world-wide-web, please send an email
  * to license@zend.com so we can send you a copy immediately.
  *
- * @category   Zend
- * @package    Zend_Translator
- * @subpackage Resource
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
@@ -190,7 +187,7 @@
 
     // Zend_Validator_File_WordCount
     "Too much words, maximum '%max%' are allowed but '%count%' were counted" => "Твърде много думи, очакват се максимум '%max%', но '%count%' бяха открити",
-    "Too less words, minimum '%min%' are expected but '%count%' were counted" => "Твърде малко думи, очакват се минимум '%min%' но само '%count%' бяха открити",
+    "Too few words, minimum '%min%' are expected but '%count%' were counted" => "Твърде малко думи, очакват се минимум '%min%' но само '%count%' бяха открити",
     "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не съществува",
 
     // Zend_Validator_GreaterThan

diff --git a/languages/ca/Zend_Captcha.php b/languages/ca/Zend_Captcha.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @copyright  Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * EN-Revision: 30.Jul.2011
+ */
+return array(
+    // Zend\Captcha\ReCaptcha
+    "Missing captcha fields" => "Falten camps del captcha",
+    "Failed to validate captcha" => "No s'ha pogut validar el captcha",
+    "Captcha value is wrong: %value%" => "El valor del captcha és incorrecte: %value%",
+
+    // Zend\Captcha\Word
+    "Empty captcha value" => "Valor buit del captcha",
+    "Captcha ID field is missing" => "Falta el camp ID del captcha",
+    "Captcha value is wrong" => "El valor del captcha és incorrecte",
+);