Merge pull request #6 from aune-io/3.0-develop

Magento 2.3 support
aune-io · Dec 17, 2018 · 509c384 · 509c384
2 parents 364564f + e67e570
commit 509c384
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,11 @@ sudo: false
 language: php
 
 php:
-    - 7.0
     - 7.1
+    - 7.2
 
 install:
+    - mkdir -p ~/.composer/
     - echo "{\"http-basic\":{\"repo.magento.com\":{\"username\":\"${MAGENTO_USERNAME}\",\"password\":\"${MAGENTO_PASSWORD}\"}}}" > ~/.composer/auth.json
     - composer install --prefer-dist
     - composer create-project --repository=https://repo.magento.com magento/marketplace-eqp marketplace-eqp

diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@ Stripe payments integration module for Magento 2.
 ## System requirements
 This extension supports the following versions of Magento:
 
-*	Community Edition (CE) versions 2.1.x and 2.2.x
-*	Enterprise Edition (EE) versions 2.1.x and 2.2.x
+*	Community Edition (CE) versions 2.1.x, 2.2.x and 2.3.x
+*	Enterprise Edition (EE) versions 2.1.x, 2.2.x and 2.3.x
 
 ## Installation
 1. Require the module via Composer

diff --git a/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php b/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
@@ -75,7 +75,8 @@ public function testValidate(array $validationSubject, $isValid, $messages)
             ->method('create')
             ->with([
                 'isValid' => $isValid,
-                'failsDescription' => $messages
+                'failsDescription' => $messages,
+                'errorCodes' => [],
             ])
             ->willReturn($resultMock);
 

diff --git a/Test/Unit/Gateway/Validator/ResponseValidatorTest.php b/Test/Unit/Gateway/Validator/ResponseValidatorTest.php
@@ -106,7 +106,8 @@ public function testValidate(array $validationSubject, $isValid, $messages)
             ->method('create')
             ->with([
                 'isValid' => $isValid,
-                'failsDescription' => $messages
+                'failsDescription' => $messages,
+                'errorCodes' => [],
             ])
             ->willReturn($result);
 

diff --git a/Test/Unit/bootstrap.php b/Test/Unit/bootstrap.php
@@ -3,20 +3,22 @@
 // @codingStandardsIgnoreFile
 require_once realpath(__DIR__ . '/../../vendor/autoload.php');
 
-/**
- * Create value-object \Magento\Framework\Phrase
- * 
- * @SuppressWarnings(PHPMD.ShortMethodName)
- * @return \Magento\Framework\Phrase
- */
-function __()
-{
-    $argc = func_get_args();
-
-    $text = array_shift($argc);
-    if (!empty($argc) && is_array($argc[0])) {
-        $argc = $argc[0];
+if (!function_exists('__')) {
+    /**
+     * Create value-object \Magento\Framework\Phrase
+     * 
+     * @SuppressWarnings(PHPMD.ShortMethodName)
+     * @return \Magento\Framework\Phrase
+     */
+    function __()
+    {
+        $argc = func_get_args();
+
+        $text = array_shift($argc);
+        if (!empty($argc) && is_array($argc[0])) {
+            $argc = $argc[0];
+        }
+
+        return new \Magento\Framework\Phrase($text, $argc);
     }
-
-    return new \Magento\Framework\Phrase($text, $argc);
 }
diff --git a/composer.json b/composer.json
@@ -8,25 +8,25 @@
         }
     ],
     "require": {
-        "php": "~7.0.0|~7.1.0",
-        "psr/log": "1.0.2",
-        "magento/framework": "101.0.*",
-        "magento/module-config": "101.0.*",
-        "magento/module-directory": "100.2.*",
-        "magento/module-payment": "100.2.*",
-        "magento/module-checkout": "100.2.*",
-        "magento/module-sales": "101.0.*",
-        "magento/module-backend": "100.2.*",
-        "magento/module-vault": "101.0.*",
-        "magento/module-quote": "101.0.*",
-        "magento/module-ui": "101.0.*",
-        "stripe/stripe-php": "~6.15.0"
+        "php": "~7.1.0|~7.2.0",
+        "psr/log": "1.1.0",
+        "magento/framework": "102.0.*",
+        "magento/module-config": "101.1.*",
+        "magento/module-directory": "100.3.*",
+        "magento/module-payment": "100.3.*",
+        "magento/module-checkout": "100.3.*",
+        "magento/module-sales": "102.0.*",
+        "magento/module-backend": "101.0.*",
+        "magento/module-vault": "101.1.*",
+        "magento/module-quote": "101.1.*",
+        "magento/module-ui": "101.1.*",
+        "stripe/stripe-php": "~6.26.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.2.0",
-        "squizlabs/php_codesniffer": "3.0.1",
+        "phpunit/phpunit": "~6.5.13",
+        "squizlabs/php_codesniffer": "~3.3.1",
         "phpmd/phpmd": "@stable",
-        "satooshi/php-coveralls": "~1.0.1"
+        "php-coveralls/php-coveralls": "~2.1.0"
     },
     "type": "magento2-module",
     "license": [