From 94fce3da17ed5ec7a3a246d0448f0c773b5d6c3b Mon Sep 17 00:00:00 2001
From: Andrew Longosz <andrzej.longosz@ez.no>
Date: Mon, 23 Jan 2017 14:01:00 +0100
Subject: [PATCH 1/3] EZP-26881: Fixed RootInfoTest to be BC with Sf2

---
 .../Providers/RootInfoTest.php                | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/Tests/ApplicationConfig/Providers/RootInfoTest.php b/Tests/ApplicationConfig/Providers/RootInfoTest.php
index 947a61a84..0d1ccadb2 100644
--- a/Tests/ApplicationConfig/Providers/RootInfoTest.php
+++ b/Tests/ApplicationConfig/Providers/RootInfoTest.php
@@ -6,6 +6,8 @@
 
 use EzSystems\PlatformUIBundle\ApplicationConfig\Providers\RootInfo;
 use PHPUnit_Framework_TestCase;
+use Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper;
+use Symfony\Component\Asset\Packages;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -16,25 +18,35 @@ class RootInfoTest extends PHPUnit_Framework_TestCase
 
     public function testGetConfig()
     {
-        $provider = new RootInfo($this->createRequestStack(), $this->getAssetsHelperMock(), self::ASSETS_DIR);
+        $provider = new RootInfo($this->createRequestStack(), $this->getAssetsHelper(), self::ASSETS_DIR);
         self::assertEquals(
             ['root' => self::URI, 'assetRoot' => '/', 'ckeditorPluginPath' => '/' . self::ASSETS_DIR . '/vendors/', 'apiRoot' => '/'],
             $provider->getConfig()
         );
     }
 
+    /**
+     * @return \Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper
+     */
+    protected function getAssetsHelper()
+    {
+        return new AssetsHelper(
+            $this->getAssetsPackagesMock()
+        );
+    }
+
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
-    protected function getAssetsHelperMock()
+    protected function getAssetsPackagesMock()
     {
         $assetsHelper = $this
-            ->getMockBuilder('Symfony\Bundle\FrameworkBundle\Templating\Helper\AssetsHelper')
+            ->getMockBuilder(Packages::class)
             ->disableOriginalConstructor()
             ->getMock();
         $assetsHelper->expects($this->any())->method('getUrl')->willReturnMap([
-            ['/', null, null, '/'],
-            [self::ASSETS_DIR, null, null, '/' . self::ASSETS_DIR],
+            ['/', null, '/'],
+            [self::ASSETS_DIR, null, '/' . self::ASSETS_DIR],
         ]);
 
         return $assetsHelper;

From 7773a3223f500c232513337724e941284e5f52e6 Mon Sep 17 00:00:00 2001
From: Andrew Longosz <andrzej.longosz@ez.no>
Date: Mon, 23 Jan 2017 14:03:34 +0100
Subject: [PATCH 2/3] EZP-26881: [Composer] Bumped Symfony to ~2.8|~3.2

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ec7727dbe..7cb0d3560 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         "jms/translation-bundle": "^1.3"
     },
     "require-dev": {
-        "symfony/symfony": "~2.8.0",
+        "symfony/symfony": "~2.8|~3.2",
         "phpunit/phpunit": "~4.7",
         "matthiasnoback/symfony-dependency-injection-test": "^0.7",
         "mockery/mockery": "^0.9.5"

From 66a34789dbc7f50a572b7f474010c7dde9db5e7b Mon Sep 17 00:00:00 2001
From: Andrew Longosz <andrzej.longosz@ez.no>
Date: Mon, 23 Jan 2017 14:13:24 +0100
Subject: [PATCH 3/3] EZP-26881: Allowed running PHPUnit tests with different
 versions of Sf

---
 .travis.yml                | 4 +++-
 bin/travis/setupphpunit.sh | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ac25da379..9cdaf1a15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,9 @@ matrix:
           env: BEFORE="./bin/travis/prepare_behat.sh" TEST_CMD="./bin/travis/runbehat.sh" AFTER_SUCCESS='echo "After success"' RUN_INSTALL=1 COMPOSE_FILE="doc/docker-compose/base-prod.yml:doc/docker-compose/selenium.yml" SYMFONY_ENV=behat SYMFONY_DEBUG=0
         - env: BEFORE="./bin/travis/setupnode.sh" TEST_CMD="./bin/travis/runnode.sh" AFTER_SUCCESS="./bin/travis/generate_apidoc.sh"
         - php: 7.0
-          env: BEFORE="./bin/travis/setupphpunit.sh" TEST_CMD="./vendor/bin/phpunit -c phpunit.xml" AFTER_SUCCESS='echo "After success"'
+          env: BEFORE="./bin/travis/setupphpunit.sh" SYMFONY_VERSION="^2.8" TEST_CMD="./vendor/bin/phpunit -c phpunit.xml" AFTER_SUCCESS='echo "After success"'
+        - php: 7.1
+          env: BEFORE="./bin/travis/setupphpunit.sh" SYMFONY_VERSION="^3.2" TEST_CMD="./vendor/bin/phpunit -c phpunit.xml" AFTER_SUCCESS='echo "After success"'
         - php: 5.6
           env: BEFORE='./bin/travis/setupphpunit.sh' TEST_CMD="./vendor/bin/phpunit -c phpunit.xml" AFTER_SUCCESS='echo "After success"'
 
diff --git a/bin/travis/setupphpunit.sh b/bin/travis/setupphpunit.sh
index e9d8c3565..1e1f85f56 100755
--- a/bin/travis/setupphpunit.sh
+++ b/bin/travis/setupphpunit.sh
@@ -10,5 +10,11 @@ nvm use
 echo "> installing node packages"
 npm install
 
+# Switch to another Symfony version if asked for
+if [ "$SYMFONY_VERSION" != "" ] ; then
+    echo "> Update symfony/symfony requirement to ${SYMFONY_VERSION}"
+    composer require --no-update symfony/symfony="${SYMFONY_VERSION}"
+fi
+
 echo "> Running composer install"
 composer install --prefer-dist