Revert "NEXT-18945 - Add conflict package"

This reverts commit c7255ab.
pweyck · Dec 21, 2021 · 1a90940 · 1a90940
1 parent 4722f69
commit 1a90940
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/changelog/_unreleased/2021-12-20-add-conflict-package.md b/changelog/_unreleased/2021-12-20-add-conflict-package.md
diff --git a/composer.json b/composer.json
@@ -53,9 +53,9 @@
         "ext-xml": "*",
         "ext-zip": "*",
         "ext-zlib": "*",
-        "composer-runtime-api": "^2.0",
         "aws/aws-sdk-php": "^3.198.5",
         "cocur/slugify": "4.0.0",
+        "composer-runtime-api": "^2.0",
         "composer/composer": "^2.1.9",
         "composer/semver": "^3.2",
         "doctrine/annotations": "1.13.1",
@@ -85,8 +85,6 @@
         "psr/log": "1.1.2",
         "scssphp/scssphp": "1.0.7",
         "sensio/framework-extra-bundle": "5.5.6",
-        "shopware/conflicts": "@dev",
-        "squirrelphp/twig-php-syntax": "1.6.0",
         "sroze/messenger-enqueue-transport": "0.4.0",
         "superbalist/flysystem-google-storage": "~7.2.2",
         "symfony/asset": "~5.3.11",
@@ -137,7 +135,8 @@
         "twig/intl-extra": "3.3.0",
         "twig/string-extra": "3.3.0",
         "twig/twig": "3.3.3",
-        "zircote/swagger-php": "3.1.0"
+        "zircote/swagger-php": "3.1.0",
+        "squirrelphp/twig-php-syntax": "1.6.0"
     },
     "require-dev": {
         "ext-tokenizer": "*",
@@ -330,6 +329,10 @@
             "@e2e:recovery:cypress open"
         ]
     },
+    "conflict": {
+        "symfony/symfony": "*",
+        "symfony/notifier": "v5.3.8"
+    },
     "autoload": {
         "psr-4": {
             "Shopware\\Administration\\": "src/Administration/",

diff --git a/src/Core/composer.json b/src/Core/composer.json
@@ -75,7 +75,6 @@
         "psr/http-message": "1.0.1",
         "psr/log": "1.1.2",
         "sensio/framework-extra-bundle": "5.5.6",
-        "shopware/conflicts": "@dev",
         "sroze/messenger-enqueue-transport": "0.4.0",
         "superbalist/flysystem-google-storage": "~7.2.2",
         "symfony/asset": "~5.3.11",
@@ -150,6 +149,10 @@
         "symfony/dom-crawler": "~5.3.0",
         "brianium/paratest": "^6.2"
     },
+    "conflict": {
+        "symfony/symfony": "*",
+        "symfony/notifier": "v5.3.8"
+    },
     "config": {
         "platform": {
            "php": "7.4.3"

diff --git a/vendor-bin/roave-backward-compatibility-check/patch/LocateDependenciesViaComposer.php b/vendor-bin/roave-backward-compatibility-check/patch/LocateDependenciesViaComposer.php
@@ -40,8 +40,21 @@ public function __invoke(string $installationPath): SourceLocator
     {
         Assert::file($installationPath . '/composer.json');
 
+        $this->runInDirectory(function () use ($installationPath): void {
+            $installer = ($this->makeComposerInstaller)($installationPath);
+
+            assert($installer instanceof Installer);
+
+            // Some defaults needed for this specific implementation:
+            $installer->setDevMode(false);
+            $installer->setDumpAutoloader(false);
+            $installer->setRunScripts(false);
+            $installer->setIgnorePlatformRequirements(true);
+
+            $installer->run();
+        }, $installationPath);
+
         // <shopware-hack>
-        exec(\sprintf('composer install -d %s --no-dev --no-scripts --ignore-platform-reqs', escapeshellarg($installationPath)));
         $this->fixeMarc1706FastImageSizeDirectories($installationPath);
         // </shopware-hack>