From 56fb2193f99e5ae2228edea922b1e81ab8097519 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Sun, 25 Jul 2021 07:45:38 +0200 Subject: [PATCH 1/4] Avoid race condition (and make PhpStorm happy) --- build/scripts/phar-version.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/scripts/phar-version.php b/build/scripts/phar-version.php index 620a735f265..eae24921930 100755 --- a/build/scripts/phar-version.php +++ b/build/scripts/phar-version.php @@ -11,7 +11,8 @@ 'private static $pharVersion;', 'private static $pharVersion = "' . $argv[1] . '";', \file_get_contents(__DIR__ . '/../tmp/phar/phpunit/Runner/Version.php') - ) + ), + \LOCK_EX ); if ($argv[2] == 'release') { From 525e86105d832fe85919305e0e2b614d37d805e4 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Sun, 25 Jul 2021 07:45:48 +0200 Subject: [PATCH 2/4] Use strict comparison --- build/scripts/phar-version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/scripts/phar-version.php b/build/scripts/phar-version.php index eae24921930..53e133c9470 100755 --- a/build/scripts/phar-version.php +++ b/build/scripts/phar-version.php @@ -15,7 +15,7 @@ \LOCK_EX ); -if ($argv[2] == 'release') { +if ($argv[2] === 'release') { print $argv[1]; } else { print $argv[2]; From 43596aeba70a0dc9bdf7bf8dea567ba9350821f2 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Sun, 25 Jul 2021 07:46:24 +0200 Subject: [PATCH 3/4] Combine isset() calls --- build/scripts/phar-version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/scripts/phar-version.php b/build/scripts/phar-version.php index 53e133c9470..64babb124c9 100755 --- a/build/scripts/phar-version.php +++ b/build/scripts/phar-version.php @@ -1,7 +1,7 @@ #!/usr/bin/env php Date: Sun, 25 Jul 2021 07:47:50 +0200 Subject: [PATCH 4/4] Fix version information for snapshot PHARs (broken since e1c95d892ca983dd61192ef19edf4c7a78442095) --- build/scripts/phar-version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/scripts/phar-version.php b/build/scripts/phar-version.php index 64babb124c9..1a91016553e 100755 --- a/build/scripts/phar-version.php +++ b/build/scripts/phar-version.php @@ -8,8 +8,8 @@ \file_put_contents( __DIR__ . '/../tmp/phar/phpunit/Runner/Version.php', \str_replace( - 'private static $pharVersion;', - 'private static $pharVersion = "' . $argv[1] . '";', + 'private static $pharVersion = \'\';', + 'private static $pharVersion = \'' . $argv[1] . '\';', \file_get_contents(__DIR__ . '/../tmp/phar/phpunit/Runner/Version.php') ), \LOCK_EX