Skip to content

Commit f3caf7c

Browse files
authored
Fix remaining Symfony and PHPUnit deprecations (#186)
* Symfony 5 compat * Use PHPStan inferPrivatePropertyTypeFromConstructor
1 parent f02a7cb commit f3caf7c

File tree

9 files changed

+196
-113
lines changed

9 files changed

+196
-113
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ before_install:
1717
- phpenv config-rm xdebug.ini || echo "xdebug not available"
1818
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
1919
- export PATH="$PATH:$HOME/.composer/vendor/bin"
20-
- wget -O phpunit.phar https://phar.phpunit.de/phpunit-7.5.phar
2120
- if [[ $coverage = 1 ]]; then mkdir -p build/logs; fi
2221
- if [[ $coverage = 1 ]]; then wget https://github.com/satooshi/php-coveralls/releases/download/v2.1.0/php-coveralls.phar; fi
2322
- if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.0/php-cs-fixer.phar; fi
@@ -26,13 +25,13 @@ before_install:
2625
- export BOX_BIN=$(pwd)/box.phar
2726

2827
install:
29-
- if [[ $coverage = 1 ]]; then composer require --dev --no-update 'phpunit/php-code-coverage:^5.3'; fi
28+
- if [[ $coverage = 1 ]]; then composer require --dev --no-update 'phpunit/php-code-coverage:^7.0'; fi
3029
- if [[ ! $deps && $TRAVIS_PHP_VERSION = "7.3" ]]; then composer install --prefer-dist --no-progress --no-suggest --ansi; fi
31-
- if [[ $TRAVIS_PHP_VERSION != "7.3" ]]; then composer update --prefer-dist --no-progress --no-suggest --ansi; fi
30+
- if [[ $TRAVIS_PHP_VERSION != "7.3" ]]; then composer update --prefer-stable --prefer-dist --no-progress --no-suggest --ansi; fi
3231
- if [[ $deps = 'low' ]]; then composer update --prefer-dist --no-progress --no-suggest --prefer-stable --prefer-lowest --ansi; fi
3332

3433
script:
35-
- if [[ $coverage = 1 ]]; then phpdbg -qrr phpunit.phar --coverage-clover build/logs/clover.xml; else php phpunit.phar; fi
34+
- if [[ $coverage = 1 ]]; then phpdbg -qrr vendor/bin/simple-phpunit --coverage-clover build/logs/clover.xml; else vendor/bin/simple-phpunit; fi
3635
- if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff --no-ansi; fi
3736
- if [[ $lint = 1 ]]; then phpstan analyse -l5 --ansi src; fi
3837
- if [[ ! $deps && $TRAVIS_PHP_VERSION = "7.3" ]]; then ./bin/compile; fi

composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,14 @@
3636
"myclabs/php-enum": "^1.0",
3737
"symfony/doctrine-bridge": "^2.7 || ^3.0 || ^4.0 || ^5.0",
3838
"symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0",
39+
"symfony/phpunit-bridge": "^4.3 || ^5.0",
3940
"symfony/serializer": "^2.7 || ^3.0 || ^4.0 || ^5.0",
4041
"symfony/validator": "^2.7 || ^3.0 || ^4.0 || ^5.0"
4142
},
4243
"replace": {
43-
"symfony/polyfill-php70": "*"
44+
"symfony/polyfill-php70": "*",
45+
"symfony/polyfill-php71": "*"
4446
},
45-
"bin": ["bin/schema"]
47+
"bin": ["bin/schema"],
48+
"minimum-stability": "dev"
4649
}

composer.lock

Lines changed: 113 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpstan.neon

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
parameters:
2+
inferPrivatePropertyTypeFromConstructor: true
23
ignoreErrors:
3-
- '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\).#'
4+
- '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\)\.#'
5+
# BC layer
6+
- '#Call to function method_exists\(\).*getRootNode. will always evaluate to false\.#'

phpunit.xml.dist

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
bootstrap="tests/bootstrap.php"
77
backupGlobals="false"
88
colors="true">
9+
<php>
10+
<server name="SYMFONY_PHPUNIT_VERSION" value="8.3" />
11+
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
12+
<server name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0" />
13+
</php>
14+
915
<testsuites>
1016
<testsuite name="Project Test Suite">
1117
<directory>tests</directory>

src/Command/GenerateTypesCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
133133
$graphs = [];
134134
foreach ($processedConfiguration['rdfa'] as $rdfa) {
135135
$graph = new \EasyRdf_Graph();
136-
if ('http://' === substr($rdfa['uri'], 0, 7) || 'https://' === substr($rdfa['uri'], 0, 8)) {
136+
if (0 === strpos($rdfa['uri'], 'http://') || 0 === strpos($rdfa['uri'], 'https://')) {
137137
$graph->load($rdfa['uri'], $rdfa['format']);
138138
} else {
139139
$graph->parseFile($rdfa['uri'], $rdfa['format']);

src/TypesGeneratorConfiguration.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,14 @@ public function getConfigTreeBuilder(): TreeBuilder
5353
{
5454
$namespacePrefix = $this->defaultPrefix ?? 'AppBundle\\';
5555

56-
$treeBuilder = new TreeBuilder();
57-
$rootNode = $treeBuilder->root('config');
56+
if (method_exists(TreeBuilder::class, 'getRootNode')) {
57+
$treeBuilder = new TreeBuilder('config');
58+
$rootNode = $treeBuilder->getRootNode();
59+
} else {
60+
$treeBuilder = new TreeBuilder();
61+
$rootNode = $treeBuilder->root('config');
62+
}
63+
5864
$rootNode
5965
->children()
6066
->arrayNode('rdfa')

0 commit comments

Comments
 (0)