Skip to content

Commit

Permalink
Fix remaining Symfony and PHPUnit deprecations (#186)
Browse files Browse the repository at this point in the history
* Symfony 5 compat

* Use PHPStan inferPrivatePropertyTypeFromConstructor
  • Loading branch information
dunglas committed Nov 11, 2019
1 parent f02a7cb commit f3caf7c
Show file tree
Hide file tree
Showing 9 changed files with 196 additions and 113 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ before_install:
- phpenv config-rm xdebug.ini || echo "xdebug not available"
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- export PATH="$PATH:$HOME/.composer/vendor/bin"
- wget -O phpunit.phar https://phar.phpunit.de/phpunit-7.5.phar
- if [[ $coverage = 1 ]]; then mkdir -p build/logs; fi
- if [[ $coverage = 1 ]]; then wget https://github.com/satooshi/php-coveralls/releases/download/v2.1.0/php-coveralls.phar; fi
- if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.0/php-cs-fixer.phar; fi
Expand All @@ -26,13 +25,13 @@ before_install:
- export BOX_BIN=$(pwd)/box.phar

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

script:
- if [[ $coverage = 1 ]]; then phpdbg -qrr phpunit.phar --coverage-clover build/logs/clover.xml; else php phpunit.phar; fi
- if [[ $coverage = 1 ]]; then phpdbg -qrr vendor/bin/simple-phpunit --coverage-clover build/logs/clover.xml; else vendor/bin/simple-phpunit; fi
- if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff --no-ansi; fi
- if [[ $lint = 1 ]]; then phpstan analyse -l5 --ansi src; fi
- if [[ ! $deps && $TRAVIS_PHP_VERSION = "7.3" ]]; then ./bin/compile; fi
Expand Down
7 changes: 5 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,14 @@
"myclabs/php-enum": "^1.0",
"symfony/doctrine-bridge": "^2.7 || ^3.0 || ^4.0 || ^5.0",
"symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0",
"symfony/phpunit-bridge": "^4.3 || ^5.0",
"symfony/serializer": "^2.7 || ^3.0 || ^4.0 || ^5.0",
"symfony/validator": "^2.7 || ^3.0 || ^4.0 || ^5.0"
},
"replace": {
"symfony/polyfill-php70": "*"
"symfony/polyfill-php70": "*",
"symfony/polyfill-php71": "*"
},
"bin": ["bin/schema"]
"bin": ["bin/schema"],
"minimum-stability": "dev"
}
160 changes: 113 additions & 47 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion phpstan.neon
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
parameters:
inferPrivatePropertyTypeFromConstructor: true
ignoreErrors:
- '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\).#'
- '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\)\.#'
# BC layer
- '#Call to function method_exists\(\).*getRootNode. will always evaluate to false\.#'
6 changes: 6 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
bootstrap="tests/bootstrap.php"
backupGlobals="false"
colors="true">
<php>
<server name="SYMFONY_PHPUNIT_VERSION" value="8.3" />
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
<server name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0" />
</php>

<testsuites>
<testsuite name="Project Test Suite">
<directory>tests</directory>
Expand Down
2 changes: 1 addition & 1 deletion src/Command/GenerateTypesCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$graphs = [];
foreach ($processedConfiguration['rdfa'] as $rdfa) {
$graph = new \EasyRdf_Graph();
if ('http://' === substr($rdfa['uri'], 0, 7) || 'https://' === substr($rdfa['uri'], 0, 8)) {
if (0 === strpos($rdfa['uri'], 'http://') || 0 === strpos($rdfa['uri'], 'https://')) {
$graph->load($rdfa['uri'], $rdfa['format']);
} else {
$graph->parseFile($rdfa['uri'], $rdfa['format']);
Expand Down
10 changes: 8 additions & 2 deletions src/TypesGeneratorConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,14 @@ public function getConfigTreeBuilder(): TreeBuilder
{
$namespacePrefix = $this->defaultPrefix ?? 'AppBundle\\';

$treeBuilder = new TreeBuilder();
$rootNode = $treeBuilder->root('config');
if (method_exists(TreeBuilder::class, 'getRootNode')) {
$treeBuilder = new TreeBuilder('config');
$rootNode = $treeBuilder->getRootNode();
} else {
$treeBuilder = new TreeBuilder();
$rootNode = $treeBuilder->root('config');
}

$rootNode
->children()
->arrayNode('rdfa')
Expand Down

0 comments on commit f3caf7c

Please sign in to comment.