Skip to content

Commit ed3c565

Browse files
committed
Update dependencies and drop PHP 7.1
1 parent c2e7ce3 commit ed3c565

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ os:
33
- linux
44
language: php
55
php:
6-
- 7.1
76
- 7.2
87
- 7.3
98
- 7.4
@@ -23,7 +22,7 @@ cache:
2322
before_script:
2423
- if [ "${DEPENDENCIES}" = "lowest" ]; then composer update --prefer-lowest --prefer-dist --no-interaction --no-progress; fi;
2524
- if [ "${DEPENDENCIES}" = "highest" ]; then composer update --prefer-dist --no-interaction --no-progress; fi;
26-
- if [ "${DEPENDENCIES}" = "highest" ]; then pecl install -f ast-1.0.5; fi; # Install AST extension, as phan uses it
25+
- if [ "${DEPENDENCIES}" = "highest" ]; then pecl install -f ast-1.0.7; fi; # Install AST extension, as phan uses it
2726

2827
script:
2928
- xmllint --noout --schema vendor/squizlabs/php_codesniffer/phpcs.xsd MO4/ruleset.xml # validate MO4's ruleset XML

MO4/Sniffs/Formatting/UnnecessaryNamespaceUsageSniff.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,17 @@ protected function getUseStatements(
242242
break;
243243
}
244244

245+
// phpcs:disable
246+
/*
247+
* @var int $aliasNamePtr
248+
*/
245249
$aliasNamePtr = $phpcsFile->findPrevious(
246250
PHP_CodeSniffer_Tokens::$emptyTokens,
247251
($useEnd - 1),
248252
null,
249253
true
250254
);
255+
// phpcs:enable
251256

252257
$length = ($classNameEnd - $classNameStart);
253258
$className = $phpcsFile->getTokensAsString($classNameStart, $length);

composer.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@
2222
"source": "https://github.com/mayflower/mo4-coding-standard"
2323
},
2424
"require-dev": {
25-
"phan/phan": "^2.4.8",
26-
"phpstan/phpdoc-parser": "^0.4.1",
27-
"phpstan/phpstan": "^0.12.2",
25+
"phan/phan": "^3.1.0",
26+
"phpstan/phpstan": "^0.12.33",
2827
"phpstan/phpstan-strict-rules": "^0.12",
2928
"phpunit/phpunit": "^7.0",
3029
"vimeo/psalm": "^3.8"
3130
},
3231
"require": {
33-
"php": "~7.1",
34-
"dealerdirect/phpcodesniffer-composer-installer": "^0.5",
32+
"php": "~7.2",
33+
"dealerdirect/phpcodesniffer-composer-installer": "~0.7",
3534
"escapestudios/symfony2-coding-standard": "^3.10.0",
3635
"slevomat/coding-standard": "^6.0.2",
3736
"squizlabs/php_codesniffer": "^3.5.4"

phpstan.neon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
level: max
3-
autoload_files:
3+
bootstrapFiles:
44
- %rootDir%/../../../tests/bootstrap.php
55
ignoreErrors:
66
- '#^Strict comparison using === between \*NEVER\* and (.*) will always evaluate to false.$#'

0 commit comments

Comments
 (0)