From 2224e5f31a4562a2c2d98319d067080686e8ab1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Mon, 22 Jan 2018 21:24:23 +0100
Subject: [PATCH 1/2] Run the test suite with 7.2. Bump some versions.

---
 .travis.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2f62d81a..688e5ecc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,33 +9,34 @@ cache:
 matrix:
   include:
     - php: '7.1'
+    - php: '7.2'
       env: coverage=1 lint=1
-    - php: '7.1'
+    - php: '7.2'
       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"
-  - wget https://phar.phpunit.de/phpunit-6.3.phar
+  - wget https://phar.phpunit.de/phpunit-6.5.phar
   - composer global require humbug/php-scoper:dev-master#674e24d2b9e90b2f629dab7f30d5070e4d49d815
   - if [[ $coverage = 1 ]]; then mkdir -p build/logs; fi
-  - if [[ $coverage = 1 ]]; then wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar; fi
-  - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.4.0/php-cs-fixer.phar; fi
+  - if [[ $coverage = 1 ]]; then wget https://github.com/satooshi/php-coveralls/releases/download/v2.0.0/php-coveralls.phar; fi
+  - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.10.0/php-cs-fixer.phar; fi
   - if [[ $lint = 1 ]]; then composer global require --dev 'phpstan/phpstan:^0.8'; fi
-  - if [[ $TRAVIS_PHP_VERSION = "7.1" ]]; then curl -LSs https://box-project.github.io/box2/installer.php | php; fi;
+  - if [[ ! $deps && $TRAVIS_PHP_VERSION = "7.2" ]]; then curl -LSs https://box-project.github.io/box2/installer.php | php; fi;
 
 install:
-  - if [[ $coverage = 1 ]]; then composer require --dev --no-update 'phpunit/php-code-coverage:^4.0.1'; fi
+  - if [[ $coverage = 1 ]]; then composer require --dev --no-update 'phpunit/php-code-coverage:^5.3'; fi
   - if [[ ! $deps ]]; then composer update --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-6.3.phar --coverage-clover build/logs/clover.xml; else php phpunit-6.3.phar; fi
+  - if [[ $coverage = 1 ]]; then phpdbg -qrr phpunit-6.3.phar --coverage-clover build/logs/clover.xml; else php phpunit-6.5.phar; 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.1" ]]; then
+    if [[ ! $deps && $TRAVIS_PHP_VERSION = "7.2" ]]; then
       composer install --no-dev --prefer-dist --classmap-authoritative --no-progress --no-suggest --ansi;
       ~/.composer/vendor/bin/php-scoper add-prefix --output-dir=build/schema-generator;
       composer --working-dir=build/schema-generator dump-autoload --classmap-authoritative --no-dev;
@@ -47,7 +48,7 @@ script:
     fi;
 
 after_success:
-  - if [[ $coverage = 1 ]]; then travis_retry php coveralls.phar; fi
+  - if [[ $coverage = 1 ]]; then travis_retry php php-coveralls.phar; fi
 
 deploy:
   provider: releases
@@ -58,5 +59,5 @@ deploy:
   on:
     tags: true
     repo: api-platform/schema-generator
-    php:  '7.1'
+    php:  '7.2'
     condition: "! $deps"

From 6dda07305e8f84b0b825b34364c025a63a0967ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Mon, 22 Jan 2018 21:43:23 +0100
Subject: [PATCH 2/2] Bump Twig

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index c1dff595..5189f145 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "symfony/config": "^3.3 || ^4.0",
         "symfony/console": "^2.7 || ^3.0 || ^4.0",
         "symfony/yaml": "^2.7 || ^3.0 || ^4.0",
-        "twig/twig": "^1.12 || ^2.0"
+        "twig/twig": "^1.35 || ^2.0"
     },
     "require-dev": {
         "api-platform/core": "^2.0",
diff --git a/composer.lock b/composer.lock
index 0bf3b257..711b17c2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "0ff34e36290f89e98b3cb1db34a9e5f1",
+    "content-hash": "d95ef7692bb83272a47530174562d162",
     "packages": [
         {
             "name": "composer/semver",