Merge pull request #122 from gilbertsoft/feature/allow-installers-2

helhum · web-flow · commit 1483e434946c · 2021-07-27T00:16:58.000+02:00
diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
         "friendsofphp/php-cs-fixer": "^2.18"
     },
     "conflict": {
-        "composer/installers": "<1.0.24 || >1.0.24"
+        "composer/installers": "<2.0.0"
     },
     "scripts": {
         "test:php:lint": [
@@ -66,7 +66,7 @@
     "extra": {
         "class": "TYPO3\\CMS\\Composer\\Installer\\Plugin",
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-master": "3.1.x-dev"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`"friendsofphp/php-cs-fixer": "^2.18"`
`49`	`49`	`},`
`50`	`50`	`"conflict": {`
`51`		`- "composer/installers": "<1.0.24 \|\| >1.0.24"`
	`51`	`+ "composer/installers": "<2.0.0"`
`52`	`52`	`},`
`53`	`53`	`"scripts": {`
`54`	`54`	`"test:php:lint": [`
`@@ -66,7 +66,7 @@`
`66`	`66`	`"extra": {`
`67`	`67`	`"class": "TYPO3\\CMS\\Composer\\Installer\\Plugin",`
`68`	`68`	`"branch-alias": {`
`69`		`- "dev-master": "3.0.x-dev"`
	`69`	`+ "dev-master": "3.1.x-dev"`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`