Skip to content

Commit 7bc806d

Browse files
authored
Merge pull request #21 from PHPCompatibility/feature/update-phpcs-installer-recommendation
Update version of Composer PHPCS plugin + fix Travis build
2 parents 12874ae + d1b41d2 commit 7bc806d

3 files changed

Lines changed: 22 additions & 17 deletions

File tree

.travis.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,19 @@ matrix:
1717
apt:
1818
packages:
1919
- libxml2-utils
20+
install:
21+
- composer install
22+
2023
- php: 5.4
24+
install:
25+
- composer require --no-update symfony/polyfill-php72:"1.19" symfony/polyfill-php73:"1.19" symfony/polyfill-php74:"1.19"
26+
- composer install
2127

2228
- php: 7.4
2329
env: PHPCOMPAT="dev-develop as 9.99.99"
30+
install:
31+
- composer config minimum-stability dev
32+
- composer require --no-update phpcompatibility/php-compatibility:"${PHPCOMPAT}"
2433

2534
allow_failures:
2635
# Allow failures for unstable builds.
@@ -30,12 +39,8 @@ before_install:
3039
# Speed up build time by disabling Xdebug when its not needed.
3140
- phpenv config-rm xdebug.ini || echo 'No xdebug config.'
3241
- export XMLLINT_INDENT=" "
33-
- |
34-
if [[ $PHPCOMPAT ]]; then
35-
composer config minimum-stability dev
36-
composer require --no-update phpcompatibility/php-compatibility:"${PHPCOMPAT}"
37-
fi
38-
- composer install
42+
43+
before_script:
3944
- vendor/bin/phpcs -i
4045

4146
script:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The only supported installation method is via [Composer](https://getcomposer.org
5353

5454
If you don't have a Composer plugin installed to manage the `installed_paths` setting for PHP_CodeSniffer, run the following from the command-line:
5555
```bash
56-
composer require --dev dealerdirect/phpcodesniffer-composer-installer:^0.6 phpcompatibility/phpcompatibility-symfony:*
56+
composer require --dev dealerdirect/phpcodesniffer-composer-installer:"^0.7" phpcompatibility/phpcompatibility-symfony:*
5757
composer install
5858
```
5959

composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
"phpcompatibility/phpcompatibility-passwordcompat" : "^1.0"
2424
},
2525
"require-dev" : {
26-
"dealerdirect/phpcodesniffer-composer-installer": "^0.6",
27-
"symfony/polyfill-php54": "dev-master",
28-
"symfony/polyfill-php55": "dev-master",
29-
"symfony/polyfill-php56": "dev-master",
30-
"symfony/polyfill-php70": "dev-master",
31-
"symfony/polyfill-php71": "dev-master",
32-
"symfony/polyfill-php72": "dev-master",
33-
"symfony/polyfill-php73": "dev-master",
34-
"symfony/polyfill-php74": "dev-master"
26+
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
27+
"symfony/polyfill-php54": "1.19",
28+
"symfony/polyfill-php55": "1.19",
29+
"symfony/polyfill-php56": "1.19",
30+
"symfony/polyfill-php70": "1.19",
31+
"symfony/polyfill-php71": "1.19",
32+
"symfony/polyfill-php72": "dev-main",
33+
"symfony/polyfill-php73": "dev-main",
34+
"symfony/polyfill-php74": "dev-main"
3535
},
3636
"suggest" : {
37-
"dealerdirect/phpcodesniffer-composer-installer": "^0.6 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
37+
"dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
3838
"roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
3939
},
4040
"prefer-stable" : true

0 commit comments

Comments
 (0)