Merge branch '5.1' into 5.x

nicolas-grekas · nicolas-grekas · commit b3c54c57cede · 2020-10-13T14:43:06.000+02:00
* 5.1:
  Remove "version" from composer.json files, use "branch-version" instead
  [String] fix "is too large" ValueError on PHP 8
diff --git a/composer.json b/composer.json
@@ -41,10 +41,10 @@
     ],
     "minimum-stability": "dev",
     "extra": {
+        "branch-version": "5.2-dev",
         "thanks": {
             "name": "phpunit/phpunit",
             "url": "https://github.com/sebastianbergmann/phpunit"
         }
-    },
-    "version": "5.2.x-dev"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,10 @@`
`41`	`41`	`],`
`42`	`42`	`"minimum-stability": "dev",`
`43`	`43`	`"extra": {`
	`44`	`+ "branch-version": "5.2-dev",`
`44`	`45`	`"thanks": {`
`45`	`46`	`"name": "phpunit/phpunit",`
`46`	`47`	`"url": "https://github.com/sebastianbergmann/phpunit"`
`47`	`48`	`}`
`48`		`- },`
`49`		`- "version": "5.2.x-dev"`
	`49`	`+ }`
`50`	`50`	`}`