Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merging develop to master in preparation for 3.2.0 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed May 7, 2018
2 parents d8ebb73 + 8ffb5aa commit 419004a
Show file tree
Hide file tree
Showing 25 changed files with 2,245 additions and 191 deletions.
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/.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
9 changes: 4 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
vendor/
clover.xml
composer.lock
coveralls-upload.json
phpunit.xml
/clover.xml
/coveralls-upload.json
/phpunit.xml
/vendor/
68 changes: 51 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,71 @@ cache:
directories:
- $HOME/.composer/cache

env:
global:
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="php-coveralls/php-coveralls"

matrix:
fast_finish: true
include:
- php: 5.6
env:
- TEST_COVERAGE=true
- 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
- TEST_COVERAGE=true
- php: 7.1
- php: hhvm
allow_failures:
- php: hhvm

notifications:
irc: "irc.freenode.org#apigility-dev"
email: false
env:
- DEPS=latest
- php: 7.2
env:
- DEPS=lowest
- php: 7.2
env:
- DEPS=locked
- php: 7.2
env:
- DEPS=latest

before_install:
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
- travis_retry composer self-update

install:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev --no-update "satooshi/php-coveralls:^1.0" ; fi
- travis_retry composer install --no-interaction
- composer show
- 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 ; fi
- if [[ $TEST_COVERAGE != 'true' ]]; then composer test ; fi
- if [[ $CS_CHECK == 'true' ]]; then composer cs ; fi
- 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 composer coveralls ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi

notifications:
email: false
30 changes: 27 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,39 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 3.1.1 - TBD
## 3.2.0 - 2018-05-07

### Added

- Nothing.
- [#35](https://github.com/zfcampus/zf-development-mode/pull/35) adds support for PHP 7.2.

- [#32](https://github.com/zfcampus/zf-development-mode/pull/32) adds a new sub-command, `auto-composer`. When invoked, it uses the value of
the environment variable COMPOSER_DEV_MODE to determine whether to enable or disable development
mode locally. If the variable is not present, it does nothing; if `0`, it disables development
mode, and if `1`, it enables development mode. This can be particularly useful as a composer script:

```json
"scripts": {
"development-auto": "zf-development-mode auto-composer",
"post-install-cmd": ["@development-auto"],
"post-update-cmd": ["@development-auto"]
}
```

### Changed

- [#29](https://github.com/zfcampus/zf-development-mode/pull/29) modifies how the `enable` subcommand copies development config files into
the filesystem. On operating systems that are known to support `symlink()` predictably,
the command will now create symlinks instead of copies. These include most Linux, BSD,
and MacOS variants.

### Deprecated

- Nothing.

### Removed

- Nothing.
- [#35](https://github.com/zfcampus/zf-development-mode/pull/35) removes support for HHVM.

### Fixed

Expand Down Expand Up @@ -71,6 +91,10 @@ All notable changes to this project will be documented in this file, in reverse

### Added

- [#35](https://github.com/zfcampus/zf-development-mode/pull/35) adds support for PHP 7.2.

### Changed

- Nothing.

### Deprecated
Expand Down
97 changes: 0 additions & 97 deletions CONTRIBUTING.md

This file was deleted.

13 changes: 6 additions & 7 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# zf-development-mode

[![Build Status](https://travis-ci.org/zfcampus/zf-development-mode.svg?branch=master)](https://travis-ci.org/zfcampus/zf-development-mode)
[![Build Status](https://secure.travis-ci.org/zfcampus/zf-development-mode.svg?branch=master)](https://secure.travis-ci.org/zfcampus/zf-development-mode)
[![Coverage Status](https://coveralls.io/repos/github/zfcampus/zf-development-mode/badge.svg?branch=master)](https://coveralls.io/github/zfcampus/zf-development-mode?branch=master)
[![Total Downloads](https://poser.pugx.org/zfcampus/zf-development-mode/downloads)](https://packagist.org/packages/zfcampus/zf-development-mode)

Expand Down
50 changes: 29 additions & 21 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
{
"name": "zfcampus/zf-development-mode",
"description": "Zend Framework development mode script",
"license": "BSD-3-Clause",
"keywords": [
"framework",
"zf2"
"zf",
"zendframework",
"framework"
],
"homepage": "http://github.com/zfcampus/zf-development-mode",
"type": "library",
"license": "BSD-3-Clause",
"extra": {
"branch-alias": {
"dev-master": "3.1-dev",
"dev-develop": "3.2-dev"
}
"support": {
"issues": "https://github.com/zfcampus/zf-development-mode/issues",
"source": "https://github.com/zfcampus/zf-development-mode",
"rss": "https://github.com/zfcampus/zf-development-mode/releases.atom",
"chat": "https://zendframework-slack.herokuapp.com",
"forum": "https://discourse.zendframework.com/c/questions/apigility"
},
"bin": [
"bin/zf-development-mode"
],
"require": {
"php": "^5.6 || ^7.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "^2.3.1",
"phpunit/phpunit": "^5.4",
"mikey179/vfsStream": "^1.6"
"mikey179/vfsStream": "^1.6.5",
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
"zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
"psr-4": {
Expand All @@ -35,15 +32,26 @@
"ZFTest\\DevelopmentMode\\": "test/"
}
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "3.2.x-dev",
"dev-develop": "3.3.x-dev"
}
},
"bin": [
"bin/zf-development-mode"
],
"scripts": {
"check": [
"@cs",
"@cs-check",
"@test"
],
"coveralls": "coveralls",
"cs": "phpcs",
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit",
"test-coverage": "phpunit --coverage-clover clover.xml"
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
}
Loading

0 comments on commit 419004a

Please sign in to comment.