Merge 12c6d82 into d59a429

bitExpert · Jun 19, 2021 · 7ebbc61 · 7ebbc61
2 parents d59a429 + 12c6d82
commit 7ebbc61
Show file tree

Hide file tree

Showing 7 changed files with 3,068 additions and 3,021 deletions.
diff --git a/composer.json b/composer.json
@@ -16,14 +16,17 @@
   ],
   "require": {
     "php": "^7.2.0",
-    "magento/framework": ">=101.0.0",
     "nette/neon": "^3.1",
     "phpstan/phpstan": "^0.12.23"
   },
+  "conflict": {
+    "magento/framework": "<101.0.0"
+  },
   "require-dev": {
     "captainhook/captainhook": "^5.10.1",
     "captainhook/plugin-composer": "^5.3.1",
     "madewithlove/license-checker": "^0.10.0",
+    "magento/framework": ">=101.0.0",
     "mikey179/vfsstream": "^1.6.8",
     "nikic/php-parser": "^4.10.5",
     "phpstan/extension-installer": "^1.1.0",