Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
606e607
fix(deps): update dependency phpdocumentor/reflection-docblock to v5.6.1
renovate[bot] Feb 25, 2025
6f680e9
chore(deps): update dependency friendsofphp/php-cs-fixer to v3.75.0
renovate[bot] Apr 11, 2025
b4b3c14
fix(deps): update dependency api-platform/core to v4
renovate[bot] Apr 11, 2025
e480074
Merge remote-tracking branch 'BacLuc/migrate-rfc-compliant-errors' in…
usu Apr 11, 2025
de5a91d
fix errors
usu Apr 11, 2025
ff94bab
fix phpstan/psalm errors
usu Apr 11, 2025
eb0756d
fix tests
usu Apr 11, 2025
1d60ae9
Merge remote-tracking branch 'ecamp/devel' into renovate/api-platform…
usu Apr 12, 2025
c59d3d4
update snapshots
usu Apr 12, 2025
bf62f7b
run cs-fix
usu Apr 12, 2025
209f120
Merge pull request #6914 from ecamp/renovate/friendsofphp-php-cs-fixe…
renovate[bot] Apr 12, 2025
ed89745
chore(deps): update cypress to v13.17.0
renovate[bot] Apr 12, 2025
e4f369b
chore(deps): update php
renovate[bot] Apr 12, 2025
aa46990
chore(deps): update dependency psalm/phar to v6
renovate[bot] Apr 12, 2025
2f36959
use PHP_CS_FIXER_IGNORE_ENV
usu Apr 12, 2025
f1608e2
Merge pull request #6546 from ecamp/renovate/cypress
usu Apr 12, 2025
8816b6b
fix/change tests
usu Apr 12, 2025
462c903
don't ensure override attribute
usu Apr 12, 2025
59c0d75
merge devel
usu Apr 12, 2025
fc93977
Merge pull request #7191 from ecamp/renovate/api-platform-core-4.x
usu Apr 12, 2025
d6bd3c0
merge devel
usu Apr 12, 2025
8f51c59
Merge pull request #6764 from ecamp/renovate/psalm-phar-6.x
usu Apr 12, 2025
0069a31
Merge remote-tracking branch 'ecamp/devel' into renovate/php
usu Apr 12, 2025
4867a66
raise min. php version to 8.4
usu Apr 12, 2025
973bb3a
api: update dev-data
BacLuc Apr 12, 2025
bb25fb9
update lock file
usu Apr 12, 2025
7d45596
composer update
usu Apr 12, 2025
376457f
merge devel
usu Apr 12, 2025
d196dbf
Merge pull request #7202 from BacLuc/update-dev-data
BacLuc Apr 12, 2025
8057d73
Merge pull request #6332 from ecamp/renovate/phpdocumentor-reflection…
renovate[bot] Apr 12, 2025
16f144c
Adjust title tag to match view
manuelmeister Apr 12, 2025
3dc428e
api: offer camp_collaborations as subresource
BacLuc Apr 12, 2025
14ae879
Update frontend/package.json
manuelmeister Apr 12, 2025
a155435
merge evel
usu Apr 12, 2025
2619cb4
Merge pull request #6323 from ecamp/renovate/php
usu Apr 12, 2025
48834b1
Merge pull request #7205 from BacLuc/campcollaboration_subresource
pmattmann Apr 12, 2025
899ca6a
Merge pull request #7206 from manuelmeister/feature/title-head
manuelmeister Apr 12, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/check-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- uses: shivammathur/setup-php@v2
with:
php-version: '8.3.13'
php-version: '8.4.6'
tools: composer:2.8.0
coverage: xdebug

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/continuous-integration-optional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- uses: shivammathur/setup-php@v2
with:
php-version: '8.3.13'
php-version: '8.4.6'
tools: composer:2.8.0
coverage: xdebug

Expand All @@ -36,7 +36,7 @@ jobs:

- uses: shivammathur/setup-php@v2
with:
php-version: '8.3.13'
php-version: '8.4.6'
tools: composer:2.8.0
coverage: xdebug

Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:

- uses: shivammathur/setup-php@v2
with:
php-version: '8.3.13'
php-version: '8.4.6'
tools: composer:2.8.0
coverage: xdebug

Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:

- uses: shivammathur/setup-php@v2
with:
php-version: '8.3.13'
php-version: '8.4.6'
tools: composer:2.8.0
coverage: xdebug

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
".github/workflows/continuous-integration.yml"
]
do_not_skip: '["workflow_dispatch", "schedule"]'

frontend-check-needed:
runs-on: ubuntu-latest
outputs:
Expand All @@ -56,7 +56,7 @@ jobs:
".github/workflows/continuous-integration.yml"
]
do_not_skip: '["workflow_dispatch", "schedule"]'

e2e-check-needed:
runs-on: ubuntu-latest
outputs:
Expand All @@ -79,7 +79,7 @@ jobs:
".env.ci"
]
do_not_skip: '["workflow_dispatch", "schedule"]'

api-cs-check:
name: 'Lint: API (php-cs-fixer)'
runs-on: ubuntu-latest
Expand All @@ -91,7 +91,7 @@ jobs:

- uses: shivammathur/setup-php@v2
with:
php-version: '8.3.13'
php-version: '8.4.6'
tools: composer:2.8.0
coverage: none

Expand All @@ -110,7 +110,7 @@ jobs:
- run: composer install --no-interaction --no-plugins --no-scripts --prefer-dist
working-directory: api

- run: php vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --diff
- run: PHP_CS_FIXER_IGNORE_ENV=1 php vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php -v --dry-run --diff
working-directory: api

frontend-eslint:
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:

- uses: shivammathur/setup-php@v2
with:
php-version: '8.3.13'
php-version: '8.4.6'
extensions: intl-73.1
tools: composer:2.8.0
coverage: pcov
Expand Down Expand Up @@ -490,7 +490,7 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel-finished: true
carryforward: "api,frontend,print,pdf"
carryforward: 'api,frontend,print,pdf'
fail-on-error: false

workflow-success:
Expand Down
2 changes: 1 addition & 1 deletion api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Adapted from https://github.com/api-platform/api-platform/blob/fa1c5808305d7cadbf7b8392e0fddb6e80fb2092/api/Dockerfile

# Versions
FROM dunglas/frankenphp:1.2-php8.3.13 AS frankenphp_upstream
FROM dunglas/frankenphp:1.5-php8.4.6 AS frankenphp_upstream

# the different stages of this Dockerfile are meant to be built into separate images
# https://docs.docker.com/develop/develop-images/multistage-build/#stop-at-a-specific-build-stage
Expand Down
14 changes: 7 additions & 7 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"type": "project",
"license": "MIT",
"require": {
"php": ">=8.1.0",
"php": ">=8.4.0",
"ext-ctype": "*",
"ext-iconv": "*",
"api-platform/core": "3.4.17",
"api-platform/core": "4.1.7",
"composer/package-versions-deprecated": "1.11.99",
"cweagans/composer-patches": "1.7.3",
"doctrine/common": "3.5.0",
Expand All @@ -21,7 +21,7 @@
"league/oauth2-google": "4.0.1",
"lexik/jwt-authentication-bundle": "3.1.1",
"nelmio/cors-bundle": "2.5.0",
"phpdocumentor/reflection-docblock": "5.5.1",
"phpdocumentor/reflection-docblock": "5.6.1",
"phpmyadmin/sql-parser": "5.11.0",
"ramsey/uuid": "4.7.6",
"rize/uri-template": "0.4.0",
Expand Down Expand Up @@ -53,15 +53,15 @@
},
"require-dev": {
"brianium/paratest": "v7.8.3",
"friendsofphp/php-cs-fixer": "3.69.1",
"friendsofphp/php-cs-fixer": "3.75.0",
"hautelook/alice-bundle": "2.15.1",
"justinrainbow/json-schema": "6.4.1",
"php-coveralls/php-coveralls": "2.7.0",
"phpspec/prophecy-phpunit": "2.3.0",
"phpstan/phpstan": "2.1.11",
"phpunit/phpunit": "11.5.17",
"rector/rector": "2.0.11",
"psalm/phar": "5.26.1",
"psalm/phar": "6.10.0",
"spatie/phpunit-snapshot-assertions": "5.1.8",
"symfony/browser-kit": "7.2.4",
"symfony/css-selector": "7.2.0",
Expand Down Expand Up @@ -109,8 +109,8 @@
"symfony/polyfill-php71": "*"
},
"scripts": {
"cs-check": "php-cs-fixer fix --dry-run",
"cs-fix": "php-cs-fixer fix",
"cs-check": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --dry-run",
"cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix",
"test": [
"Composer\\Config::disableProcessTimeout",
"vendor/bin/phpunit -d memory_limit=-1 -c phpunit.xml.dist"
Expand Down
Loading
Loading