Skip to content

Commit e9dd4e3

Browse files
andrewnicolsandrewnicols
committed
wip
1 parent 991ca3f commit e9dd4e3

File tree

6 files changed

+92
-43
lines changed

6 files changed

+92
-43
lines changed

‎.github/workflows/ci.yml

+8-20
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,7 @@ jobs:
2121
with:
2222
php-version: ${{ matrix.php }}
2323

24-
- name: Cache Composer dependencies
25-
uses: actions/cache@v4
26-
with:
27-
path: ~/.composer/cache
28-
key: php-composer-locked-${{ hashFiles('composer.lock') }}
29-
restore-keys: php-composer-locked-
30-
31-
- name: Install PHP dependencies
32-
run: composer install --no-interaction --no-progress
24+
- uses: php-actions/composer@v6 # or alternative dependency management
3325

3426
- name: Run PHPUnit
3527
run: vendor/bin/phpunit
@@ -47,16 +39,12 @@ jobs:
4739
tools: cs2pr, phpcs
4840
coverage: none
4941

50-
- name: Cache Composer dependencies
51-
uses: actions/cache@v4
52-
with:
53-
path: ~/.composer/cache
54-
key: php-composer-locked-${{ hashFiles('composer.lock') }}
55-
restore-keys: php-composer-locked-
56-
57-
- name: Install PHP dependencies
58-
run: composer install --no-interaction --no-progress
42+
- uses: php-actions/composer@v6 # or alternative dependency management
5943

6044
- name: PHP CodeSniffer
61-
run: phpcs -q --no-colors --report=checkstyle
62-
# run: phpcs -q --no-colors --report=checkstyle | cs2pr
45+
run: phpcs -q --no-colors --report=checkstyle | cs2pr
46+
47+
- uses: php-actions/phpstan@v3
48+
with:
49+
path: src/
50+
level: 7

‎composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"phpunit/phpunit": "^11.3",
77
"mikey179/vfsstream": "^1.6",
88
"phpcsstandards/phpcsextra": "^1.2.0",
9-
"squizlabs/php_codesniffer": "^3.10"
9+
"squizlabs/php_codesniffer": "^3.10",
10+
"phpstan/phpstan": "^1.12"
1011
},
1112
"license": "GPLv3",
1213
"autoload": {

‎composer.lock

+59-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Helper.php

+5-9
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public static function getNextBranchNumber(
9898
*
9999
* @param int $versionint The integer part of the version
100100
* @param string|int $versiondec The decimal part of the version
101-
* @return array
101+
* @return array<string, int|string>
102102
*/
103103
public static function getValidatedVersionNumber(
104104
int $versionint,
@@ -121,8 +121,8 @@ public static function getValidatedVersionNumber(
121121
}
122122

123123
return [
124-
(int) $versionint,
125-
sprintf("%'02d", $versiondec),
124+
'versionint' => (int) $versionint,
125+
'versiondec' => (string) sprintf("%'02d", $versiondec),
126126
];
127127
}
128128

@@ -275,7 +275,7 @@ public static function requireVersionFileValid(
275275
/**
276276
* Get the value of an option from the options array.
277277
*
278-
* @param array $options The options configuration
278+
* @param array<string, string> $options The options configuration
279279
* @param string $short The short name of the option
280280
* @param string $long The long name of the option
281281
* @return mixed
@@ -288,11 +288,7 @@ public static function getOption(
288288
if (!isset($options[$short]) && !isset($options[$long])) {
289289
throw new Exception("Required option -$short|--$long must be provided.", __LINE__);
290290
}
291-
if (
292-
(isset($options[$short]) && is_array($options[$short]))
293-
|| (isset($options[$long]) && is_array($options[$long]))
294-
|| (isset($options[$short]) && isset($options[$long]))
295-
) {
291+
if (array_key_exists($short, $options) && array_key_exists($long, $options)) {
296292
throw new Exception("Option -$short|--$long specified more than once.", __LINE__);
297293
}
298294
return (isset($options[$short])) ? $options[$short] : $options[$long];

‎src/VersionInfo.php

+14-11
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ public static function fromVersionFile(string $path): self
126126
{
127127
Helper::requirePathValid($path);
128128
$versionfile = file_get_contents($path);
129+
if (!$versionfile) {
130+
throw new Exception('Could not read the version file.', __LINE__);
131+
}
129132

130133
return self::fromVersionContent($versionfile);
131134
}
@@ -217,25 +220,25 @@ public function getNextVersion(
217220
);
218221
}
219222
[
220-
$integerversion,
221-
$decimalversion,
223+
'versionint' => $integerversion,
224+
'versiondec' => $decimalversion,
222225
] = Helper::getValidatedVersionNumber($integerversion, $decimalversion);
223226
} elseif ($type === 'beta') {
224227
$release = preg_replace('#^(\d+.\d+) *(dev|beta)\+?#', '$1', $release);
225228
$branch = $branchcurrent; // Branch doesn't change in beta releases ever.
226229
$release .= 'beta';
227230
[
228-
$integerversion,
229-
$decimalversion,
231+
'versionint' => $integerversion,
232+
'versiondec' => $decimalversion,
230233
] = Helper::getValidatedVersionNumber($integerversion, $decimalversion);
231234
$maturity = 'MATURITY_BETA';
232235
} elseif ($type === 'rc') {
233236
$release = preg_replace('#^(\d+.\d+) *(dev|beta|rc\d)\+?#', '$1', $release);
234237
$branch = $branchcurrent; // Branch doesn't change in rc releases ever.
235238
$release .= 'rc' . $rc;
236239
[
237-
$integerversion,
238-
$decimalversion,
240+
'versionint' => $integerversion,
241+
'versiondec' => $decimalversion,
239242
] = Helper::getValidatedVersionNumber($integerversion, $decimalversion);
240243
$maturity = 'MATURITY_RC';
241244
} elseif ($type === 'on-demand') {
@@ -246,8 +249,8 @@ public function getNextVersion(
246249
$release .= '+';
247250
}
248251
[
249-
$integerversion,
250-
$decimalversion,
252+
'versionint' => $integerversion,
253+
'versiondec' => $decimalversion,
251254
] = Helper::getValidatedVersionNumber($integerversion, $decimalversion);
252255
} elseif ($type === 'on-sync') {
253256
$decimalversion++;
@@ -282,8 +285,8 @@ public function getNextVersion(
282285
$release = preg_replace('#^(\d+.\d+) *(dev|beta|rc\d+)\+?#', '$1', $release);
283286
$branch = $branchcurrent; // Branch doesn't change in major releases ever.
284287
[
285-
$integerversion,
286-
$decimalversion,
288+
'versionint' => $integerversion,
289+
'versiondec' => $decimalversion,
287290
] = Helper::getValidatedVersionNumber($integerversion, $decimalversion);
288291
$maturity = 'MATURITY_STABLE';
289292
// Now handle builddate for releases.
@@ -318,7 +321,7 @@ public function getNextVersion(
318321
}
319322

320323
return new self(
321-
integerversion: $integerversion,
324+
integerversion: (int) $integerversion,
322325
decimalversion: $decimalversion,
323326
comment: $comment,
324327
release: $release,

‎tests/unit/HelperTest.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,10 @@ public function testGetValidatedVersionNumber(
7171
int $expectedint,
7272
string $expecteddec
7373
): void {
74-
[$newint, $newdec] = Helper::getValidatedVersionNumber($int, $dec);
74+
[
75+
'versionint' => $newint,
76+
'versiondec' => $newdec,
77+
] = Helper::getValidatedVersionNumber($int, $dec);
7578
$this->assertSame($expectedint, $newint);
7679
$this->assertSame($expecteddec, $newdec);
7780
}

0 commit comments

Comments
 (0)