Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/coding-standards.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ on:
jobs:
php-cs-fixer:
name: PHP CS Fixer (PHP ${{ matrix.php-version }})
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

strategy:
matrix:
php-version:
- '8.2'
- '8.4'

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Install PHP
uses: shivammathur/setup-php@v2
Expand All @@ -32,5 +32,3 @@ jobs:

- name: Run PHP CS Fixer
run: 'vendor/bin/php-cs-fixer fix --dry-run --format=checkstyle | cs2pr'
env:
PHP_CS_FIXER_IGNORE_ENV: 1
7 changes: 4 additions & 3 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
phpunit:
name: PHPUnit (PHP ${{ matrix.php-version }} - Symfony ${{ matrix.symfony-version }})
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
SYMFONY_REQUIRE: ${{ matrix.symfony-version }}

Expand All @@ -18,13 +18,14 @@ jobs:
php-version:
- '8.2'
- '8.3'
- '8.4'
symfony-version:
- '6.4.*'
- '7.0.*'
- '7.3.*'

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 2

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/static-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ on:
jobs:
phpstan:
name: PHPStan (PHP ${{ matrix.php-version }})
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

strategy:
matrix:
php-version:
- '8.2'
- '8.4'

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Install PHP
uses: shivammathur/setup-php@v2
Expand Down
1 change: 1 addition & 0 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

return (new PhpCsFixer\Config())
->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
->setUnsupportedPhpVersionAllowed(true)
->setRiskyAllowed(true)
->setRules([
'@Symfony' => true,
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"symfony/translation": "^6.4 || ^7.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.57.2",
"phpstan/phpstan": "^1.11.1",
"phpstan/phpstan-deprecation-rules": "^1.2.0",
"friendsofphp/php-cs-fixer": "^3.86.0",
"phpstan/phpstan": "^2.1.22",
"phpstan/phpstan-deprecation-rules": "^2.0.3",
"phpunit/phpunit": "^11.1.3",
"symfony/asset-mapper": "^6.4 || ^7.0",
"symfony/framework-bundle": "^6.4 || ^7.0",
Expand All @@ -33,8 +33,8 @@
"@phpstan",
"@phpunit"
],
"cs:dry": "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --diff --dry-run --no-interaction --ansi",
"cs:fix": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --ansi",
"cs:dry": "vendor/bin/php-cs-fixer fix --diff --dry-run --no-interaction --ansi",
"cs:fix": "vendor/bin/php-cs-fixer fix --ansi",
"phpstan": "vendor/bin/phpstan analyse --ansi",
"phpunit": "vendor/bin/phpunit --coverage-html=var/html-coverage --colors=auto"
},
Expand Down
2 changes: 1 addition & 1 deletion tests/Form/SlugTypeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function testRenderForm(): void
self::assertSame(
'<form name="form" method="post"><div id="form"><div><label for="form_name" class="required">Name</label><input type="text" id="form_name" name="form[name]" required="required"></div><div><label for="form_slug" class="required">Slug</label><div
class="input-group"
data-controller="leapt--slug-type-bundle--slug" data-leapt--slug-type-bundle--slug-target-value="form_name" data-leapt--slug-type-bundle--slug-alert-message-value="If&#x20;you&#x20;change&#x20;the&#x20;slug,&#x20;you&#x20;can&#x20;break&#x20;links&#x20;on&#x20;other&#x20;pages." data-leapt--slug-type-bundle--slug-locked-icon-value="&amp;&#x23;128274&#x3B;" data-leapt--slug-type-bundle--slug-unlocked-icon-value="&amp;&#x23;128275&#x3B;"
data-controller="leapt--slug-type-bundle--slug" data-leapt--slug-type-bundle--slug-target-value="form_name" data-leapt--slug-type-bundle--slug-alert-message-value="If you change the slug, you can break links on other pages." data-leapt--slug-type-bundle--slug-locked-icon-value="&amp;#128274;" data-leapt--slug-type-bundle--slug-unlocked-icon-value="&amp;#128275;"
>
<input type="text" id="form_slug" name="form[slug]" required="required">
<button class="btn btn-outline-secondary" type="button" data-leapt--slug-type-bundle--slug-target="button">
Expand Down