Skip to content

Commit 349d02f

Browse files
committed
Rescaffold, bump PHP to 8.3
1 parent abc8eb7 commit 349d02f

7 files changed

Lines changed: 16 additions & 25 deletions

File tree

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Put env variables defaults here
22
# Override locally in gitignored .env.local
3-
PHP_IMAGE_VERSION=8.2
3+
PHP_IMAGE_VERSION=8.3

.github/workflows/check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy: &strategy
2929
fail-fast: false
3030
matrix:
31-
php: [ 8.2, 8.3, 8.4, 8.5 ]
31+
php: [ 8.3, 8.4, 8.5 ]
3232
deps: [ lowest, highest ]
3333
steps:
3434
- uses: actions/checkout@v6

Makefile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,10 @@ rescaffold:
6868
--pull always \
6969
ghcr.io/phpyh/scaffolder:latest \
7070
--user-name-default '$(shell git config user.name 2>/dev/null || whoami 2>/dev/null)' \
71-
--user-email-default '$(shell git config user.email 2>/dev/null)' \
72-
--package-project-default '$(shell basename $$(pwd))'
71+
--user-email-default '$(shell git config user.email 2>/dev/null)'
7372
git add --all 2>/dev/null || true
7473
.PHONY: rescaffold
7574

76-
generate:
77-
$(RUN) php generator/generate.php
78-
$(MAKE) fixer
79-
git add .
80-
.PHONY: generate
81-
8275
var:
8376
mkdir var
8477

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818
}
1919
],
2020
"require": {
21-
"php": "^8.2",
22-
"symfony/polyfill-php83": "^1.33"
21+
"php": "^8.3"
2322
},
2423
"require-dev": {
2524
"nette/php-generator": "^4.2.0",
26-
"phpunit/phpunit": "^11.5.42",
25+
"phpunit/phpunit": "^12",
2726
"symfony/finder": "^7.3.5",
2827
"symfony/polyfill-php85": "^1.33",
2928
"symfony/var-dumper": "^7.3.5"

generator/Generator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
final readonly class Generator
2121
{
22-
private const GENERATED_NOTICE = '@generated This file was generated, do not edit manually.';
23-
private const NAMESPACE = 'Typhoon\Type';
22+
private const string GENERATED_NOTICE = '@generated This file was generated, do not edit manually.';
23+
private const string NAMESPACE = 'Typhoon\Type';
2424

2525
/**
2626
* @param non-empty-string $typeDir

phpunit.xml.dist

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
4+
beStrictAboutCoverageMetadata="true"
5+
beStrictAboutOutputDuringTests="true"
46
bootstrap="vendor/autoload.php"
57
cacheDirectory="var/phpunit"
6-
requireCoverageMetadata="true"
7-
beStrictAboutOutputDuringTests="true"
8+
defaultTestSuite="default"
9+
displayDetailsOnAllIssues="true"
10+
failOnIncomplete="true"
11+
failOnNotice="true"
812
failOnRisky="true"
913
failOnWarning="true"
10-
defaultTestSuite="default"
14+
requireCoverageMetadata="true"
1115
>
12-
<php>
13-
<ini name="display_errors" value="1"/>
14-
<ini name="error_reporting" value="-1"/>
15-
</php>
16-
1716
<testsuites>
1817
<testsuite name="default">
1918
<directory>tests</directory>
2019
</testsuite>
2120
</testsuites>
2221

23-
<source restrictNotices="true" restrictWarnings="true" ignoreIndirectDeprecations="true">
22+
<source ignoreIndirectDeprecations="true">
2423
<include>
2524
<directory>src</directory>
2625
</include>

tests/Type/ConstructorsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#[CoversClass(Parameter::class)]
4848
final class ConstructorsTest extends TestCase
4949
{
50-
private const NON_TYPE_CONSTRUCTOR_FUNCTIONS = [
50+
private const array NON_TYPE_CONSTRUCTOR_FUNCTIONS = [
5151
'optional',
5252
'param',
5353
'stringify',

0 commit comments

Comments
 (0)