Skip to content

Commit 504d7f8

Browse files
r3hp1cr3hp1c
authored
Merge pull request absolute-quantum#42 from phansys/ci
Update CI dependencies for GHA
2 parents 79f148a + 7922709 commit 504d7f8

File tree

7 files changed

+19
-16
lines changed

7 files changed

+19
-16
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
static-analysis:
1414
name: Static Analysis
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1616

1717
steps:
1818
- name: "Checkout code"
@@ -22,7 +22,7 @@ jobs:
2222
uses: "shivammathur/setup-php@v2"
2323
with:
2424
coverage: "none"
25-
php-version: "8.0"
25+
php-version: "8.4"
2626

2727
- name: "Validate composer.json"
2828
run: "composer validate --strict --no-check-lock"
@@ -50,14 +50,14 @@ jobs:
5050

5151
tests:
5252
name: "Tests ${{ matrix.php-version }} ${{ matrix.dependency-versions }}"
53-
runs-on: ubuntu-22.04
53+
runs-on: ubuntu-24.04
5454
needs: static-analysis
5555

5656
strategy:
5757
fail-fast: false
5858
matrix:
5959
# normal, highest, non-dev installs
60-
php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
60+
php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
6161
composer-options: ['--prefer-stable']
6262
dependency-versions: ['highest']
6363
include:
@@ -122,32 +122,32 @@ jobs:
122122
dependency-versions: "${{ matrix.dependency-versions }}"
123123
composer-options: "--prefer-dist --no-progress"
124124
working-directory: "demo/symfony6.x"
125-
if: ${{ startsWith(matrix.php-version , '8.1') || startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') }}
125+
if: ${{ startsWith(matrix.php-version , '8.1') || startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') }}
126126

127127
- name: Demo symfony6.x - Unit Tests
128128
run: demo/symfony6.x/vendor/bin/simple-phpunit -c demo/symfony6.x/phpunit.xml.dist
129-
if: ${{ startsWith(matrix.php-version , '8.1') || startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') }}
129+
if: ${{ startsWith(matrix.php-version , '8.1') || startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') }}
130130

131131
- name: Demo symfony6.x-orm3 - Install dependencies
132132
uses: "ramsey/composer-install@v3"
133133
with:
134134
dependency-versions: "${{ matrix.dependency-versions }}"
135135
composer-options: "--prefer-dist --no-progress"
136136
working-directory: "demo/symfony6.x-orm3"
137-
if: ${{ startsWith(matrix.php-version , '8.1') || startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') }}
137+
if: ${{ startsWith(matrix.php-version , '8.1') || startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') }}
138138

139139
- name: Demo symfony6.x-orm3 - Unit Tests
140140
run: demo/symfony6.x/vendor/bin/simple-phpunit -c demo/symfony6.x-orm3/phpunit.xml.dist
141-
if: ${{ startsWith(matrix.php-version , '8.1') || startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') }}
141+
if: ${{ startsWith(matrix.php-version , '8.1') || startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') }}
142142

143143
- name: Demo symfony7.x - Install dependencies
144144
uses: "ramsey/composer-install@v3"
145145
with:
146146
dependency-versions: "${{ matrix.dependency-versions }}"
147147
composer-options: "--prefer-dist --no-progress"
148148
working-directory: "demo/symfony7.x"
149-
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') }}
149+
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') }}
150150

151151
- name: Demo symfony7.x - Unit Tests
152152
run: demo/symfony7.x/vendor/bin/simple-phpunit -c demo/symfony7.x/phpunit.xml.dist
153-
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') }}
153+
if: ${{ startsWith(matrix.php-version , '8.2') || startsWith(matrix.php-version , '8.3') || startsWith(matrix.php-version , '8.4') }}

‎demo/symfony5.4/src/Repository/Attribute/SecretRepository.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class_alias(
1616
if (PHP_VERSION_ID >= 80000) {
1717
/**
1818
* @method Secret|null find($id, $lockMode = null, $lockVersion = null)
19-
* @method Secret|null findOneBy(array $criteria, array $orderBy = null)
20-
* @method Secret[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
19+
* @method Secret|null findOneBy(array $criteria, ?array $orderBy = null)
20+
* @method Secret[] findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
2121
*/
2222
class SecretRepository extends AbstractSecretRepository
2323
{

‎demo/symfony6.x/config/packages/doctrine.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ doctrine:
99
auto_generate_proxy_classes: true
1010
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
1111
auto_mapping: true
12+
report_fields_where_declared: true
1213
mappings:
1314
Annotation:
1415
type: 'annotation'

‎demo/symfony6.x/phpunit.xml.dist‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<server name="SHELL_VERBOSITY" value="-1" />
1616
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
1717
<server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
18+
<env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled" />
1819
</php>
1920

2021
<testsuites>

‎demo/symfony6.x/src/Repository/Attribute/SecretRepository.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class_alias(
1616
if (PHP_VERSION_ID >= 80000) {
1717
/**
1818
* @method Secret|null find($id, $lockMode = null, $lockVersion = null)
19-
* @method Secret|null findOneBy(array $criteria, array $orderBy = null)
20-
* @method Secret[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
19+
* @method Secret|null findOneBy(array $criteria, ?array $orderBy = null)
20+
* @method Secret[] findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
2121
*/
2222
class SecretRepository extends AbstractSecretRepository
2323
{

‎demo/symfony7.x/phpunit.xml.dist‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<server name="SHELL_VERBOSITY" value="-1" />
1515
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
1616
<server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
17+
<env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled" />
1718
</php>
1819

1920
<testsuites>

‎demo/symfony7.x/src/Repository/Attribute/SecretRepository.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class_alias(
1616
if (PHP_VERSION_ID >= 80000) {
1717
/**
1818
* @method Secret|null find($id, $lockMode = null, $lockVersion = null)
19-
* @method Secret|null findOneBy(array $criteria, array $orderBy = null)
20-
* @method Secret[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
19+
* @method Secret|null findOneBy(array $criteria, ?array $orderBy = null)
20+
* @method Secret[] findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null)
2121
*/
2222
class SecretRepository extends AbstractSecretRepository
2323
{

0 commit comments

Comments
 (0)