Merge branch 'feature/php-7.2-support' into develop

Close #10
Fixes #9

.gitattributes

@@ -1,7 +1,9 @@
-/test export-ignore
-vendor export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-phpcs.xml export-ignore
-phpunit.xml.dist export-ignore
+/.coveralls.yml export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/composer.lock export-ignore
+/docs/ export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
+/test/ export-ignore

.gitignore

@@ -1,4 +1,4 @@
-vendor/
-phpunit.xml
-clover.xml
-coveralls-upload.json
+/clover.xml
+/coveralls-upload.json
+/phpunit.xml
+/vendor/

.travis.yml

@@ -10,8 +10,7 @@ cache:
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - COVERAGE_DEPS="satooshi/php-coveralls"
-    - LEGACY_DEPS="phpunit/phpunit php-mock/php-mock-phpunit"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
   include:
@@ -21,6 +20,7 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit php-mock/php-mock-phpunit"
         - TEST_COVERAGE=true
     - php: 5.6
       env:
@@ -31,6 +31,7 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit php-mock/php-mock-phpunit"
         - CS_CHECK=true
     - php: 7
       env:
@@ -44,37 +45,33 @@ matrix:
     - php: 7.1
       env:
         - DEPS=latest
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=lowest
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=locked
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: hhvm
 
 notifications:
-  irc: "irc.freenode.org#apigility-dev"
   email: false
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - travis_retry composer self-update
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
-  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
+  - 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
-  - composer show
+  - 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
 
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/php-coveralls ; fi

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.1.0 - 2018-05-03
+
+### Added
+
+- [#10](https://github.com/zfcampus/zf-composer-autoloading/pull/10) adds support for PHP 7.2.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#10](https://github.com/zfcampus/zf-composer-autoloading/pull/10) removes support for HHVM.
+
+### Fixed
+
+- Nothing.
+
 ## 2.0.0 - 2017-02-22
 
 ### Added

LICENSE.md

@@ -1,16 +1,15 @@
-Copyright (c) 2016, Zend Technologies USA, Inc.
-
+Copyright (c) 2016-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

README.md

@@ -1,7 +1,7 @@
 zf-composer-autoloading
 =======================
 
-[![Build Status](https://travis-ci.org/zfcampus/zf-composer-autoloading.svg?branch=master)](https://travis-ci.org/zfcampus/zf-composer-autoloading)
+[![Build Status](https://secure.travis-ci.org/zfcampus/zf-composer-autoloading.svg?branch=master)](https://secure.travis-ci.org/zfcampus/zf-composer-autoloading)
 [![Coverage Status](https://coveralls.io/repos/github/zfcampus/zf-composer-autoloading/badge.svg?branch=master)](https://coveralls.io/github/zfcampus/zf-composer-autoloading?branch=master)
 
 Introduction

composer.json

@@ -1,34 +1,30 @@
 {
     "name": "zfcampus/zf-composer-autoloading",
     "description": "Sets up Composer-based autoloading for your Zend Framework modules",
-    "type": "library",
     "license": "BSD-3-Clause",
     "keywords": [
+        "zf",
         "autoloading",
         "console",
         "framework",
         "zendframework"
     ],
-    "homepage": "http://apigility.org/",
     "support": {
-        "irc": "irc://irc.freenode.net/apigility",
+        "issues": "https://github.com/zfcampus/zf-composer-autoloading/issues",
         "source": "https://github.com/zfcampus/zf-composer-autoloading",
-        "issues": "https://github.com/zfcampus/zf-composer-autoloading/issues"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0-dev"
-        }
+        "rss": "https://github.com/zfcampus/zf-composer-autoloading/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/apigility"
     },
     "require": {
         "php": "^5.6 || ^7.0",
         "zendframework/zend-stdlib": "^3.1"
     },
     "require-dev": {
         "mikey179/vfsStream": "^1.6.4",
-        "mockery/mockery": "^0.9.8",
-        "php-mock/php-mock-phpunit": "^2.0 || ^1.1.2",
-        "phpunit/phpunit": "^6.0.7 || ^5.7.14",
+        "mockery/mockery": "^1.0",
+        "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "autoload": {
@@ -41,6 +37,15 @@
             "ZFTest\\ComposerAutoloading\\": "test/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.1.x-dev",
+            "dev-develop": "2.2.x-dev"
+        }
+    },
     "bin": [
         "bin/zf-composer-autoloading"
     ],
@@ -52,7 +57,7 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --coverage-clover clover.xml",
-        "upload-coverage": "coveralls -v"
-    }
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+    },
+    "homepage": "http://apigility.org/"
 }