Skip to content

Commit

Permalink
Merge pull request #1776 from tomudding/feature/php-8.3.1
Browse files Browse the repository at this point in the history
Upgrade to PHP 8.3.2
  • Loading branch information
tomudding authored Jan 26, 2024
2 parents 67985a1 + d52116e commit c3ad38b
Show file tree
Hide file tree
Showing 32 changed files with 1,884 additions and 1,683 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
php-codesniffer:
uses: 'GEWIS/gewisphp-coding-standards/.github/workflows/[email protected]'
with:
php-version: '8.2'
php-version: '8.3'
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
tools: phpdoc

- name: Clone the target branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis-phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
extensions: calendar, curl, exif, gd, intl, opcache, pgsql, pdo_mysql, pdo_pgsql, zip, imagick, memcached, xdebug
tools: cs2pr

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis-psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
extensions: calendar, curl, exif, gd, intl, opcache, pgsql, pdo_mysql, pdo_pgsql, zip, imagick, memcached, xdebug

- name: Extract configuration files
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
extensions: calendar, curl, exif, gd, intl, opcache, pgsql, pdo_mysql, pdo_pgsql, zip, imagick, memcached, xdebug

- name: Setup problem matchers for PHPUnit
Expand Down
7 changes: 4 additions & 3 deletions .idea/php.xml

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

130 changes: 65 additions & 65 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"homepage": "https://gewis.nl/",
"require": {
"php": "^8.2.0",
"php": "^8.3.0",
"ext-calendar": "*",
"ext-curl": "*",
"ext-dom": "*",
Expand All @@ -26,78 +26,78 @@
"ext-pgsql": "*",
"ext-zend-opcache": "*",
"ext-zip": "^1.12.0",
"laminas/laminas-authentication": "^2.13.0",
"laminas/laminas-cache": "^3.8.0",
"laminas/laminas-cache-storage-adapter-memcached": "^2.3.0",
"laminas/laminas-captcha": "^2.15.0",
"laminas/laminas-cli": "^1.7.0",
"laminas/laminas-code": "^4.8.0",
"laminas/laminas-crypt": "^3.9.0",
"laminas/laminas-escaper": "^2.12.0",
"laminas/laminas-eventmanager": "^3.8.0",
"laminas/laminas-form": "^3.7.0",
"laminas/laminas-http": "^2.18.0",
"laminas/laminas-hydrator": "^4.9.0",
"laminas/laminas-i18n": "^2.21.0",
"laminas/laminas-i18n-resources": "^2.9.0",
"laminas/laminas-inputfilter": "^2.13.0",
"laminas/laminas-json": "^3.5.0",
"laminas/laminas-mail": "^2.20.0",
"laminas/laminas-mime": "^2.11.0",
"laminas/laminas-modulemanager": "^2.14.0",
"laminas/laminas-mvc": "^3.5.0",
"laminas/laminas-mvc-i18n": "^1.7.0",
"laminas/laminas-mvc-plugin-flashmessenger": "^1.9.0",
"laminas/laminas-paginator": "^2.16.0",
"laminas/laminas-permissions-acl": "^2.13.0",
"laminas/laminas-router": "^3.11.0",
"laminas/laminas-serializer": "^2.14.0",
"laminas/laminas-servicemanager": "^3.20.0",
"laminas/laminas-session": "^2.12.0",
"laminas/laminas-stdlib": "^3.16.0",
"laminas/laminas-validator": "^2.28.0",
"laminas/laminas-view": "^2.25.0",
"doctrine/dbal": "^3.5.0",
"doctrine/orm": "^2.15.2",
"doctrine/doctrine-module": "^6.0",
"doctrine/doctrine-orm-module": "^6.0",
"doctrine/doctrine-laminas-hydrator": "^3.2.0",
"laminas/laminas-authentication": "^2.16.0",
"laminas/laminas-cache": "^3.12.1",
"laminas/laminas-cache-storage-adapter-memcached": "^2.5.0",
"laminas/laminas-captcha": "^2.17.0",
"laminas/laminas-cli": "^1.10.0",
"laminas/laminas-code": "^4.13.0",
"laminas/laminas-crypt": "^3.11.0",
"laminas/laminas-escaper": "^2.13.0",
"laminas/laminas-eventmanager": "^3.13.0",
"laminas/laminas-form": "^3.19.1",
"laminas/laminas-http": "^2.19.0",
"laminas/laminas-hydrator": "^4.15.0",
"laminas/laminas-i18n": "^2.26.0",
"laminas/laminas-i18n-resources": "^2.10.0",
"laminas/laminas-inputfilter": "^2.29.0",
"laminas/laminas-json": "^3.6.0",
"laminas/laminas-mail": "^2.25.1",
"laminas/laminas-mime": "^2.12.0",
"laminas/laminas-modulemanager": "^2.15.0",
"laminas/laminas-mvc": "^3.7.0",
"laminas/laminas-mvc-i18n": "^1.8.0",
"laminas/laminas-mvc-plugin-flashmessenger": "^1.10.1",
"laminas/laminas-paginator": "^2.18.1",
"laminas/laminas-permissions-acl": "^2.16.0",
"laminas/laminas-router": "^3.12.0",
"laminas/laminas-serializer": "^2.17.0",
"laminas/laminas-servicemanager": "^3.22.1",
"laminas/laminas-session": "^2.17.0",
"laminas/laminas-stdlib": "^3.19.0",
"laminas/laminas-validator": "^2.47.0",
"laminas/laminas-view": "^2.34.0",
"doctrine/dbal": "^3.8.0",
"doctrine/orm": "^2.17.3",
"doctrine/doctrine-module": "^6.1.0",
"doctrine/doctrine-orm-module": "^6.1.0",
"doctrine/doctrine-laminas-hydrator": "^3.4.0",
"maglnet/magl-markdown": "^1.10.0",
"twbs/bootstrap-sass": "^3.3.0",
"firebase/php-jwt": "^6.3.0",
"monolog/monolog": "^3.0.0",
"league/glide": "^2.2.0",
"fortawesome/font-awesome": "^6.0.0",
"cweagans/composer-patches": "^1.7.1",
"twbs/bootstrap-sass": "^3.4.3",
"firebase/php-jwt": "^6.10.0",
"monolog/monolog": "^3.5.0",
"league/glide": "^2.3.0",
"fortawesome/font-awesome": "^6.5.1",
"cweagans/composer-patches": "^1.7.3",
"setasign/fpdi": "2.3.6",
"tecnickcom/tcpdf": "6.5.0",
"jfcherng/php-diff": "^6.15",
"league/commonmark": "^2.4"
"jfcherng/php-diff": "^6.15.3",
"league/commonmark": "^2.4.1"
},
"require-dev": {
"ext-pdo_sqlite": "*",
"ext-simplexml": "*",
"ext-xdebug": "^3.0.0",
"laminas/laminas-component-installer": "^3.1.0",
"laminas/laminas-developer-tools": "^2.6.0",
"laminas/laminas-loader": "^2.9.0",
"laminas/laminas-test": "^4.5.0",
"san/san-session-toolbar": "^4.0.0",
"phpunit/phpunit": "^9.5.20",
"squizlabs/php_codesniffer": "^3.8.0",
"friendsofphp/php-cs-fixer": "^3.8.0",
"phpstan/phpstan": "^1.9.0",
"phpstan/extension-installer": "^1.1.0",
"laminas/laminas-component-installer": "^3.4.0",
"laminas/laminas-developer-tools": "^2.9.0",
"laminas/laminas-loader": "^2.10.0",
"laminas/laminas-test": "^4.10.0",
"san/san-session-toolbar": "^4.0.1",
"phpunit/phpunit": "^10.5.9",
"squizlabs/php_codesniffer": "^3.8.1",
"friendsofphp/php-cs-fixer": "^3.48.0",
"phpstan/phpstan": "^1.10.57",
"phpstan/extension-installer": "^1.3.1",
"bnf/phpstan-psr-container": "^1.0.1",
"slam/phpstan-laminas-framework": "^1.4.0",
"phpstan/phpstan-doctrine": "^1.3.9",
"phpstan/phpstan-phpunit": "^1.1.1",
"vimeo/psalm": "^5.1.0",
"lctrs/psalm-psr-container-plugin": "^1.9.0",
"weirdan/doctrine-psalm-plugin": "^2.6.0",
"psalm/plugin-phpunit": "^0.18.0",
"maglnet/composer-require-checker": "^4.3.0",
"icanhazstring/composer-unused": "^0.8.2",
"slam/phpstan-laminas-framework": "^1.5.0",
"phpstan/phpstan-doctrine": "^1.3.59",
"phpstan/phpstan-phpunit": "^1.3.15",
"vimeo/psalm": "^5.20.0",
"lctrs/psalm-psr-container-plugin": "^1.10.0",
"weirdan/doctrine-psalm-plugin": "^2.9.0",
"psalm/plugin-phpunit": "^0.18.4",
"maglnet/composer-require-checker": "^4.8.0",
"icanhazstring/composer-unused": "^0.8.11",
"gewis/gewisphp-coding-standards": "^1.1.0"
},
"replace": {
Expand Down Expand Up @@ -144,7 +144,7 @@
"extra": {
"patches": {
"doctrine/orm": {
"Fix issues with SubDecisions.": "https://raw.githubusercontent.com/GEWIS/orm/2.15.x/1-to-1-multiple-join-columns.patch"
"Fix issues with SubDecisions.": "https://raw.githubusercontent.com/GEWIS/orm/2.17.x/1-to-1-multiple-join-columns.patch"
},
"jfcherng/php-diff": {
"Always output diff.": "https://raw.githubusercontent.com/GEWIS/gewisweb-php-diff/v6/always-render-diff.patch"
Expand Down
Loading

0 comments on commit c3ad38b

Please sign in to comment.