Skip to content

Commit

Permalink
minor #194 Fix CI (jmsche)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the main branch.

Discussion
----------

Fix CI

* Fix code style after new release of PHP CS Fixer
* Update runs-on Ubuntu version used in GitHub Actions

Commits
-------

58fd447 Fix CI
  • Loading branch information
weaverryan committed Oct 18, 2022
2 parents 718673b + 58fd447 commit 2a4889b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
tests:
name: "Tests ${{ matrix.php-version }} deps ${{ matrix.dependency-versions }}"
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

strategy:
fail-fast: false
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Static analysis
jobs:
phpstan:
name: PHPStan
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout code
Expand All @@ -30,7 +30,7 @@ jobs:

php-cs-fixer:
name: PHP-CS-Fixer
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Checkout code
Expand All @@ -53,7 +53,7 @@ jobs:

psalm:
name: Psalm
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand All @@ -78,7 +78,7 @@ jobs:

composer-normalize:
name: Composer Normalize
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: Setup PHP
Expand Down
2 changes: 2 additions & 0 deletions tests/IntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ public function provideLegacyRenderMultipleStimulusControllers()

/**
* @dataProvider provideLegacyRenderMultipleStimulusControllers
*
* @legacy
*/
public function testLegacyRenderMultipleStimulusControllers($dataOrControllerName, array $controllerValues, string $expectedString, array $expectedArray)
Expand Down Expand Up @@ -482,6 +483,7 @@ public function provideLegacyRenderMultipleStimulusAction(): \Generator

/**
* @dataProvider provideLegacyRenderMultipleStimulusAction
*
* @legacy
*/
public function testLegacyRenderMultipleStimulusActions($dataOrControllerName, ?string $actionName, ?string $eventName, array $parameters, string $expectedString, array $expectedArray)
Expand Down

0 comments on commit 2a4889b

Please sign in to comment.