Merging develop to master in preparation for 1.4.0 release.

.coveralls.yml

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

.gitattributes

@@ -1,6 +1,9 @@
-/test 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,2 +1,4 @@
-vendor/
-phpunit.xml
+/clover.xml
+/coveralls-upload.json
+/phpunit.xml
+/vendor/

.travis.yml

@@ -9,7 +9,8 @@ cache:
 
 env:
  global:
- - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+ - COMPOSER_ARGS="--no-interaction"
+ - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
  fast_finish: true
@@ -20,6 +21,7 @@ matrix:
  - php: 5.6
  env:
  - DEPS=locked
+ - LEGACY_DEPS="phpunit/phpunit"
  - php: 5.6
  env:
  - DEPS=latest
@@ -29,36 +31,48 @@ matrix:
  - php: 7
  env:
  - DEPS=locked
- - CS_CHECK=true
+ - LEGACY_DEPS="phpunit/phpunit"
  - php: 7
  env:
  - DEPS=latest
- - php: hhvm 
+ - php: 7.1
  env:
  - DEPS=lowest
- - php: hhvm 
+ - php: 7.1
  env:
  - DEPS=locked
- - php: hhvm 
+ - CS_CHECK=true
+ - 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
- 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 [[ $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
- - travis_retry composer install $COMPOSER_ARGS
- - composer show
+ - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+ - stty cols 120 && composer show
 
 script:
- - composer test
+ - 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 php vendor/bin/php-coveralls ; fi

CHANGELOG.md

@@ -2,10 +2,14 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.3.2 - TBD
+## 1.4.0 - 2018-05-03
 
 ### Added
 
+- [#17](https://github.com/zfcampus/zf-rpc/pull/17) adds support for PHP 7.1 and 7.2.
+
+### Changed
+
 - Nothing.
 
 ### Deprecated
@@ -14,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#17](https://github.com/zfcampus/zf-rpc/pull/17) removes support for HHVM.
 
 ### Fixed
 

LICENSE.md

@@ -1,16 +1,15 @@
-Copyright (c) 2014-2016, Zend Technologies USA, Inc.
-
+Copyright (c) 2014-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,8 @@
 ZF RPC
 ======
 
-[![Build Status](https://travis-ci.org/zfcampus/zf-rpc.png)](https://travis-ci.org/zfcampus/zf-rpc)
+[![Build Status](https://secure.travis-ci.org/zfcampus/zf-rpc.svg?branch=master)](https://secure.travis-ci.org/zfcampus/zf-rpc)
+[![Coverage Status](https://coveralls.io/repos/github/zfcampus/zf-rpc/badge.svg?branch=master)](https://coveralls.io/github/zfcampus/zf-rpc?branch=master)
 
 Introduction
 ------------

composer.json

@@ -1,44 +1,35 @@
 {
  "name": "zfcampus/zf-rpc",
  "description": "ZF2 Module for simplifying the creation of RPC services",
- "type": "library",
  "license": "BSD-3-Clause",
  "keywords": [
- "zf2",
+ "zendframework",
+ "zf",
  "zend",
  "module",
  "rpc"
  ],
- "homepage": "https://apigility.org/",
  "support": {
- "email": "[email protected]",
- "irc": "irc:https://irc.freenode.net/apigility",
+ "issues": "https://github.com/zfcampus/zf-rpc/issues",
  "source": "https://github.com/zfcampus/zf-rpc",
- "issues": "https://github.com/zfcampus/zf-rpc/issues"
- },
- "extra": {
- "branch-alias": {
- "dev-master": "1.3-dev",
- "dev-develop": "1.4-dev"
- },
- "zf": {
- "module": "ZF\\Rpc"
- }
+ "rss": "https://github.com/zfcampus/zf-rpc/releases.atom",
+ "chat": "https://zendframework-slack.herokuapp.com",
+ "forum": "https://discourse.zendframework.com/c/questions/apigility"
  },
  "require": {
  "php": "^5.6 || ^7.0",
  "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
  "zendframework/zend-http": "^2.5.4",
- "zendframework/zend-mvc": "^2.7.9 || ^3.0.2",
+ "zendframework/zend-mvc": "^2.7.15 || ^3.0.2",
  "zendframework/zend-servicemanager": "^2.7.6 || ^3.1",
  "zendframework/zend-stdlib": "^2.7.7 || ^3.0.1",
  "zendframework/zend-view": "^2.8.1",
  "zfcampus/zf-api-problem": "^1.2.1",
  "zfcampus/zf-content-negotiation": "^1.2.1"
  },
  "require-dev": {
- "phpunit/phpunit": "^4.7",
- "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": {
  "psr-4": {
@@ -50,13 +41,27 @@
  "ZFTest\\Rpc\\": "test/"
  }
  },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.4.x-dev",
+ "dev-develop": "1.5.x-dev"
+ },
+ "zf": {
+ "module": "ZF\\Rpc"
+ }
+ },
  "scripts": {
  "check": [
  "@cs-check",
  "@test"
  ],
  "cs-check": "phpcs",
  "cs-fix": "phpcbf",
- "test": "phpunit"
- }
+ "test": "phpunit --colors=always",
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+ },
+ "homepage": "https://apigility.org/"
 }