Merge pull request #138 from helhum/prepare-v5-release

.github/workflows/ci.yml

@@ -11,8 +11,6 @@ jobs:
             fail-fast: false
             matrix:
                 php-versions:
-                    - "7.4"
-                    - "8.0"
                     - "8.1"
                     - "8.2"
                 composer-versions:

composer.json

@@ -38,7 +38,7 @@
         "netresearch/composer-installers": "*"
     },
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.1",
         "composer-plugin-api": "^2.1.0"
     },
     "require-dev": {
@@ -47,9 +47,6 @@
         "phpunit/phpunit": "^8.5",
         "friendsofphp/php-cs-fixer": "^2.18"
     },
-    "conflict": {
-        "composer/installers": "<2.0.0"
-    },
     "scripts": {
         "test:php:lint": [
             "phplint"
@@ -66,7 +63,7 @@
     "extra": {
         "class": "TYPO3\\CMS\\Composer\\Installer\\Plugin",
         "branch-alias": {
-            "dev-main": "4.0.x-dev"
+            "dev-main": "5.0.x-dev"
         }
     }
 }

src/Plugin/Config.php

@@ -231,7 +231,7 @@ private static function handleRootPackageExtraConfig(IOInterface $io, RootPackag
         $config->merge($rootPackageExtraConfig);
         $baseDir = $fileSystem->normalizePath($config->get('base-dir'));
         $webDir = $fileSystem->normalizePath($config->get('web-dir'));
-        if (strpos($webDir, $baseDir) !== 0) {
+        if (!str_starts_with($webDir, $baseDir)) {
             unset($rootPackageExtraConfig['typo3/cms']['web-dir']);
             $io->writeError('<warning>TYPO3 public path must be a subdirectory of Composer root directory. Resetting web-dir config to default.</warning>');
         }

src/Plugin/Util/ExtensionKeyResolver.php

@@ -33,7 +33,7 @@ class ExtensionKeyResolver
     public static function resolve(PackageInterface $package): string
     {
         $extra = $package->getExtra();
-        if (empty($extra['typo3/cms']['extension-key']) && strpos($package->getType(), 'typo3-cms-') === 0) {
+        if (empty($extra['typo3/cms']['extension-key']) && str_starts_with($package->getType(), 'typo3-cms-')) {
             // The only reason this is enforced, is to ease the transition of extensions of type "typo3-cms-*"
             // Since the logic is removed how to derive the extension key from package name, we must enforce
             // the extension key to be set to avoid ambiguity of the extension key between previous installers versions and this one