MOL-1255: move php vendor fix composer ambiguous class

mollie · Oct 12, 2023 · 6cd6fa4 · 6cd6fa4
1 parent 3058100
commit 6cd6fa4
Show file tree

Hide file tree

Showing 141 changed files with 12,168 additions and 543 deletions.
diff --git a/.php_cs.php b/.php_cs.php
@@ -1,8 +1,19 @@
 <?php
 
-return PhpCsFixer\Config::create()
-    ->setUsingCache(false)
-    ->setRules([
+$finder = \PhpCsFixer\Finder::create()->in([
+    __DIR__ . '/src',
+]);
+
+$finder->exclude(
+    [
+        'Resources'
+    ]
+);
+
+$config = new \PhpCsFixer\Config();
+
+$config->setRules(
+    [
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
         'ordered_imports' => true,
@@ -14,9 +25,12 @@
         'phpdoc_order' => true,
         'phpdoc_trim_consecutive_blank_line_separation' => true,
         'phpdoc_types_order' => true,
-        'yoda_style' => null,
-    ])
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->exclude(['Resources'])
-            ->in(__DIR__ . '/src'));
+        'yoda_style' => false,
+    ]
+);
+
+$config->setFinder($finder);
+
+$config->setUsingCache(false);
+
+return $config;
diff --git a/composer.json b/composer.json
@@ -34,16 +34,20 @@
         }
     },
     "config": {
+        "platform": {
+            "php": "8.0"
+        },
         "optimize-autoloader": true,
         "allow-plugins": {
             "infection/extension-installer": true,
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "symfony/runtime": true
         }
     },
     "autoload": {
         "psr-4": {
             "Kiener\\MolliePayments\\": "src/",
-            "Mollie\\Api\\": "vendor/mollie/mollie-api-php/src/",
+            "Mollie\\Api\\": "vendor_manual/mollie/mollie-api-php/src/",
             "Shopware\\Core\\": "polyfill/Shopware/Core/"
         }
     },
@@ -64,16 +68,15 @@
     },
     "require": {
         "php": ">=7.4",
-        "ext-curl": "*",
-        "mollie/mollie-api-php": "2.61.0"
+        "ext-curl": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
-        "phpstan/phpstan": "1.8.2",
-        "friendsofphp/php-cs-fixer": "^2.18",
-        "phpcompatibility/php-compatibility": "^9.3",
-        "squizlabs/php_codesniffer": "^3.6",
-        "infection/infection": "^0.25.4",
+        "phpunit/phpunit": "*",
+        "phpstan/phpstan": "*",
+        "friendsofphp/php-cs-fixer": "*",
+        "phpcompatibility/php-compatibility": "*",
+        "squizlabs/php_codesniffer": "*",
+        "infection/infection": "*",
         "boxblinkracer/phpunuhi": "dev-main",
         "shopware/core": "*",
         "shopware/administration": "*",