Skip to content

Commit c6c0258

Browse files
authored
Merge pull request KnpLabs#734 from KnpLabs/Nyholm-patch-bc
Make sure we do not break BC by accident
2 parents 6e843e6 + e91aba4 commit c6c0258

File tree

3 files changed

+22
-13
lines changed

3 files changed

+22
-13
lines changed

.php_cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
require __DIR__.'/vendor/autoload.php';
3+
$finder = PhpCsFixer\Finder::create()
4+
->in(__DIR__);
45

5-
use SLLH\StyleCIBridge\ConfigBridge;
6+
$config = PhpCsFixer\Config::create()
7+
->setRiskyAllowed(true)
8+
->setRules([
69

7-
$config = ConfigBridge::create();
8-
$config->setUsingCache(true);
9-
10-
if (method_exists($config, 'setRiskyAllowed')) {
11-
$config->setRiskyAllowed(true);
12-
}
10+
])
11+
->setFinder($finder)
12+
;
1313

1414
return $config;

.travis.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ language: php
22
sudo: false
33

44
cache:
5-
directories:
6-
- vendor
7-
- $HOME/.composer/cache
5+
directories:
6+
- vendor
7+
- $HOME/.composer/cache
8+
9+
env:
10+
global:
11+
- TEST_COMMAND="vendor/bin/phpunit --verbose --coverage-text"
812

913
php:
1014
- 5.6
@@ -16,9 +20,15 @@ matrix:
1620
include:
1721
- php: hhvm
1822
dist: trusty
23+
- php: 7.2
24+
name: Backward compatibillity check
25+
env: DEPENDENCIES="roave/backward-compatibility-check" TEST_COMMAND="./vendor/bin/roave-backward-compatibility-check"
26+
27+
before_install:
28+
- if ! [ -z "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
1929

2030
install:
2131
- travis_retry composer install --no-interaction
2232

2333
script:
24-
- vendor/bin/phpunit --verbose --coverage-text
34+
- $TEST_COMMAND

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"php-http/guzzle6-adapter": "^1.0",
3232
"php-http/mock-client": "^1.0",
3333
"guzzlehttp/psr7": "^1.2",
34-
"sllh/php-cs-fixer-styleci-bridge": "^1.3",
3534
"cache/array-adapter": "^0.4"
3635
},
3736
"autoload": {

0 commit comments

Comments
 (0)