Merge pull request #196 from dunglas/fix/ci

BREAKING CHANGE: bump all dependencies

Author: dunglas

.editorconfig

@@ -5,67 +5,27 @@
 root = true
 
 [*]
-# Change these settings to your own preference
 indent_style = space
 indent_size = 4
-
-# We recommend you to keep these unchanged
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
 [*.feature]
-indent_style = space
 indent_size = 2
 
 [*.json]
-indent_style = space
 indent_size = 2
 
 [*.md]
 trim_trailing_whitespace = false
 
-[*.php]
-indent_style = space
-indent_size = 4
-
-[*.xml]
-indent_style = space
-indent_size = 4
-
 [*.yml]
-indent_style = space
-indent_size = 4
 trim_trailing_whitespace = false
 
-[.gitmodules]
-indent_style = tab
-
-[.php_cs]
-indent_style = space
-indent_size = 4
-
-[.styleci.yml]
-indent_style = space
-indent_size = 2
-
 [.travis.yml]
-indent_style = space
-indent_size = 2
-
-[appveyor.yml]
-indent_style = space
-indent_size = 2
-
-[behat.yml]
-indent_style = space
 indent_size = 2
 
 [composer.json]
-indent_style = space
-indent_size = 4
-
-[phpunit.xml.dist]
-indent_style = space
 indent_size = 4

.travis.yml

@@ -6,35 +6,32 @@ cache:
 
 matrix:
   include:
-    - php: '7.1'
-    - php: '7.2'
-    - php: '7.3'
+    - php: '7.4'
       env: coverage=1 lint=1
-    - php: '7.3'
+    - php: '7.4'
       env: deps='low'
 
 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"
   - 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
-  - if [[ $lint = 1 ]]; then composer global require --dev 'phpstan/phpstan:^0.11'; fi
-  - wget -O box.phar https://github.com/humbug/box/releases/download/3.8.3/box.phar
+  - if [[ $coverage = 1 ]]; then wget https://github.com/satooshi/php-coveralls/releases/download/v2.2.0/php-coveralls.phar; fi
+  - if [[ $lint = 1 ]]; then wget https://github.com/phpstan/phpstan/releases/download/0.12.9/phpstan.phar; fi
+  - wget -O box.phar https://github.com/humbug/box/releases/download/3.8.4/box.phar
   - export BOX_BIN=$(pwd)/box.phar
 
 install:
-  - 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-stable --prefer-dist --no-progress --no-suggest --ansi; fi
+  - if [[ $coverage = 1 ]]; then composer require --dev --no-update 'phpunit/php-code-coverage:^8.0'; fi
+  - if [[ ! $deps && $TRAVIS_PHP_VERSION = "7.4" ]]; then composer install --prefer-dist --no-progress --no-suggest --ansi; fi
+  - if [[ $TRAVIS_PHP_VERSION != "7.4" ]]; 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 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
+  - if [[ $lint = 1 ]]; then vendor/bin/php-cs-fixer fix --dry-run --diff --no-ansi; fi
+  - if [[ $lint = 1 ]]; then php phpstan.phar analyse; fi
+  - if [[ ! $deps && $TRAVIS_PHP_VERSION = "7.4" ]]; then ./bin/compile; fi
 
 after_success:
   - if [[ $coverage = 1 ]]; then travis_retry php php-coveralls.phar; fi
@@ -48,5 +45,5 @@ deploy:
   on:
     tags: true
     repo: api-platform/schema-generator
-    php:  '7.3'
+    php:  '7.4'
     condition: "! $deps"

bin/compile

@@ -6,6 +6,6 @@ php "$BOX_BIN" compile;
 
 php schema.phar generate-types tmp/ tests/e2e/schema.yml;
 
-diff tests/e2e/src/AppBundle/Entity/Person.php tmp/AppBundle/Entity/Person.php;
-diff tests/e2e/src/AppBundle/Entity/PostalAddress.php tmp/AppBundle/Entity/PostalAddress.php;
-diff tests/e2e/src/AppBundle/Entity/Thing.php tmp/AppBundle/Entity/Thing.php;
+diff tests/e2e/src/App/Entity/Person.php tmp/App/Entity/Person.php;
+diff tests/e2e/src/App/Entity/PostalAddress.php tmp/App/Entity/PostalAddress.php;
+diff tests/e2e/src/App/Entity/Thing.php tmp/App/Entity/Thing.php;

composer.json

@@ -18,27 +18,27 @@
         "psr-4": { "ApiPlatform\\SchemaGenerator\\Tests\\": "tests/" }
     },
     "require": {
-        "php": ">=7.1",
-        "doctrine/inflector": "^1.0",
-        "easyrdf/easyrdf": "^0.9",
+        "php": ">=7.4",
         "ext-json": "*",
+        "doctrine/inflector": "^1.4.3 || ^2.0",
+        "easyrdf/easyrdf": "^0.9",
         "friendsofphp/php-cs-fixer": "^2.15",
-        "league/html-to-markdown": "^4.0",
+        "league/html-to-markdown": "^4.9",
         "psr/log": "^1.0",
-        "symfony/config": "^3.3 || ^4.0 || ^5.0",
-        "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0",
-        "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0",
-        "twig/twig": "^1.35 || ^2.0 || ^3.0"
+        "symfony/config": "^5.1",
+        "symfony/console": "^5.1",
+        "symfony/yaml": "^5.1",
+        "twig/twig": " ^3.0"
     },
     "require-dev": {
-        "api-platform/core": "^2.0",
-        "doctrine/orm": "^2.2",
-        "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"
+        "api-platform/core": "^2.6",
+        "doctrine/orm": "^2.8",
+        "myclabs/php-enum": "^1.7",
+        "symfony/doctrine-bridge": "^5.1",
+        "symfony/filesystem": "^5.1",
+        "symfony/phpunit-bridge": "^5.1",
+        "symfony/serializer": "^5.1",
+        "symfony/validator": "^5.1"
     },
     "bin": ["bin/schema"],
     "minimum-stability": "dev"