OXDEV-10008 Fix composer dependency

Author: AshrafOxid

CHANGELOG.md

@@ -5,6 +5,9 @@
 ### Added
 - PHP v8.5 support
 
+### Fixed
+- Moved `composer/composer` to `require-dev` [#0007877](https://bugs.oxid-esales.com/view.php?id=7877)
+
 ### Removed
 - PHP v8.2 support
 

composer.json

@@ -6,12 +6,12 @@
     "require": {
         "php": "^8.3",
         "composer-plugin-api": ">=2.0",
-        "composer/composer": ">=2.0",
         "oxid-esales/oxideshop-facts": "*",
         "symfony/filesystem": "^6.3",
         "twig/twig": "^3.14"
     },
     "require-dev": {
+        "composer/composer": ">=2.0",
         "mikey179/vfsstream": "^1.6",
         "symfony/yaml": "*"
     },

tests/Integration/FactsMockTrait.php

@@ -10,23 +10,25 @@
 namespace OxidEsales\UnifiedNameSpaceGenerator\Tests\Integration;
 
 use OxidEsales\Facts\Facts;
-use PHPUnit\Framework\MockObject\MockObject;
 
 trait FactsMockTrait
 {
-    private function getFactsMock(string $edition = 'CE'): Facts|MockObject
+    private function getFactsMock(string $edition = 'CE'): Facts
     {
-        $mock = $this->getMockBuilder(Facts::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getEdition', 'getShopRootPath'])
-            ->getMock();
-        $mock->expects($this->any())
-            ->method('getEdition')
+        $root = $this->getVirtualFilesystemRootPath();
+
+        $stub = $this->createStub(Facts::class);
+        $stub->method('getEdition')
             ->willReturn($edition);
-        $mock->expects($this->any())
-            ->method('getShopRootPath')
-            ->willReturn($this->getVirtualFilesystemRootPath());
+        $stub->method('getShopRootPath')
+            ->willReturn($root);
+        $stub->method('getCommunityEditionSourcePath')
+            ->willReturn($root . 'vendor/oxid-esales/oxideshop-ce/source');
+        $stub->method('getProfessionalEditionRootPath')
+            ->willReturn($root . 'vendor/oxid-esales/oxideshop-pe');
+        $stub->method('getEnterpriseEditionRootPath')
+            ->willReturn($root . 'vendor/oxid-esales/oxideshop-ee');
 
-        return $mock;
+        return $stub;
     }
 }

tests/Integration/GeneratorTest.php

@@ -10,12 +10,12 @@
 namespace OxidEsales\UnifiedNameSpaceGenerator\Tests\Integration;
 
 use FilesystemIterator;
+use OxidEsales\Facts\Facts;
 use OxidEsales\UnifiedNameSpaceGenerator\Exceptions\FileSystemCompatibilityException;
 use OxidEsales\UnifiedNameSpaceGenerator\Exceptions\OutputDirectoryValidationException;
 use OxidEsales\UnifiedNameSpaceGenerator\Generator;
 use OxidEsales\UnifiedNameSpaceGenerator\UnifiedNameSpaceClassMapProvider;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Path;
 
@@ -344,17 +344,14 @@ private function getOutputDirectory(): string
         return Path::join(__DIR__, 'test_generated');
     }
 
-    protected function getUnifiedNameSpaceProviderMock(Facts|MockObject $facts, $classMap = null): UnifiedNameSpaceClassMapProvider
+    protected function getUnifiedNameSpaceProviderMock(Facts $facts, $classMap = null): UnifiedNameSpaceClassMapProvider
     {
         if (empty($classMap) && [] !== $classMap) {
             $classMap = $this->classMapExample;
         }
 
-        $mock = $this->getMockBuilder(UnifiedNameSpaceClassMapProvider::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getClassMap'])
-            ->getMock();
-        $mock->expects($this->any())->method('getClassMap')->willReturn($classMap);
+        $mock = $this->createStub(UnifiedNameSpaceClassMapProvider::class);
+        $mock->method('getClassMap')->willReturn($classMap);
 
         return $mock;
     }

tests/Integration/UnifiedNamespaceClassMapProviderTest.php

@@ -13,7 +13,7 @@
 use OxidEsales\EshopProfessional;
 use OxidEsales\EshopEnterprise;
 use OxidEsales\UnifiedNameSpaceGenerator\Exceptions\InvalidUnifiedNamespaceClassMapException;
-use OxidEsales\UnifiedNameSpaceGenerator\UnifiedNamespaceClassMapProvider;
+use OxidEsales\UnifiedNameSpaceGenerator\UnifiedNameSpaceClassMapProvider as UnifiedNamespaceClassMapProvider;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;