Skip to content
This repository was archived by the owner on Oct 29, 2020. It is now read-only.

Commit ec4cda2

Browse files
alcaeusalcaeus
authored
Merge pull request #147 from alcaeus/drop-old-php
Drop support for PHP < 7.1
2 parents fe1af2e + 17072b1 commit ec4cda2

File tree

6 files changed

+77
-91
lines changed

6 files changed

+77
-91
lines changed

‎.coveralls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# for php-coveralls
22
service_name: travis-ci
33
src_dir: ./
4-
coverage_clover: build/logs/clover.xml
4+
coverage_clover: clover.xml

‎.travis.yml

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,53 @@ language: php
22
sudo: false
33
dist: trusty
44

5+
php:
6+
- 7.1
7+
- 7.2
8+
- 7.3
9+
- nightly
10+
11+
matrix:
12+
allow_failures:
13+
- php: nightly
14+
515
cache:
6-
directories:
7-
- $HOME/.composer/cache
16+
directories:
17+
- $HOME/.composer/cache
818

919
services:
10-
- riak
11-
- mongodb
12-
- memcached
13-
- redis-server
20+
- mongodb
21+
- memcached
22+
- redis-server
23+
24+
jobs:
25+
include:
26+
# Test against lowest dependencies
27+
- stage: Test
28+
php: 7.1
29+
env: COMPOSER_FLAGS="--prefer-lowest"
30+
31+
# Test against dev dependencies on the newest version
32+
- stage: Test
33+
php: 7.3
34+
env: DEPS="dev"
1435

15-
before_script:
16-
- ./Tests/travis/install-deps.sh
17-
- composer self-update
18-
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
19-
- composer update --prefer-dist
36+
- stage: Code Quality
37+
php: 7.1
38+
script:
39+
- ./vendor/bin/phpcs -np --extensions=php --ignore=vendor/*,Tests/* --standard=ruleset.xml .
40+
after_script:
41+
42+
before_install:
43+
- echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
44+
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
45+
46+
install:
47+
- if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
48+
- composer update --prefer-dist $COMPOSER_FLAGS
2049

2150
script:
22-
- ./vendor/bin/phpunit -v --coverage-clover ./build/logs/clover.xml
23-
- ./vendor/bin/phpcs -np --extensions=php --ignore=vendor/*,Tests/* --standard=ruleset.xml .
51+
- ./vendor/bin/phpunit -v --coverage-clover clover.xml
2452

2553
after_script:
26-
- php ./vendor/bin/coveralls -v
27-
28-
matrix:
29-
exclude:
30-
- php: 5.3
31-
dist: trusty
32-
allow_failures:
33-
- php: nightly
34-
include:
35-
- php: 5.3
36-
dist: precise
37-
env: COMPOSER_MEMORY_LIMIT=-1
38-
- php: 5.4
39-
- php: 5.5
40-
- php: 5.6
41-
env: DEPS="dev" COMPOSER_MEMORY_LIMIT=-1
42-
- php: 7.0
43-
- php: 7.1
44-
- php: 7.2
45-
- php: 7.3
46-
- php: nightly
54+
- php ./vendor/bin/coveralls -v

‎Tests/travis/install-deps.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎Tests/travis/php.ini

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎composer.json

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
{
2-
"name": "doctrine/doctrine-cache-bundle",
3-
"homepage": "https://www.doctrine-project.org",
4-
"description": "Symfony Bundle for Doctrine Cache",
5-
"keywords": ["cache", "caching"],
6-
"type": "symfony-bundle",
7-
"license": "MIT",
2+
"name": "doctrine/doctrine-cache-bundle",
3+
"homepage": "https://www.doctrine-project.org",
4+
"description": "Symfony Bundle for Doctrine Cache",
5+
"keywords": ["cache", "caching"],
6+
"type": "symfony-bundle",
7+
"license": "MIT",
88
"authors": [
99
{
10-
"name": "Fabien Potencier",
11-
"email": "[email protected]"
10+
"name": "Fabien Potencier",
11+
"email": "[email protected]"
1212
},
1313
{
14-
"name": "Benjamin Eberlei",
15-
"email": "[email protected]"
14+
"name": "Benjamin Eberlei",
15+
"email": "[email protected]"
1616
},
1717
{
18-
"name": "Fabio B. Silva",
19-
"email": "[email protected]"
18+
"name": "Fabio B. Silva",
19+
"email": "[email protected]"
2020
},
2121
{
22-
"name": "Guilherme Blanco",
23-
"email": "[email protected]"
22+
"name": "Guilherme Blanco",
23+
"email": "[email protected]"
2424
},
2525
{
26-
"name": "Symfony Community",
26+
"name": "Symfony Community",
2727
"homepage": "http://symfony.com/contributors"
2828
},
2929
{
30-
"name": "Doctrine Project",
30+
"name": "Doctrine Project",
3131
"homepage": "http://www.doctrine-project.org/"
3232
}
3333
],
3434
"require": {
35-
"php": ">=5.3.2",
36-
"symfony/doctrine-bridge": "~2.7|~3.3|~4.0",
37-
"doctrine/inflector": "~1.0",
38-
"doctrine/cache": "^1.4.2"
35+
"php": "^7.1",
36+
"symfony/doctrine-bridge": "^3.4|^4.0",
37+
"doctrine/inflector": "^1.0",
38+
"doctrine/cache": "^1.4.2"
3939
},
4040
"require-dev": {
41-
"phpunit/phpunit": "~4.8.36|~5.6|~6.5|~7.0",
42-
"symfony/phpunit-bridge": "~2.7|~3.3|~4.0",
43-
"symfony/yaml": "~2.7|~3.3|~4.0",
44-
"symfony/validator": "~2.7|~3.3|~4.0",
45-
"symfony/console": "~2.7|~3.3|~4.0",
46-
"symfony/finder": "~2.7|~3.3|~4.0",
47-
"symfony/framework-bundle": "~2.7|~3.3|~4.0",
48-
"symfony/security-acl": "~2.7|~3.3",
49-
"instaclick/coding-standard": "~1.1",
50-
"satooshi/php-coveralls": "^1.0",
51-
"squizlabs/php_codesniffer": "~1.5",
41+
"phpunit/phpunit": "^7.0",
42+
"symfony/phpunit-bridge": "^3.4|^4.0",
43+
"symfony/yaml": "^3.4|^4.0",
44+
"symfony/validator": "^3.4|^4.0",
45+
"symfony/console": "^3.4|^4.0",
46+
"symfony/finder": "^3.4|^4.0",
47+
"symfony/framework-bundle": "^3.4|^4.0",
48+
"symfony/security-acl": "^2.8",
49+
"instaclick/coding-standard": "~1.1",
50+
"satooshi/php-coveralls": "^1.0",
51+
"squizlabs/php_codesniffer": "~1.5",
5252
"instaclick/object-calisthenics-sniffs": "dev-master",
53-
"instaclick/symfony2-coding-standard": "dev-remaster",
54-
"predis/predis": "~0.8"
53+
"instaclick/symfony2-coding-standard": "dev-remaster",
54+
"predis/predis": "~0.8"
5555
},
5656
"suggest": {
5757
"symfony/security-acl": "For using this bundle to cache ACLs"
@@ -67,7 +67,7 @@
6767
},
6868
"extra": {
6969
"branch-alias": {
70-
"dev-master": "1.3.x-dev"
70+
"dev-master": "1.4.x-dev"
7171
}
7272
}
7373
}

‎phpunit.xml.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
processIsolation="false"
88
backupGlobals="false"
99
stopOnFailure="false"
10-
syntaxCheck="false"
1110
colors="true">
1211

1312
<testsuites>

0 commit comments

Comments
 (0)