Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Use box 4.5.1 (#1588)
  Use PHP 8.3 (#1587)
  Use Composer 2.6.5 (#1586)
  Use PHP 8.3 (#1585)
  Enhancement: Require PHP `8.3` (#1584)
  composer(deps-dev): bump ergebnis/php-cs-fixer-config (#1583)
  • Loading branch information
OskarStark committed Nov 30, 2023
2 parents 1e29619 + a7a8002 commit b569b08
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.2"
- "8.3"

steps:
- name: "Checkout code"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.2"
- "8.3"

steps:
- name: "Checkout code"
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
strategy:
matrix:
php-version:
- '8.2'
- '8.3'

steps:
- name: "Checkout code"
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
strategy:
matrix:
php-version:
- '8.2'
- '8.3'

steps:
- name: "Checkout code"
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.2"
- "8.3"

steps:
- name: "Checkout code"
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.2"
- "8.3"

steps:
# workaround for missing secret in fork PRs - see https://github.com/actions/checkout/issues/298
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.2"
- "8.3"

steps:
-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.2"
- "8.3"

steps:
-
Expand Down
4 changes: 2 additions & 2 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

use Ergebnis\PhpCsFixer;
use Ergebnis\PhpCsFixer\Config\Factory;
use Ergebnis\PhpCsFixer\Config\RuleSet\Php82;
use Ergebnis\PhpCsFixer\Config\RuleSet\Php83;

$header = <<<'HEADER'
This file is part of DOCtor-RST.
Expand All @@ -28,7 +28,7 @@
'no_trailing_whitespace_in_string' => false,
];

$ruleSet = Php82::create()->withHeader($header)->withRules(PhpCsFixer\Config\Rules::fromArray(array_merge([
$ruleSet = Php83::create()->withHeader($header)->withRules(PhpCsFixer\Config\Rules::fromArray(array_merge([
'blank_line_before_statement' => [
'statements' => [
'break',
Expand Down
2 changes: 1 addition & 1 deletion .php-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.2
8.3
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
FROM php:8.2-cli-alpine as build
FROM php:8.3-cli-alpine as build

RUN apk add git # required for box to detect the version
RUN apk add --update icu-dev && docker-php-ext-install -j$(nproc) intl # related to https://github.com/box-project/box/issues/516

COPY --from=composer:2.4.4 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2.6.5 /usr/bin/composer /usr/bin/composer

WORKDIR /usr/src/app
ADD . /usr/src/app

RUN composer install --classmap-authoritative --no-interaction --no-dev --optimize-autoloader

ADD https://github.com/humbug/box/releases/download/4.2.0/box.phar ./box.phar
ADD https://github.com/humbug/box/releases/download/4.5.1/box.phar ./box.phar
RUN php box.phar compile

FROM php:8.2-cli-alpine
FROM php:8.3-cli-alpine

LABEL "com.github.actions.name"="DOCtor-RST"
LABEL "com.github.actions.description"="check *.rst files against given rules"
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "MIT",
"type": "project",
"require": {
"php": "^8.2",
"php": "^8.3",
"ext-ctype": "*",
"ext-iconv": "*",
"ext-mbstring": "*",
Expand Down Expand Up @@ -45,7 +45,8 @@
"symfony/polyfill-php74": "*",
"symfony/polyfill-php80": "*",
"symfony/polyfill-php81": "*",
"symfony/polyfill-php82": "*"
"symfony/polyfill-php82": "*",
"symfony/polyfill-php83": "*"
},
"autoload": {
"psr-4": {
Expand All @@ -70,4 +71,4 @@
},
"sort-packages": true
}
}
}
34 changes: 17 additions & 17 deletions composer.lock

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

1 change: 1 addition & 0 deletions rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
]);

$rectorConfig->skip([
\Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector::class,
ArraySpreadInsteadOfArrayMergeRector::class,
PreferPHPUnitThisCallRector::class,
ReplaceTestAnnotationWithPrefixedFunctionRector::class,
Expand Down

0 comments on commit b569b08

Please sign in to comment.