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

PHP 7.2 support #32

Merged
merged 4 commits into from
May 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/test export-ignore
.coveralls.yml export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
composer.lock 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
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
vendor/
phpunit.xml
clover.xml
coveralls-upload.json
/clover.xml
/coveralls-upload.json
/phpunit.xml
/vendor/
27 changes: 9 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,48 +5,42 @@ language: php
cache:
directories:
- $HOME/.composer/cache
- vendor

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

matrix:
fast_finish: false
include:
- php: 5.6
env:
- DEPS=lowest
- LEGACY_DEPS="doctrine/instantiator phpunit/phpunit"
- php: 5.6
env:
- DEPS=locked
- LEGACY_DEPS="doctrine/instantiator phpunit/phpunit"
- php: 5.6
env:
- DEPS=latest
- LEGACY_DEPS="doctrine/instantiator phpunit/phpunit"
- php: 7
env:
- DEPS=lowest
- LEGACY_DEPS="doctrine/instantiator"
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="doctrine/instantiator"
- TEST_COVERAGE=true
- CS_CHECK=true
- LEGACY_DEPS="doctrine/instantiator phpunit/phpunit"
- php: 7
env:
- DEPS=latest
- LEGACY_DEPS="doctrine/instantiator"
- php: 7.1
env:
- DEPS=lowest
- php: 7.1
env:
- DEPS=locked
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 7.1
env:
- DEPS=latest
Expand All @@ -59,21 +53,15 @@ matrix:
- php: 7.2
env:
- DEPS=latest
allow_failures:
- php: 7.2

notifications:
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 $COMPOSER_ARGS --prefer-lowest --prefer-stable ; 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

Expand All @@ -82,4 +70,7 @@ script:
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi

after_script:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi

notifications:
email: false
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file, in reverse

### Added

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

### Changed

Expand Down
80 changes: 0 additions & 80 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
23 changes: 8 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
ZF Configuration
================
# ZF Configuration

[![Build Status](https://travis-ci.org/zfcampus/zf-configuration.png)](https://travis-ci.org/zfcampus/zf-configuration)
[![Build Status](https://secure.travis-ci.org/zfcampus/zf-configuration.svg?branch=master)](https://secure.travis-ci.org/zfcampus/zf-configuration)
[![Coverage Status](https://coveralls.io/repos/github/zfcampus/zf-configuration/badge.svg?branch=master)](https://coveralls.io/github/zfcampus/zf-configuration?branch=master)

Introduction
------------
## Introduction

zf-configuration is a module that provides configuration services that provide for the
runtime management and modification of Zend Framework application configuration files.

Requirements
------------
## Requirements

Please see the [composer.json](composer.json) file.

Installation
------------
## Installation

Run the following `composer` command:

Expand Down Expand Up @@ -53,8 +49,7 @@ return [
> If you use [zf-component-installer](https://github.com/zendframework/zf-component-installer),
> that plugin will install zf-configuration as a module for you.

Configuration
-------------
## Configuration

### User Configuration

Expand All @@ -79,13 +74,11 @@ syntax.

Set this value to a boolean `true` if you want to use PHP 5.5's class name scalars (`::class` notation).

ZF2 Events
----------
### ZF Events

There are no events or listeners.

ZF2 Services
------------
### ZF Services

#### ZF\Configuration\ConfigWriter

Expand Down
42 changes: 20 additions & 22 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,20 @@
{
"name": "zfcampus/zf-configuration",
"description": "Zend Framework module providing a REST resource for manipulating configuration",
"type": "library",
"license": "BSD-3-Clause",
"keywords": [
"zf2",
"zend",
"zf",
"zendframework",
"module",
"rest",
"config"
],
"homepage": "http://apigility.org/",
"support": {
"email": "apigility-users@zend.com",
"irc": "irc://irc.freenode.net/apigility",
"issues": "https://github.com/zfcampus/zf-configuration/issues",
"source": "https://github.com/zfcampus/zf-configuration",
"issues": "https://github.com/zfcampus/zf-configuration/issues"
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "1.3-dev",
"dev-develop": "1.4-dev"
},
"zf": {
"module": "ZF\\Configuration"
}
"rss": "https://github.com/zfcampus/zf-configuration/releases.atom",
"chat": "https://zendframework-slack.herokuapp.com",
"forum": "https://discourse.zendframework.com/c/questions/apigility"
},
"require": {
"php": "^5.6 || ^7.0",
Expand All @@ -37,7 +24,7 @@
},
"require-dev": {
"container-interop/container-interop": "^1.1",
"phpunit/phpunit": "^5.7.15 || ^6.0.8",
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
"zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
Expand All @@ -50,6 +37,18 @@
"ZFTest\\Configuration\\": "test/"
}
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "1.3.x-dev",
"dev-develop": "1.4.x-dev"
},
"zf": {
"module": "ZF\\Configuration"
}
},
"scripts": {
"check": [
"@cs-check",
Expand All @@ -58,7 +57,6 @@
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"upload-coverage": "coveralls -v"
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
}
Loading