Merge pull request #3 from aune-io/1.2-develop

Magento 2.3 support

Author: renatocason

.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

README.md

@@ -13,7 +13,7 @@ This modules prevents the generation of those urls if the aforementioned setting
 ## System requirements
 This extension supports the following versions of Magento:
 
-*	Community Edition (CE) versions 2.1.x and 2.2.x
+*	Community Edition (CE) versions 2.1.x, 2.2.x and 2.3.x
 
 ## Installation
 1. Require the module via Composer

Test/Unit/bootstrap.php

@@ -1,18 +1,23 @@
 <?php
+
 // @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);
 }

composer.json

@@ -8,14 +8,14 @@
         }
     ],
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "psr/log": "1.0.2",
-        "magento/framework": "101.0.*",
-        "magento/module-catalog-url-rewrite": "100.2.*"
+        "php": "~7.1.0|~7.2.0",
+        "psr/log": "1.1.0",
+        "magento/framework": "102.0.*",
+        "magento/module-catalog-url-rewrite": "100.3.*"
     },
     "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"
     },