Merge branch 'develop' into 2002.1-forward-port

gamort · Feb 7, 2020 · 79f4867 · 79f4867
2 parents 07c50d7 + c88c6e6
commit 79f4867
Show file tree

Hide file tree

Showing 65 changed files with 2,966 additions and 1,434 deletions.
diff --git a/codeception.dist.yml b/codeception.dist.yml
@@ -10,6 +10,7 @@ settings:
 extensions:
   enabled:
     - Codeception\Extension\RunFailed
+    - Codeception\Extension\FailedInfo
 params:
   - tests/functional/configuration.dist.yml
 modules:

diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
     "symfony/console": "^2.8||^4.0",
     "symfony/dependency-injection": "^3.3||^4.3",
     "symfony/process": "^2.1||^4.1",
-    "symfony/serializer": "^2.8||^3.3",
+    "symfony/serializer": "^2.8||^3.3||^4.0",
     "symfony/yaml": "^3.3||^4.0"
   },
   "require-dev": {
@@ -72,13 +72,15 @@
       "@test:phpstan",
       "@test:phpcs",
       "@test:phpmd",
-      "@test:phpunit",
+      "@test:unit",
+      "@test:integration",
       "@test:coverage"
     ],
     "test:phpstan": "phpstan analyse -c tests/static/phpstan.neon",
     "test:phpcs": "phpcs src --standard=tests/static/phpcs-ruleset.xml -p -n",
     "test:phpmd": "phpmd src xml tests/static/phpmd-ruleset.xml",
-    "test:phpunit": "phpunit --configuration tests/unit",
+    "test:unit": "phpunit --configuration tests/unit",
+    "test:integration": "phpunit --configuration tests/integration",
     "test:coverage": "phpunit --configuration tests/unit --coverage-clover tests/unit/tmp/clover.xml && php tests/unit/code-coverage.php tests/unit/tmp/clover.xml",
     "test:coverage-generate": "phpunit --configuration tests/unit --coverage-html tests/unit/tmp/coverage",
     "pre-autoload-dump": [
@@ -90,12 +92,6 @@
   },
   "prefer-stable": true,
   "extra": {
-    "map": [
-      [
-        "dist/.magento.env.yaml",
-        ".magento.env.yaml.dist"
-      ]
-    ],
     "include_files": [
       "vendor/codeception/phpunit-wrapper/src/phpunit7-interfaces.php"
     ]