Merge branch 'develop'

Promote develop to master, becoming the next stable release.

.coveralls.yml

@@ -0,0 +1 @@
+src_dir: library

.php_cs

@@ -1,8 +1,13 @@
 <?php
 $finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->notName('TestSampleClass10.php')
     ->exclude('demos')
     ->exclude('resources')
+    ->notPath('tests/ZendTest/Code/Reflection/FunctionReflectionTest.php')
+    ->notPath('tests/ZendTest/Code/Reflection/MethodReflectionTest.php')
+    ->notPath('tests/ZendTest/Code/Reflection/TestAsset/closures.php')
+    ->notPath('tests/ZendTest/Code/Reflection/TestAsset/functions.php')
+    ->notPath('tests/ZendTest/Code/Reflection/TestAsset/TestSampleClass10.php')
+    ->notPath('tests/ZendTest/Code/Reflection/TestAsset/TestSampleClass11.php')
     ->notPath('tests/ZendTest/Code/TestAsset')
     ->notPath('tests/ZendTest/Validator/_files')
     ->notPath('tests/ZendTest/Loader/_files')

.travis.yml

@@ -1,17 +1,29 @@
 language: php
 
 php:
-  - 5.3.3
   - 5.3
   - 5.4
   - 5.5
   - 5.6
+  - hhvm
 
-before_install:
- - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
+install:
+  - sudo apt-get install parallel
+  - composer install --dev --prefer-source
+
+before_script:
+  - mkdir -p build/coverage
+  - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
 
 script:
- - ant travis -keep-going
+  - bin/check-cs.sh
+  # Run tests for the various components in parallel
+  - ls -d tests/ZendTest/* | parallel --gnu --keep-order 'echo "Running {} tests"; ./vendor/bin/phpunit -c tests/phpunit.xml.dist --coverage-php build/coverage/coverage-{/.}.cov {};' || exit 1
+
+after_script:
+  # Merges the individual clover reports of each component into a single clover.xml
+  - php vendor/bin/phpcov.php --merge --clover build/logs/clover.xml --whitelist library build/coverage
+  - php vendor/bin/coveralls
 
 notifications:
   irc: "irc.freenode.org#zftalk.dev"
@@ -21,3 +33,4 @@ matrix:
   fast_finish: true
   allow_failures:
     - php: 5.6
+    - php: hhvm

languages/bg/Zend_Captcha.php

@@ -11,12 +11,12 @@
  * EN-Revision: 30.Jul.2011
  */
 return array(
-    // Zend_Captcha_ReCaptcha
+    // Zend\Captcha\ReCaptcha
     "Missing captcha fields" => "Непопълнена стойност на капча",
     "Failed to validate captcha" => "Не може да валидира капча",
     "Captcha value is wrong: %value%" => "Стойността на капча е грешна: %value%",
 
-    // Zend_Captcha_Word
+    // Zend\Captcha\Word
     "Empty captcha value" => "Непопълнена стойност на капча",
     "Captcha ID field is missing" => "Липсващо капча ID поле",
     "Captcha value is wrong" => "Стойността на капча е грешна",

languages/ca/Zend_Validate.php

@@ -8,7 +8,7 @@
  */
 
 /**
- * EN-Revision: 04.Apr.2013
+ * EN-Revision: 16.Jul.2013
  */
 return array(
     // Zend\I18n\Validator\Alnum
@@ -21,6 +21,10 @@
     "The input contains non alphabetic characters" => "L'entrada conté caràcters no alfabètics",
     "The input is an empty string" => "L'entrada és una cadena buida",
 
+    // Zend\I18n\Validator\DateTime
+    "Invalid type given. String expected" => "Tipus no vàlid donat. S'espera una cadena de text",
+    "The input does not appear to be a valid datetime" => "L'entrada no sembla ser un datetime vàlid",
+
     // Zend\I18n\Validator\Float
     "Invalid type given. String, integer or float expected" => "Tipus no vàlid donat. S'espera una cadena de text, un enter o un nombre de precisió simple",
     "The input does not appear to be a float" => "L'entrada no sembla ser un nombre de precisió simple",
@@ -29,6 +33,11 @@
     "Invalid type given. String or integer expected" => "Tipus no vàlid donat. S'espera una cadena de text o un enter",
     "The input does not appear to be an integer" => "L'entrada no sembla ser un nombre enter",
 
+    // Zend\I18n\Validator\PhoneNumber
+    "The input does not match a phone number format" => "L'entrada no coincideix amb un format de número de telèfon",
+    "The country provided is currently unsupported" => "El país proporcionat no està suportat",
+    "Invalid type given. String expected" => "Tipus no vàlid donat. S'espera una cadena de text",
+
     // Zend\I18n\Validator\PostCode
     "Invalid type given. String or integer expected" => "Tipus no vàlid donat. S'espera una cadena de text o un enter",
     "The input does not appear to be a postal code" => "L'entrada no sembla ser un codi postal",

languages/id/Zend_Captcha.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * ID-Revision: 08.Dec.2013
+ */
+return array(
+    // Zend\Captcha\ReCaptcha
+    "Missing captcha fields" => "Tidak ada bidang captcha",
+    "Failed to validate captcha" => "Gagal memvalidasi captcha",
+    "Captcha value is wrong: %value%" => "Nilai captcha salah: %value%",
+
+    // Zend\Captcha\AbstractWord
+    "Empty captcha value" => "Nilai captcha kosong",
+    "Captcha ID field is missing" => "Bidang Captcha ID tidak ada",
+    "Captcha value is wrong" => "Nilai Captcha salah",
+);