Merge pull request #3 from renatocason/1.1-develop

Magento 2.3 support
renatocason · Dec 17, 2018 · 294b2c8 · 294b2c8
2 parents 2b74dac + 63f6d5b
commit 294b2c8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 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/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,15 +8,15 @@
         }
     ],
     "require": {
-        "php": "~7.0.0|~7.1.0",
-        "magento/framework": "101.0.*",
-        "magento/module-store": "100.2.*",
-        "renatocason/magento2-module-mq": "~1.0.0",
-        "php-amqplib/php-amqplib": "~2.7.2"
+        "php": "~7.1.0|~7.2.0",
+        "magento/framework": "102.0.*",
+        "magento/module-store": "101.0.*",
+        "renatocason/magento2-module-mq": "~1.1.0",
+        "php-amqplib/php-amqplib": "~2.8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.2.0",
-        "squizlabs/php_codesniffer": "3.2.2",
+        "phpunit/phpunit": "~6.5.13",
+        "squizlabs/php_codesniffer": "3.3.1",
         "phpmd/phpmd": "@stable",
         "php-coveralls/php-coveralls": "~2.1.0"
     },