PHP 7.2 + QA Tools (follow up #24)

.coveralls.yml

@@ -1 +1,2 @@
-src_dir: library
+coverage_clover: clover.xml
+json_path: coveralls-upload.json

.gitattributes

@@ -1,2 +1,10 @@
-.gitattributes export-ignore
-.gitignore export-ignore
+/.coveralls.yml export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/composer.lock export-ignore
+/docs/ export-ignore
+/mkdocs.yml export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
+/test/ export-ignore

.gitignore

@@ -1,12 +1,7 @@
-.buildpath
-.DS_Store
-.idea
-.project
-.settings/
-.*.sw*
-.*.un~
-nbproject
-composer.lock
-doc/html/
-vendor/
-zf-mkdoc-theme/
+/clover.xml
+/coveralls-upload.json
+/docs/html/
+/phpunit.xml
+/vendor/
+/zf-mkdoc-theme.tgz
+/zf-mkdoc-theme/

.travis.yml

@@ -2,51 +2,75 @@ sudo: false
 
 language: php
 
-branches:
-  except:
-    - /^release-\d+\.\d+\.\d+.*$/
-    - /^ghgfk-.*$/
-
 cache:
   directories:
     - $HOME/.composer/cache
-    - vendor
-    - $HOME/.local
-    - zf-mkdoc-theme
 
 env:
   global:
-    - SITE_URL: https://zendframework.github.io/zend-i18n-resources
-    - GH_USER_NAME: "Matthew Weier O'Phinney"
-    - GH_USER_EMAIL: matthew@weierophinney.net
-    - GH_REF: github.com/zendframework/zend-i18n-resources.git
-    - secure: "F+Y77+SehnuOFPrdiqwv/nKlPgYVC4r0aVibolM0fmBfa4Re+T9ApPivVQ5kdylSJfavA+/kljfMWY1uPlHaekO4Pdi7bj6qNbZ6kWybkXCxAoLgzA/a8+/nKWAafJnFie8qbajmUqJtL1FF5QGMu72FKlS0kUvaMnpW/iJadt3xJ3lDtFre1ndZEn+TZ6Me5KHx278R93DWM1lhkIlokh+vnCO2rNKAxLFffIsTYo/gnQdKhq6j4irWWyGLzNdzTwL1HfVU6xj2cvQJg+Q+TFuuqjMDuneZgZas+INOTV460jY9w74agWDMT8se1NN97ucvctL9h0A7FtFcvz2yAR6x/TbMEPg2pahMJEhxS0AK5YmuFrqOTBQryer2jAARhKkGJudQcqQdf7cMG3sJiLch4PtBZ86bzRq4QwBCot68D+l9HIXcUH/Qlt2io/BH+WCNIPW67xVUTGg+6B84CVKuf9vNgHk45KNLY1HNrxdSbRltWvU+i+tvCn+/QJZB/PwbTGyYjMew5FuAQjq2InwBmrhcZcbU6YXxQim/neLSOkBElnOaOciquJEmnRkPMbwo3ds+tS4/Jq6tu7LsEmcMSODD8E+W/xtSJ4J8Vr2lQ1/GnSK9OglEdU5N9lxfmG+iDghx0sawYuv2oqk6N+bZGJBBsf2Ac+HZCdwo2Yk="
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
-  fast_finish: true
   include:
     - php: 5.6
       env:
+        - DEPS=lowest
+    - php: 5.6
+      env:
+        - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
+    - php: 5.6
+      env:
+        - DEPS=latest
+    - php: 7
+      env:
+        - DEPS=lowest
+    - php: 7
+      env:
+        - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
+    - php: 7
+      env:
+        - DEPS=latest
+    - php: 7.1
+      env:
+        - DEPS=lowest
+    - php: 7.1
+      env:
+        - DEPS=locked
         - CS_CHECK=true
-        - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
-        - PATH="$HOME/.local/bin:$PATH"
-
+        - TEST_COVERAGE=true
+    - php: 7.1
+      env:
+        - DEPS=latest
+    - php: 7.2
+      env:
+        - DEPS=lowest
+    - php: 7.2
+      env:
+        - DEPS=locked
+    - php: 7.2
+      env:
+        - DEPS=latest
 
 before_install:
-  - phpenv config-rm xdebug.ini || return 0
-  - travis_retry composer self-update
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
 
 install:
-  - travis_retry composer install --no-interaction --prefer-source
-  - composer show --installed
+  - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
+  - if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
+  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
+  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - stty cols 120 && composer show
 
 script:
+  - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
   - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
-  - if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
 
-after_success:
-  - if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
+after_script:
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
 
 notifications:
-  irc: "irc.freenode.org#zftalk.dev"
   email: false

CHANGELOG.md

@@ -2,26 +2,36 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.5.3 - TBD
+## 2.6.0 - TBD
 
 ### Added
 
+- [#37](https://github.com/zendframework/zend-i18n-resources/pull/37) adds support for PHP 7.0, 7.1 and 7.2.
+
 - [#15](https://github.com/zendframework/zend-i18n-resources/pull/15) adds
   documentation at https://zendframework.github.io/zend-i18n-resources
+
 - [#25](https://github.com/zendframework/zend-i18n-resources/pull/25) adds
   Captcha translation for Dutch
 
 ### Deprecated
 
 - Nothing.
 
+### Changed
+
+- Nothing.
+
 ### Removed
 
 - Nothing.
 
 ### Fixed
 
-- [#17] (https://github.com/zendframework/zend-i18n-resources/pull/17) fixed
+- [#37](https://github.com/zendframework/zend-i18n-resources/pull/37) removes support for PHP 5.5.
+
+- [#17](https://github.com/zendframework/zend-i18n-resources/pull/17) fixed
   typo in russian translation of csrf validator message
-- [#22] (https://github.com/zendframework/zend-i18n-resources/pull/22) fixed
+
+- [#22](https://github.com/zendframework/zend-i18n-resources/pull/22) fixed
   typo in russian translation of Identical validator message

LICENSE.txt → LICENSE.md

@@ -1,19 +1,19 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
+Copyright (c) 2005-2018, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
+- Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
 
-    * Neither the name of Zend Technologies USA, Inc. nor the names of its
-      contributors may be used to endorse or promote products derived from this
-      software without specific prior written permission.
+- Neither the name of Zend Technologies USA, Inc. nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

README.md

@@ -1,10 +1,13 @@
 # zend-i18n-resources
 
+[![Build Status](https://secure.travis-ci.org/zendframework/zend-i18n-resources.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-i18n-resources)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-i18n-resources/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-i18n-resources?branch=master)
+
 This "component" provides translation resources, specifically for `zendframework/zend-validate` and
 `zendframework/zend-captcha`, for use with `zendframework/zend-i18n`'s Translator subcomponent.
 
 - File issues at https://github.com/zendframework/zend-i18n-resources/issues
-- Documentation is at https://zendframework.github.io/zend-i18n-resources/
+- Documentation is at https://docs.zendframework.com/zend-i18n-resources/
 
 ## Installation
 

composer.json

@@ -3,26 +3,53 @@
     "description": "Provides validator translations for zend-i18n's Translator",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "resources",
         "translations"
     ],
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-i18n-resources/",
+        "issues": "https://github.com/zendframework/zend-i18n-resources/issues",
+        "source": "https://github.com/zendframework/zend-i18n-resources",
+        "rss": "https://github.com/zendframework/zend-i18n-resources/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
+    },
     "require": {
-        "php": "^5.5 || ^7.0"
+        "php": "^5.6 || ^7.0"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "^2.3.1"
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
+        "zendframework/zend-coding-standard": "~1.0.0"
     },
     "autoload": {
         "classmap": [
             "src/Resources.php"
         ]
     },
+    "autoload-dev": {
+        "psr-4": {
+            "ZendTest\\I18n\\Translator\\": "test/"
+        }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.5.x-dev",
+            "dev-develop": "2.6.x-dev"
+        }
+    },
     "scripts": {
         "check": [
-            "@cs-check"
+            "@cs-check",
+            "@test"
         ],
         "cs-check": "phpcs",
-        "cs-fix": "phpcbf"
+        "cs-fix": "phpcbf",
+        "test": "phpunit --colors=always",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }