Skip to content

Commit

Permalink
Upgrade to 3.5 core usage.
Browse files Browse the repository at this point in the history
  • Loading branch information
dereuromark committed Mar 19, 2018
1 parent 8e3164a commit 760f86e
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 15 deletions.
7 changes: 7 additions & 0 deletions .gitattributes
Expand Up @@ -2,3 +2,10 @@
# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto
* text eol=lf

# Remove files for archives generated using `git archive`
phpunit.xml.dist export-ignore
.travis.yml export-ignore
.gitignore export-ignore
.gitattributes export-ignore
.editorconfig export-ignore
18 changes: 10 additions & 8 deletions .travis.yml
Expand Up @@ -3,7 +3,6 @@ language: php
sudo: false

php:
- 5.5
- 5.6
- 7.0
- 7.1
Expand All @@ -24,33 +23,36 @@ matrix:
- php: 7.1
env: PHPCS=1 DEFAULT=0

- php: 7.1
env: CODECOVERAGE=1 DEFAULT=0

- php: 5.6
env: COVERALLS=1 DEFAULT=0
env: PREFER_LOWEST=1

allow_failures:
- env: DB=sqlite db_dsn='sqlite:///:memory:'
- env: DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'

before_script:
- composer install --prefer-dist --no-interaction
- if [[ $PREFER_LOWEST != 1 ]]; then composer install --prefer-source --no-interaction ; fi
- if [[ $PREFER_LOWEST == 1 ]]; then composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable ; fi

- if [[ $PHPCS != 1 ]]; then composer require phpunit/phpunit:"^5.7.14|^6.0"; fi

- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
- sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi"

- sh -c "if [ '$COVERALLS' = '1' ]; then composer require --dev satooshi/php-coveralls:dev-master; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"

- phpenv rehash
- set +H
- cp phpunit.xml.dist phpunit.xml

script:
- sh -c "if [ '$COVERALLS' = '1' ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
- sh -c "if [ '$DEFAULT' = '1' ]; then vendor/bin/phpunit; fi"
- sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=vendor --ignore=docs . ; fi"

- if [[ $CODECOVERAGE == 1 ]]; then vendor/bin/phpunit --coverage-clover=clover.xml || true; fi
- if [[ $CODECOVERAGE == 1 ]]; then wget -O codecov.sh https://codecov.io/bash; fi
- if [[ $CODECOVERAGE == 1 ]]; then bash codecov.sh; fi

notifications:
email: false
4 changes: 2 additions & 2 deletions README.md
@@ -1,7 +1,7 @@
# CakePHP Feed Plugin
[![Build Status](https://api.travis-ci.org/dereuromark/cakephp-feed.svg)](https://travis-ci.org/dereuromark/cakephp-feed)
[![Coverage Status](https://coveralls.io/repos/dereuromark/cakephp-feed/badge.svg)](https://coveralls.io/r/dereuromark/cakephp-feed)
[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D%205.4-8892BF.svg)](https://php.net/)
[![Coverage Status](https://codecov.io/gh/dereuromark/cakephp-feed/branch/master/graph/badge.svg)](https://codecov.io/gh/dereuromark/cakephp-feed)
[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg)](https://php.net/)
[![License](https://poser.pugx.org/dereuromark/cakephp-feed/license.svg)](https://packagist.org/packages/dereuromark/cakephp-feed)
[![Total Downloads](https://poser.pugx.org/dereuromark/cakephp-feed/d/total.svg)](https://packagist.org/packages/dereuromark/cakephp-feed)
[![Coding Standards](https://img.shields.io/badge/cs-PSR--2--R-yellow.svg)](https://github.com/php-fig-rectified/fig-rectified-standards)
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Expand Up @@ -13,21 +13,21 @@
}
],
"require":{
"php": ">=5.4",
"cakephp/cakephp": "~3.0"
"php": ">=5.6",
"cakephp/cakephp": "^3.5"
},
"require-dev": {
"fig-r/psr2r-sniffer": "dev-master"
},
"autoload": {
"psr-4": {
"Feed\\": "src"
"Feed\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Feed\\Test\\": "tests",
"Cake\\Test\\": "vendor/cakephp/cakephp/tests"
"Feed\\Test\\": "tests/",
"Cake\\Test\\": "vendor/cakephp/cakephp/tests/"
}
},
"support":{
Expand Down

0 comments on commit 760f86e

Please sign in to comment.