Skip to content

Commit

Permalink
Merge branch 'master' into dev-4.6
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
  • Loading branch information
julien-boudry committed Dec 1, 2023
2 parents 502707f + 5469890 commit 6292958
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/building_phar_executable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
php-version: 8.3
extensions: mbstring, json, dom, pdo, pdo_sqlite

- name: Check PHP Version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codacy_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.2']
php-versions: ['8.3']

name: PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }} - Execute All Tests With coverage

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/execute_all_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest, windows-latest]
php-versions: ['8.2']
php-versions: ['8.2', '8.3']
php-extensions: ['pdo,pdo_sqlite,mbstring,json', 'none,curl,mbstring,json,dom,openssl,tokenizer,xml,xmlwriter,zip']
fail-fast: false

Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@
"php": "^8.2",
"ext-json": "*",
"ext-mbstring": "*",
"symfony/console": "^6.2",
"symfony/yaml": "^6.2",
"symfony/console": "^6.4 || ^7.0",
"symfony/yaml": "^6.4 || ^7.0",
"brick/math": "^0.11"
},
"require-dev": {
"ext-pdo": "*",
"ext-pdo_sqlite": "*",
"phpbench/phpbench": "*",
"phpunit/phpunit": "^10.1",
"phpunit/phpunit": "^10.5",
"haydenpierce/class-finder": ">= 0.5.3",
"infection/infection": "^0.26",
"phpstan/phpstan": "^1.9",
"laravel/pint": "^1.10",
"pestphp/pest": "^2.9",
"laravel/pint": "^1.13",
"pestphp/pest": "^2.24",
"pestphp/pest-plugin-drift": "^2.0",
"cmgmyr/phploc": "^8.0"
},
Expand Down

0 comments on commit 6292958

Please sign in to comment.