Merge pull request #504 from Tetragramat/master

Added symfony 5 into travis

.travis.yml

@@ -12,26 +12,26 @@ cache:
 
 matrix:
   include:
-    - php: 7.0
-      env: SYMFONY_VERSION=v3
     - php: 7.1
-      env: SYMFONY_VERSION=v3
+      env: SYMFONY_REQUIRE=^4
     - php: 7.2
-      env: SYMFONY_VERSION=v3
-    - php: 7.1
-      env: SYMFONY_VERSION=v4
+      env: SYMFONY_REQUIRE=^4
+    - php: 7.3
+      env: SYMFONY_REQUIRE=^4
+    - php: 7.4snapshot
+      env: SYMFONY_REQUIRE=^4
     - php: 7.2
-      env: SYMFONY_VERSION=v4
+      env: SYMFONY_REQUIRE=^5
     - php: 7.3
-      env: SYMFONY_VERSION=v4
+      env: SYMFONY_REQUIRE=^5
     - php: 7.4snapshot
-      env: SYMFONY_VERSION=v4
+      env: SYMFONY_REQUIRE=^5
 
 before_install:
     - composer self-update
 
 install:
-    - composer require dunglas/symfony-lock:${SYMFONY_VERSION} --no-update
+    - composer require symfony/flex --no-update
     - composer install --prefer-source
 
 notifications:

Tests/DependencyInjection/MainConfigurationTest.php

@@ -3,11 +3,12 @@
 
 use Payum\Bundle\PayumBundle\DependencyInjection\MainConfiguration;
 use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\StorageFactoryInterface;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 
-class MainConfigurationTest extends  \PHPUnit_Framework_TestCase
+class MainConfigurationTest extends TestCase
 {
     protected $storageFactories = array();
 
@@ -754,4 +755,4 @@ public function addConfiguration(ArrayNodeDefinition $builder)
             ->end()
         ;
     }
-}
+}

Tests/DependencyInjection/PayumExtensionTest.php

@@ -7,8 +7,9 @@
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Payum\Bundle\PayumBundle\DependencyInjection\PayumExtension;
+use PHPUnit\Framework\TestCase;
 
-class PayumExtensionTest extends  \PHPUnit_Framework_TestCase
+class PayumExtensionTest extends TestCase
 {
     /**
      * @test

Tests/Functional/DependencyInjection/MainConfigurationTest.php

@@ -5,8 +5,9 @@
 use Payum\Bundle\PayumBundle\DependencyInjection\MainConfiguration;
 use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\DoctrineStorageFactory;
 use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\FilesystemStorageFactory;
+use PHPUnit\Framework\TestCase;
 
-class MainConfigurationTest extends  \PHPUnit_Framework_TestCase
+class MainConfigurationTest extends TestCase
 {
     protected $storageFactories = array();
 
@@ -298,4 +299,4 @@ public function shouldPassConfigurationProcessingWithFilesystemStorageFactory()
             )
         ));
     }
-}
+}

Tests/Functional/DependencyInjection/PayumExtensionTest.php

@@ -6,10 +6,11 @@
 use Payum\Core\Bridge\Defuse\Security\DefuseCypher;
 use Payum\Core\Model\GatewayConfigInterface;
 use Payum\Core\Storage\CryptoStorageDecorator;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-class PayumExtensionTest extends  \PHPUnit_Framework_TestCase
+class PayumExtensionTest extends TestCase
 {
     /**
      * @test
@@ -384,4 +385,4 @@ public function setConfig(array $config)
     public function getConfig()
     {
     }
-}
+}

Tests/Sonata/GatewayConfigAdminTest.php

@@ -10,7 +10,7 @@ class GatewayConfigAdminTest extends TestCase
 {
     public static function setUpBeforeClass()
     {
-        throw new \PHPUnit_Framework_SkippedTestError();
+        self::markTestSkipped();
     }
 
     /**

composer.json

@@ -37,21 +37,22 @@
         }
     ],
     "require": {
-        "php": "^7.0",
+        "php": "^7.1.3",
         "payum/core": "^1.5",
-        "symfony/framework-bundle": "^3.1|^4|^5",
-        "symfony/form": "^3.1|^4|^5",
-        "symfony/validator": "^3.1|^4|^5",
-        "symfony/security-csrf": "^3.1|^4|^5"
+        "symfony/framework-bundle": "^4.4|^5",
+        "symfony/form": "^4.4|^5",
+        "symfony/validator": "^4.4|^5",
+        "symfony/security-csrf": "^4.4|^5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^7.5",
         "twig/twig": "^1.16|^2.0",
-        "symfony/twig-bundle": "^3.1|^4|^5",
-        "symfony/expression-language": "^3.1|^4|^5",
-        "symfony/browser-kit": "^3.1|^4|^5",
-        "symfony/phpunit-bridge": "^3.1|^4|^5",
-        "symfony/templating": "^3.1|^4|^5",
+        "symfony/twig-bundle": "^4.4|^5",
+        "symfony/expression-language": "^4.4|^5",
+        "symfony/browser-kit": "^4.4|^5",
+        "symfony/phpunit-bridge": "^4.4|^5",
+        "symfony/templating": "^4.4|^5",
+        "symfony/yaml": "^4.4|^5",
         "defuse/php-encryption": "^2",
         "doctrine/orm": "~2.5",
         "payum/payum": "^1.5@dev",

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./Tests/bootstrap.php" color="true">
+<phpunit bootstrap="./Tests/bootstrap.php">
     <testsuites>
         <testsuite name="PayumBundle">
             <directory suffix="Test.php">./Tests</directory>