Merge pull request #7 from Stockbase-Connect/hotfix/improve-version-c…

…onstraints

Improve version constraints

.travis.yml

@@ -7,10 +7,10 @@ matrix:
     ## TODO: this works locally, but for some reason not in Travis
     #    - php: 7.0
     #  env: deps=low
-    - php: 7.0
-      env: 
-        - cover=yes
-        - docs=yes
+    - php: 7.1
+      env:
+      - cover=yes
+      - docs=yes
 
 env:
   global:

README.md

@@ -27,18 +27,6 @@ module and all its dependencies with a single console command.
 2. Navigate to your Magento 2 installation directory (where your `composer.json` and `composer.lock` files are located).
 3. Execute the command: `composer require stockbase/magento2-module`
 
-### Install Manually
-
-**Warning!** This installation is method recommended for module development only and we assume that you know how to
-work with PHP and Composer. If you're not sure whether you need this type of installation, please follow the
-instructions for [Composer installation](#2-2) in Section 1.2.1.
-
-1. Download the zip archive containing the module.
-2. Extract it into the `<magento root folder>/app/code/Stockbase/Integration` directory.
-3. Install into your main Magento project all dependencies listed in this module's `composer.json` file.
-   For example: `composer require dividebv/phpdivideiq:^0.5.0 beberlei/assert:^2.4`.
-   See the `require` section of the module's `composer.json` file.
-
 ### Enable the Module
 
 Execute the following commands in the Magento installation directory:

StockbaseApi/Client/StockbaseClient.php

@@ -3,7 +3,7 @@
 
 namespace Stockbase\Integration\StockbaseApi\Client;
 
-use Assert\Assertion;
+use Webmozart\Assert\Assert;
 use DivideBV\PHPDivideIQ\DivideIQ;
 use Magento\Sales\Api\Data\OrderInterface;
 use Stockbase\Integration\Model\Config\StockbaseConfiguration;
@@ -71,7 +71,7 @@ public function getStock(\DateTime $since = null, \DateTime $until = null)
      */
     public function getImages(array $eans)
     {
-        Assertion::allNumeric($eans);
+        Assert::allNumeric($eans);
 
         $data = [
             'ean' => implode(',', $eans),

composer.json

@@ -3,12 +3,17 @@
     "description": "A Magento 2 module for Stockbase",
     "type": "magento2-module",
     "license": "MIT",
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://repo.magento.com/"
+        }
+    ],
     "require": {
-        "php": "^7.0",
-        "magento/framework": "~100.0.0|~100.1.0|~101.0.0",
-        "magento/module-catalog-inventory": "~100.0.0|~100.1.0|~100.2.0",
+        "php": "^7.1",
+        "magento/module-catalog-inventory": "^100.0.0",
         "dividebv/phpdivideiq": "^0.6.0",
-        "beberlei/assert": "^2.4"
+        "webmozart/assert": "^1.0"
     },
     "autoload": {
         "files": [ "registration.php" ],
@@ -17,12 +22,11 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "*",
+        "phpunit/phpunit": "<6.3.0",
         "phpro/grumphp": "^0.11.5",
         "magento-ecg/coding-standard": "^2.0",
-        "squizlabs/php_codesniffer": "~2.6",
-        "escapestudios/symfony2-coding-standard": "~2.0",
-        "magento/zendframework1": "1.12.10",
+        "squizlabs/php_codesniffer": "^2.6",
+        "escapestudios/symfony2-coding-standard": "^2.0",
         "bookdown/bookdown": "~1.0",
         "tobiju/bookdown-bootswatch-templates": "^1.1"
     }