From 958701e469ed5478f6eeb61ffec4579db2fa9cb9 Mon Sep 17 00:00:00 2001
From: Jeremiah VALERIE <jeremiah@over-blog.com>
Date: Thu, 8 Sep 2016 09:28:37 +0200
Subject: [PATCH 1/2] Fix travis build for nightly and 7.1 versions

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb38d5b38..bba4ae06c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ matrix:
           env: SYMFONY_VERSION=3.0.*
         - php: 7.0
           env: SYMFONY_VERSION=3.0.*
-        - php: 7.0
+        - php: 7.1
           env: SYMFONY_VERSION=3.1.*
 
 allow_failures:
@@ -31,7 +31,7 @@ cache:
         - $HOME/.composer/cache
 
 before_install:
-    - if [[ "$TRAVIS_PHP_VERSION" != "5.6" && "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi
+    - if [[ "$TRAVIS_PHP_VERSION" != "5.6" && "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini || true; fi
     - composer selfupdate
     - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
 

From 9fc500cd4b89db7a216f3c683fd8c659a4dc6bae Mon Sep 17 00:00:00 2001
From: Jeremiah VALERIE <jeremiah@over-blog.com>
Date: Thu, 8 Sep 2016 11:02:27 +0200
Subject: [PATCH 2/2] fix base64 tests

---
 Tests/Relay/Node/GlobalIdTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Tests/Relay/Node/GlobalIdTest.php b/Tests/Relay/Node/GlobalIdTest.php
index 52c2ac7bb..2bbf2e577 100644
--- a/Tests/Relay/Node/GlobalIdTest.php
+++ b/Tests/Relay/Node/GlobalIdTest.php
@@ -45,28 +45,28 @@ public function testToGlobalIdWithTypeAndIdEmpty()
 
     public function testFromGlobalId()
     {
-        $params = GlobalId::fromGlobalId('VXNlcjoxNQ==');
+        $params = GlobalId::fromGlobalId(base64_encode('User:15'));
 
         $this->assertEquals(['type' => 'User', 'id' => 15], $params);
     }
 
     public function testFromGlobalIdWithTypeEmpty()
     {
-        $params = GlobalId::fromGlobalId('OjE1=');
+        $params = GlobalId::fromGlobalId(base64_encode(':15'));
 
         $this->assertEquals(['type' => null, 'id' => 15], $params);
     }
 
     public function testFromGlobalIdWithIdEmpty()
     {
-        $params = GlobalId::fromGlobalId('VXNlcjo=');
+        $params = GlobalId::fromGlobalId(base64_encode('User:'));
 
         $this->assertEquals(['type' => 'User', 'id' => null], $params);
     }
 
     public function testFromGlobalIdWithTypeAndIdEmpty()
     {
-        $params = GlobalId::fromGlobalId('Og==');
+        $params = GlobalId::fromGlobalId(base64_encode(':'));
 
         $this->assertEquals(['type' => null, 'id' => null], $params);
     }