Skip to content

Commit b3229cc

Browse files
committed
bump dev dep
1 parent 44891e0 commit b3229cc

File tree

7 files changed

+14
-15
lines changed

7 files changed

+14
-15
lines changed

.github/workflows/qa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: shivammathur/setup-php@v2
1414
with:
1515
php-version: "8.3"
16-
tools: phpcs:3.10, php-cs-fixer:3.59, phpstan:1.11
16+
tools: phpcs:3.10, php-cs-fixer:3.61, phpstan:1.11
1717
coverage: none
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
php-version: "8.3"
4747
extensions: mbstring, bcmath, xdebug
48-
tools: phpunit:11.2
48+
tools: phpunit:11.3
4949
coverage: xdebug
5050
env:
5151
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.markdownlint.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@
22
"default" : true,
33
"ul-indent" : { "indent" : 4 },
44
"line-length" : false,
5-
"no-alt-text" : false
5+
"no-alt-text" : false,
6+
"table-column-count" : false,
7+
"table-pipe-style" : false
68
}

.php-cs-fixer.dist.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* php-cs-fixer configuration file.
55
*
6-
* minimum version: ^3.59
6+
* minimum version: ^3.61
77
*
88
* @see https://cs.symfony.com/doc/config.html
99
*/

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* [Puzzle list](puzzles.md) with topics and my completion status
1111
* Some [memes](memes.md) from AoC subreddit
1212
* Link to this repo on [GitHub](https://github.com/tbali0524/advent-of-code-solutions)
13+
* Link to my _partial_ rewrite of this repo in `Rust` on [GitHub](https://github.com/tbali0524/advent-of-code-rust)
1314

1415
## Installation
1516

composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
"metrics": "phpmetrics --config=.phpmetrics.json",
4848
"stan": "phpstan --ansi --verbose",
4949
"qa": [
50-
"parallel-lint --version",
51-
"@lint",
5250
"phpcs --version",
5351
"@cs",
5452
"@cs-fixer",
@@ -99,7 +97,7 @@
9997
"metrics": "Create code metrics report with phpmetrics",
10098
"stan": "Run static analysis with phpstan",
10199
"qa": "Run code quality checks: phpcs, php-cs-fixer, phpstan",
102-
"qa-full": "Run all code quality checks: phpcs, php-cs-fixer, phpstan, parallel-lint, phpmetrics, phpDocumentor, PHPUnit, and run all solutions",
100+
"qa-full": "Run all code quality checks: parallel-lint, phpcs, php-cs-fixer, phpstan, phpmetrics, phpDocumentor, PHPUnit, and run all solutions",
103101
"open-cover": "Open generated test coverage report in browser (fixed file path)",
104102
"open-doc": "Open generated documentation in browser (fixed file path)",
105103
"open-metrics": "Open generated code metrics report in browser (fixed file path)",

phpunit.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<!--
33
PHPUnit configuration file.
44
5-
minimum version: ^11.2
5+
minimum version: ^11.3
66
77
@see https://phpunit.readthedocs.io/en/11.0/configuration.html
88
-->
99
<phpunit
1010
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd"
11+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
1212
bootstrap="vendor/autoload.php"
1313
cacheDirectory=".tools/.phpunit.cache/"
1414
colors="true"

src/Aoc2020/Aoc2020Day14.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ public function solve(array $input): array
6060
$maskedValue = 0;
6161
for ($i = 0; $i < self::BIT_SIZE; ++$i) {
6262
match ($mask[$i]) {
63-
'0' => 0, // @phpstan-ignore match.alwaysFalse
64-
'1' => $maskedValue |= (1 << (self::BIT_SIZE - 1 - $i)), // @phpstan-ignore match.alwaysFalse
65-
// @phpstan-ignore match.alwaysTrue
63+
'0' => 0,
64+
'1' => $maskedValue |= (1 << (self::BIT_SIZE - 1 - $i)),
6665
'X' => $maskedValue |= ($value & (1 << (self::BIT_SIZE - 1 - $i))),
6766
default => throw new \Exception('Invalid mask'),
6867
};
@@ -99,10 +98,9 @@ public function solve(array $input): array
9998
$floatingBits = [];
10099
for ($i = 0; $i < self::BIT_SIZE; ++$i) {
101100
match ($mask[$i]) {
102-
// @phpstan-ignore match.alwaysFalse
103101
'0' => $maskedLoc |= ($loc & (1 << (self::BIT_SIZE - 1 - $i))),
104-
'1' => $maskedLoc |= (1 << (self::BIT_SIZE - 1 - $i)), // @phpstan-ignore match.alwaysFalse
105-
'X' => $floatingBits[] = self::BIT_SIZE - 1 - $i, // @phpstan-ignore match.alwaysTrue
102+
'1' => $maskedLoc |= (1 << (self::BIT_SIZE - 1 - $i)),
103+
'X' => $floatingBits[] = self::BIT_SIZE - 1 - $i,
106104
default => throw new \Exception('Invalid mask'),
107105
};
108106
}

0 commit comments

Comments
 (0)