Merge branch '8.5' into 9.5

sebastianbergmann · sebastianbergmann · commit c396a4268252 · 2022-06-19T11:36:58.000+02:00
diff --git a/build/scripts/phar-manifest.php b/build/scripts/phar-manifest.php
@@ -114,7 +114,6 @@ function package(): array
         'name' => $name,
         'description' => $data['description'],
         'license' => [$data['license']],
-        'branch' => $data['extra']['branch-alias']['dev-master']
     ];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@ function package(): array`
`114`	`114`	`'name' => $name,`
`115`	`115`	`'description' => $data['description'],`
`116`	`116`	`'license' => [$data['license']],`
`117`		`- 'branch' => $data['extra']['branch-alias']['dev-master']`
`118`	`117`	`];`
`119`	`118`	`}`
`120`	`119`