PaymentSuite · almacbe · Jun 13, 2018 · Jun 13, 2018 · Jun 13, 2018 · Jun 13, 2018
diff --git a/.gitsplit.yml b/.gitsplit.yml
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,8 @@ language: php
 sudo: false
 
 php:
-  - 5.5
-  - 5.6
-  - 7.0
   - 7.1
+  - 7.2
 
 matrix:
   fast_finish: true

diff --git a/README.md b/README.md
@@ -7,6 +7,10 @@
 Paymentsuite is a suite of payment Bundles built on top of Symfony and under
 [MIT](http://opensource.org/licenses/MIT) license.
 
+### Important
+
+This branch intended use is for symfony 3.4 and php 7.1
+
 ### Tags
 
 * Use last unstable version ( alias of `dev-master` ) to stay always in last 

diff --git a/composer.json b/composer.json
@@ -21,15 +21,15 @@
         }
     ],
     "require": {
-        "php": "^5.5|^7.0",
-        "symfony/finder": "^2.8|^3.0",
-        "symfony/config": "^2.8|^3.0",
-        "symfony/framework-bundle": "^2.8|^3.0",
-        "symfony/form": "^2.8|^3.0",
-        "symfony/http-kernel": "^2.8|^3.0",
-        "symfony/dependency-injection": "^2.8|^3.0",
-        "symfony/options-resolver": "^2.8|^3.0",
-        "mmoreram/symfony-bundle-dependencies": "^1.0",
+        "php": "^7.1",
+        "symfony/finder": "^3.4",
+        "symfony/config": "^3.4",
+        "symfony/framework-bundle": "^3.4",
+        "symfony/form": "^3.4",
+        "symfony/http-kernel": "^3.4",
+        "symfony/dependency-injection": "^3.4",
+        "symfony/options-resolver": "^3.4",
+        "mmoreram/symfony-bundle-dependencies": "^2.0",
         "psr/log": "^1.0",
         "twig/twig": "^1.23.1",
         "stripe/stripe-php": "3.4.0",
@@ -38,10 +38,9 @@
     },
     "require-dev": {
         "elcodi/test-common-bundle": "^2.0",
-        "elcodi/fixtures-booster-bundle": "^2.0",
         "mmoreram/php-formatter": "1.1.0",
-        "fabpot/php-cs-fixer": "1.11",
-        "phpunit/phpunit": "<6.0"
+        "friendsofphp/php-cs-fixer": "^2.0",
+        "phpunit/phpunit": "^7.0"
     },
     "replace": {
         "paymentsuite/bankwire-bundle": "self.version",

diff --git a/src/PaymentSuite/BankwireBundle/BankwireBundle.php b/src/PaymentSuite/BankwireBundle/BankwireBundle.php
@@ -44,7 +44,7 @@ public function getContainerExtension()
      *
      * @return array Bundle instances
      */
-    public static function getBundleDependencies(KernelInterface $kernel)
+    public static function getBundleDependencies(KernelInterface $kernel): array
     {
         return [
             'PaymentSuite\PaymentCoreBundle\PaymentCoreBundle',

diff --git a/src/PaymentSuite/BankwireBundle/Resources/config/controllers.yml b/src/PaymentSuite/BankwireBundle/Resources/config/controllers.yml
@@ -6,7 +6,7 @@ services:
     paymentsuite.bankwire.payment_controller:
         class: PaymentSuite\BankwireBundle\Controller\PaymentController
         arguments:
-            - "@paymentsuite.bankwire.manager"
-            - "@paymentsuite.bankwire.route_success"
-            - "@paymentsuite.bridge"
-            - "@router"
+            - @paymentsuite.bankwire.manager'
+            - @paymentsuite.bankwire.route_success'
+            - @paymentsuite.bridge'
+            - @router'
diff --git a/src/PaymentSuite/BankwireBundle/Resources/config/services.yml b/src/PaymentSuite/BankwireBundle/Resources/config/services.yml
@@ -9,6 +9,6 @@ services:
     paymentsuite.bankwire.manager:
         class: PaymentSuite\BankwireBundle\Services\BankwireManager
         arguments:
-            - "@paymentsuite.bankwire.method_factory"
-            - "@paymentsuite.bridge"
-            - "@paymentsuite.event_dispatcher"
+            - '@paymentsuite.bankwire.method_factory'
+            - '@paymentsuite.bridge'
+            - '@paymentsuite.event_dispatcher'
diff --git a/src/PaymentSuite/BankwireBundle/composer.json b/src/PaymentSuite/BankwireBundle/composer.json
@@ -21,21 +21,21 @@
         }
     ],
     "require": {
-        "php": "^5.4|^7.0",
+        "php": "^7.1",
 
-        "symfony/framework-bundle": "^2.7|^3.0",
-        "symfony/form": "^2.7|^3.0",
-        "symfony/config": "^2.7|^3.0",
-        "symfony/http-kernel": "^2.7|^3.0",
-        "symfony/dependency-injection": "^2.7|^3.0",
-        "mmoreram/symfony-bundle-dependencies": "^1.0",
+        "symfony/framework-bundle": "^3.4",
+        "symfony/form": "^3.4",
+        "symfony/config": "^3.4",
+        "symfony/http-kernel": "^3.4",
+        "symfony/dependency-injection": "^3.4",
+        "mmoreram/symfony-bundle-dependencies": "^2.0",
 
         "paymentsuite/payment-core-bundle": "^2.0"
     },
     "require-dev": {
         "elcodi/test-common-bundle": "^2.0",
         "elcodi/fixtures-booster-bundle": "^2.0",
-        "phpunit/phpunit": "<6.0"
+        "phpunit/phpunit": "^7.0"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +44,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "3.0-dev"
         }
     }
 }
diff --git a/src/PaymentSuite/FreePaymentBundle/FreePaymentBundle.php b/src/PaymentSuite/FreePaymentBundle/FreePaymentBundle.php
@@ -44,7 +44,7 @@ public function getContainerExtension()
      *
      * @return array Bundle instances
      */
-    public static function getBundleDependencies(KernelInterface $kernel)
+    public static function getBundleDependencies(KernelInterface $kernel): array
     {
         return [
             'PaymentSuite\PaymentCoreBundle\PaymentCoreBundle',

diff --git a/src/PaymentSuite/FreePaymentBundle/Resources/config/controllers.yml b/src/PaymentSuite/FreePaymentBundle/Resources/config/controllers.yml
@@ -6,7 +6,7 @@ services:
     paymentsuite.freepayment.payment_controller:
         class: PaymentSuite\FreePaymentBundle\Controller\PaymentController
         arguments:
-            - "@paymentsuite.freepayment.manager"
-            - "@paymentsuite.freepayment.route_success"
-            - "@paymentsuite.bridge"
-            - "@router"
+            - '@paymentsuite.freepayment.manager'
+            - '@paymentsuite.freepayment.route_success'
+            - '@paymentsuite.bridge'
+            - '@router'
diff --git a/src/PaymentSuite/FreePaymentBundle/Resources/config/services.yml b/src/PaymentSuite/FreePaymentBundle/Resources/config/services.yml
@@ -9,6 +9,6 @@ services:
     paymentsuite.freepayment.manager:
         class: PaymentSuite\FreePaymentBundle\Services\FreePaymentManager
         arguments:
-            - "@paymentsuite.freepayment.method_factory"
-            - "@paymentsuite.bridge"
-            - "@paymentsuite.event_dispatcher"
+            - '@paymentsuite.freepayment.method_factory'
+            - '@paymentsuite.bridge'
+            - '@paymentsuite.event_dispatcher'
diff --git a/src/PaymentSuite/FreePaymentBundle/composer.json b/src/PaymentSuite/FreePaymentBundle/composer.json
@@ -21,21 +21,21 @@
         }
     ],
     "require": {
-        "php": "^5.4|^7.0",
+        "php": "^7.1",
 
-        "symfony/framework-bundle": "^2.7|^3.0",
-        "symfony/form": "^2.7|^3.0",
-        "symfony/config": "^2.7|^3.0",
-        "symfony/http-kernel": "^2.7|^3.0",
-        "symfony/dependency-injection": "^2.7|^3.0",
-        "mmoreram/symfony-bundle-dependencies": "^1.0",
+        "symfony/framework-bundle": "^3.4",
+        "symfony/form": "^3.4",
+        "symfony/config": "^3.4",
+        "symfony/http-kernel": "^3.4",
+        "symfony/dependency-injection": "^3.4",
+        "mmoreram/symfony-bundle-dependencies": "^2.0",
 
         "paymentsuite/payment-core-bundle": "^2.0"
     },
     "require-dev": {
         "elcodi/test-common-bundle": "^2.0",
         "elcodi/fixtures-booster-bundle": "^2.0",
-        "phpunit/phpunit": "<6.0"
+        "phpunit/phpunit": "^7.0"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +44,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "3.0-dev"
         }
     }
 }
diff --git a/src/PaymentSuite/PaylandsBundle/PaylandsBundle.php b/src/PaymentSuite/PaylandsBundle/PaylandsBundle.php
@@ -38,7 +38,7 @@ protected function getContainerExtensionClass()
     /**
      * {@inheritdoc}
      */
-    public static function getBundleDependencies(KernelInterface $kernel)
+    public static function getBundleDependencies(KernelInterface $kernel): array
     {
         return [
             'PaymentSuite\PaymentCoreBundle\PaymentCoreBundle',

diff --git a/src/PaymentSuite/PaylandsBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/PaymentSuite/PaylandsBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -15,6 +15,7 @@
 
 namespace PaymentSuite\PaylandsBundle\Tests\DependencyInjection;
 
+use PHPUnit\Framework\TestCase;
 use WAM\Paylands\ClientInterface;
 use PaymentSuite\PaylandsBundle\DependencyInjection\Configuration;
 
@@ -23,7 +24,7 @@
  *
  * @author WAM Team <develop@wearemarketing.com>
  */
-class ConfigurationTest extends \PHPUnit_Framework_TestCase
+class ConfigurationTest extends TestCase
 {
     /**
      * @var array

diff --git a/src/PaymentSuite/PaylandsBundle/Tests/Services/PaylandsCurrencyServiceResolverTest.php b/src/PaymentSuite/PaylandsBundle/Tests/Services/PaylandsCurrencyServiceResolverTest.php
@@ -17,13 +17,14 @@
 
 use PaymentSuite\PaylandsBundle\Services\PaylandsCurrencyServiceResolver;
 use PaymentSuite\PaymentCoreBundle\Services\Interfaces\PaymentBridgeInterface;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class PaylandsCurrencyServiceResolverTest.
  *
  * @author WAM Team <develop@wearemarketing.com>
  */
-class PaylandsCurrencyServiceResolverTest extends \PHPUnit_Framework_TestCase
+class PaylandsCurrencyServiceResolverTest extends TestCase
 {
     /**
      * @test

diff --git a/src/PaymentSuite/PaylandsBundle/Tests/Services/PaylandsEventDispatcherTest.php b/src/PaymentSuite/PaylandsBundle/Tests/Services/PaylandsEventDispatcherTest.php
@@ -18,6 +18,7 @@
 use PaymentSuite\PaylandsBundle\Event\PaylandsCardValidEvent;
 use PaymentSuite\PaylandsBundle\PaylandsMethod;
 use PaymentSuite\PaylandsBundle\Services\PaylandsEventDispatcher;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -27,7 +28,7 @@
  *
  * @author WAM Team <develop@wearemarketing.com>
  */
-class PaylandsEventDispatcherTest extends \PHPUnit_Framework_TestCase
+class PaylandsEventDispatcherTest extends TestCase
 {
     /**
      * @test

diff --git a/src/PaymentSuite/PaylandsBundle/Tests/Services/PaylandsManagerTest.php b/src/PaymentSuite/PaylandsBundle/Tests/Services/PaylandsManagerTest.php
@@ -24,13 +24,14 @@
 use PaymentSuite\PaymentCoreBundle\Exception\PaymentException;
 use PaymentSuite\PaymentCoreBundle\Services\Interfaces\PaymentBridgeInterface;
 use PaymentSuite\PaymentCoreBundle\Services\PaymentEventDispatcher;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class PaylandsManagerTest
  *
  * @author WAM Team <develop@wearemarketing.com>
  */
-class PaylandsManagerTest extends \PHPUnit_Framework_TestCase
+class PaylandsManagerTest extends TestCase
 {
     /**
      * @test
@@ -323,13 +324,4 @@ public function paymentThrowsExceptionIfTransactionFails()
 
         $paylandsManager->processPayment($paymentMethod);
     }
-
-    public function expectException($exception)
-    {
-        if (method_exists('\PHPUnit_Framework_TestCase', 'expectException')) {
-            parent::expectException($exception);
-        }
-
-        parent::setExpectedException($exception);
-    }
 }
diff --git a/src/PaymentSuite/PaylandsBundle/composer.json b/src/PaymentSuite/PaylandsBundle/composer.json
@@ -14,21 +14,21 @@
         }
     ],
     "require": {
-        "php": "^5.5|^7.0",
-        "symfony/framework-bundle": "^2.8|^3.0",
-        "symfony/form": "^2.8|^3.0",
-        "symfony/config": "^2.8|^3.0",
-        "symfony/http-kernel": "^2.8|^3.0",
-        "symfony/http-foundation": "^2.8|^3.0",
-        "symfony/dependency-injection": "^2.8|^3.0",
-        "symfony/options-resolver": "^2.8|^3.0",
-        "mmoreram/symfony-bundle-dependencies": "^1.0",
+        "php": "^7.1",
+        "symfony/framework-bundle": "^3.4",
+        "symfony/form": "^3.4",
+        "symfony/config": "^3.4",
+        "symfony/http-kernel": "^3.4",
+        "symfony/http-foundation": "^3.4",
+        "symfony/dependency-injection": "^3.4",
+        "symfony/options-resolver": "^3.4",
+        "mmoreram/symfony-bundle-dependencies": "^2.0",
         "twig/twig": "^1.23.1",
         "paymentsuite/payment-core-bundle": "^2.0",
         "wearemarketing/paylands-php": "dev-master"
     },
     "require-dev": {
-        "phpunit/phpunit": "<6.0"
+        "phpunit/phpunit": "^7.0"
     },
     "suggest": {
         "guzzlehttp/guzzle": "Implements a required PSR-7 Http client"

diff --git a/src/PaymentSuite/PaymentCoreBundle/Resources/config/services.yml b/src/PaymentSuite/PaymentCoreBundle/Resources/config/services.yml
@@ -3,12 +3,12 @@ services:
     paymentsuite.event_dispatcher:
         class: PaymentSuite\PaymentCoreBundle\Services\PaymentEventDispatcher
         arguments:
-            - "@event_dispatcher"
+            - '@event_dispatcher'
 
     paymentsuite.logger:
         class: PaymentSuite\PaymentCoreBundle\Services\PaymentLogger
         arguments:
-            - "@logger"
-            - %paymentsuite.logger%
+            - '@logger'
+            - '%paymentsuite.logger%'
         tags:
             - { name: monolog.logger, channel: 'paymentsuite' }
diff --git a/src/PaymentSuite/PaymentCoreBundle/Tests/Services/PaymentEventDispatcherTest.php b/src/PaymentSuite/PaymentCoreBundle/Tests/Services/PaymentEventDispatcherTest.php
@@ -15,6 +15,7 @@
 
 namespace PaymentSuite\PaymentCoreBundle\Tests\Services;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 use PaymentSuite\PaymentCoreBundle\PaymentCoreEvents;
@@ -25,7 +26,7 @@
 /**
  * Tests PaymentSuite\PaymentCoreBundle\Services\PaymentEventDispatcher class.
  */
-class PaymentEventDispatcherTest extends \PHPUnit_Framework_TestCase
+class PaymentEventDispatcherTest extends TestCase
 {
     /**
      * @var PaymentBridgeInterface
@@ -58,8 +59,8 @@ public function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->paymentBridge = $this->getMock('\PaymentSuite\PaymentCoreBundle\Services\Interfaces\PaymentBridgeInterface');
-        $this->paymentMethod = $this->getMock('\PaymentSuite\PaymentCoreBundle\PaymentMethodInterface');
+        $this->paymentBridge = $this->getMockBuilder('\PaymentSuite\PaymentCoreBundle\Services\Interfaces\PaymentBridgeInterface')->getMock();
+        $this->paymentMethod = $this->getMockBuilder('\PaymentSuite\PaymentCoreBundle\PaymentMethodInterface')->getMock();
     }
 
     /**

diff --git a/src/PaymentSuite/PaymentCoreBundle/Tests/Services/PaymentLoggerTest.php b/src/PaymentSuite/PaymentCoreBundle/Tests/Services/PaymentLoggerTest.php
@@ -16,11 +16,12 @@
 namespace PaymentSuite\PaymentCoreBundle\Tests\Services;
 
 use PaymentSuite\PaymentCoreBundle\Services\PaymentLogger;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests PaymentSuite\PaymentCoreBundle\Services\PaymentLogger class.
  */
-class PaymentLoggerTest extends \PHPUnit_Framework_TestCase
+class PaymentLoggerTest extends TestCase
 {
     /**
      * Tests log().