Skip to content

Commit

Permalink
Upgrade composer/semver (#477)
Browse files Browse the repository at this point in the history
  • Loading branch information
@villfa
villfa authored Sep 21, 2020
1 parent a600f9e commit 60cb5e7
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 26 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"amphp/parallel-functions": "^0.1.3",
"beberlei/assert": "^3.2",
"composer/package-versions-deprecated": "^1.8",
"composer/semver": "^1.5",
"composer/semver": "^3.2",
"composer/xdebug-handler": "^1.3.2",
"hoa/compiler": "^3.17",
"humbug/php-scoper": "^0.13",
Expand Down
4 changes: 2 additions & 2 deletions requirement-checker/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
},

"require": {
"php": "^5.3 || ^7.0",
"php": ">=5.3",
"ext-phar": "*",
"composer/semver": "^1.4"
"composer/semver": "^3.2"
},
"require-dev": {
"phpunit/phpunit": "^8.0"
Expand Down
39 changes: 27 additions & 12 deletions requirement-checker/composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 17 additions & 9 deletions tests/Console/Command/CompileTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function test_it_can_build_a_PHAR_file(): void

$shebang = sprintf('#!%s', (new PhpExecutableFinder())->find());

$numberOfFiles = 41;
$numberOfFiles = 45;
if (self::$runComposer2) {
// From Composer 2 there is one more class: Composer\InstalledVersions
$numberOfFiles++;
Expand Down Expand Up @@ -289,12 +289,16 @@ public function test_it_can_build_a_PHAR_file(): void
'/.box/vendor/composer/semver/LICENSE',
'/.box/vendor/composer/semver/src/',
'/.box/vendor/composer/semver/src/Comparator.php',
'/.box/vendor/composer/semver/src/CompilingMatcher.php',
'/.box/vendor/composer/semver/src/Constraint/',
'/.box/vendor/composer/semver/src/Constraint/AbstractConstraint.php',
'/.box/vendor/composer/semver/src/Constraint/Bound.php',
'/.box/vendor/composer/semver/src/Constraint/Constraint.php',
'/.box/vendor/composer/semver/src/Constraint/ConstraintInterface.php',
'/.box/vendor/composer/semver/src/Constraint/EmptyConstraint.php',
'/.box/vendor/composer/semver/src/Constraint/MatchAllConstraint.php',
'/.box/vendor/composer/semver/src/Constraint/MatchNoneConstraint.php',
'/.box/vendor/composer/semver/src/Constraint/MultiConstraint.php',
'/.box/vendor/composer/semver/src/Interval.php',
'/.box/vendor/composer/semver/src/Intervals.php',
'/.box/vendor/composer/semver/src/Semver.php',
'/.box/vendor/composer/semver/src/VersionParser.php',
'/one/',
Expand Down Expand Up @@ -391,7 +395,7 @@ public function test_it_can_build_a_PHAR_without_any_configuration(): void

$version = get_box_version();

$numberOfFiles = 45;
$numberOfFiles = 49;
if (self::$runComposer2) {
// From Composer 2 there is one more class: Composer\InstalledVersions
$numberOfFiles++;
Expand Down Expand Up @@ -522,12 +526,16 @@ public function test_it_can_build_a_PHAR_without_any_configuration(): void
'/.box/vendor/composer/semver/LICENSE',
'/.box/vendor/composer/semver/src/',
'/.box/vendor/composer/semver/src/Comparator.php',
'/.box/vendor/composer/semver/src/CompilingMatcher.php',
'/.box/vendor/composer/semver/src/Constraint/',
'/.box/vendor/composer/semver/src/Constraint/AbstractConstraint.php',
'/.box/vendor/composer/semver/src/Constraint/Bound.php',
'/.box/vendor/composer/semver/src/Constraint/Constraint.php',
'/.box/vendor/composer/semver/src/Constraint/ConstraintInterface.php',
'/.box/vendor/composer/semver/src/Constraint/EmptyConstraint.php',
'/.box/vendor/composer/semver/src/Constraint/MatchAllConstraint.php',
'/.box/vendor/composer/semver/src/Constraint/MatchNoneConstraint.php',
'/.box/vendor/composer/semver/src/Constraint/MultiConstraint.php',
'/.box/vendor/composer/semver/src/Interval.php',
'/.box/vendor/composer/semver/src/Intervals.php',
'/.box/vendor/composer/semver/src/Semver.php',
'/.box/vendor/composer/semver/src/VersionParser.php',
'/binary',
Expand Down Expand Up @@ -820,7 +828,7 @@ public function test_it_can_build_a_PHAR_file_in_verbose_mode(): void
$shebang = sprintf('#!%s', (new PhpExecutableFinder())->find());

$numberOfClasses = 0;
$numberOfFiles = 41;
$numberOfFiles = 45;
if (self::$runComposer2) {
// From Composer 2 there is one more class: Composer\InstalledVersions
$numberOfClasses++;
Expand Down Expand Up @@ -942,7 +950,7 @@ public function test_it_can_build_a_PHAR_file_in_very_verbose_mode(): void
$shebang = sprintf('#!%s', (new PhpExecutableFinder())->find());

$numberOfClasses = 0;
$numberOfFiles = 41;
$numberOfFiles = 45;
if (self::$runComposer2) {
// From Composer 2 there is one more class: Composer\InstalledVersions
$numberOfClasses++;
Expand Down Expand Up @@ -2902,7 +2910,7 @@ public function test_it_can_generate_a_PHAR_with_docker(): void

$version = get_box_version();

$numberOfFiles = 37;
$numberOfFiles = 41;
if (self::$runComposer2) {
// From Composer 2 there is one more class: Composer\InstalledVersions
$numberOfFiles++;
Expand Down
8 changes: 6 additions & 2 deletions tests/RequirementChecker/RequirementsDumperTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,15 @@ public function test_it_dumps_the_requirement_checker_files(
'vendor/composer/LICENSE',
'vendor/composer/semver/LICENSE',
'vendor/composer/semver/src/Comparator.php',
'vendor/composer/semver/src/Constraint/AbstractConstraint.php',
'vendor/composer/semver/src/CompilingMatcher.php',
'vendor/composer/semver/src/Constraint/Bound.php',
'vendor/composer/semver/src/Constraint/Constraint.php',
'vendor/composer/semver/src/Constraint/ConstraintInterface.php',
'vendor/composer/semver/src/Constraint/EmptyConstraint.php',
'vendor/composer/semver/src/Constraint/MatchAllConstraint.php',
'vendor/composer/semver/src/Constraint/MatchNoneConstraint.php',
'vendor/composer/semver/src/Constraint/MultiConstraint.php',
'vendor/composer/semver/src/Interval.php',
'vendor/composer/semver/src/Intervals.php',
'vendor/composer/semver/src/Semver.php',
'vendor/composer/semver/src/VersionParser.php',
];
Expand Down

0 comments on commit 60cb5e7

Please sign in to comment.