Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/jobs/baseinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

export version="$1"
db=${2:-install}
phpversion="${3:-8.1}"
phpversion="${3:-8.2}"
# If this script is called from unit-tests.sh, we use the test environment
export APP_ENV="${4:-prod}"

Expand Down
1 change: 1 addition & 0 deletions .github/jobs/composer_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ section_start "Configure PHP"
PHPVERSION=$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION."\n";')
export PHPVERSION
echo "$PHPVERSION" | tee -a "$ARTIFACTS"/phpversion.txt
sudo apt-get -y purge "php$PHPVERSION-redis"
section_end

section_start "Run composer"
Expand Down
1 change: 1 addition & 0 deletions .github/jobs/data/codespellignorefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ composer*
./doc/logos
./m4
./webapp/tests/Unit/Fixtures
./webapp/config/reference.php
1 change: 1 addition & 0 deletions .github/jobs/detect_dump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ OUT=$(find ./ -name ".git*" -type d -prune -o \
-name "bundles" -prune -o \
-name "cache" -type d -prune -o \
-name "ace" -type d -prune -o \
-path "./webapp/config/reference.php" -prune -o \
-type f -print0 | xargs -0 grep --color "dump(" | grep -v "Yaml::dump(") || true

# Show detected debug statements
Expand Down
16 changes: 8 additions & 8 deletions .github/jobs/syntax-check
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ if [ ! -x /usr/bin/shellcheck ]; then
fi

find . \( \
-path ./webapp/vendor -prune \
-o -path ./webapp/var -prune \
-o -path ./output -prune \
-o -path ./.git -prune \
-o -path ./webapp/migrations -prune \
-o -path ./example_problems -prune \
-o -type f \) \
-a -type f | \
-path ./webapp/vendor -prune \
-o -path ./webapp/var -prune \
-o -path ./output -prune \
-o -path ./.git -prune \
-o -path ./webapp/migrations -prune \
-o -path ./example_problems -prune \
-o -path ./webapp/config/reference.php \
-o -type f -print \) | \
while read -r i ; do
if [[ "$i" == *\.php ]] || grep -q "^#\\!.*php" "$i" && \
echo "$i" | grep -qvE '(^\./(webapp/resources/adminer)\.php)'; then
Expand Down
4 changes: 2 additions & 2 deletions .github/jobs/unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ DIR="$PWD"

export version=$1
unittest=$2
[ "$version" = "8.1" ] && CODECOVERAGE=1 || CODECOVERAGE=0
[ "$version" = "8.2" ] && CODECOVERAGE=1 || CODECOVERAGE=0

# Set up
export unit=1
Expand Down Expand Up @@ -46,7 +46,7 @@ cp ${DIR}/webapp/var/log/*.log "$ARTIFACTS"/

set -e
CNT=0
THRESHOLD=2
THRESHOLD=10
if [ $CODECOVERAGE -eq 1 ]; then
CNT=$(sed -n '/Generating code coverage report/,$p' "$ARTIFACTS"/phpunit.out | grep -cv ^$)
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
image: pipelinecomponents/php-codesniffer:latest
strategy:
matrix:
PHPVERSION: ["8.1", "8.2", "8.3", "8.4"]
PHPVERSION: ["8.2", "8.3", "8.4"]
steps:
- run: apk add git
- uses: actions/checkout@v4
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 @@ -43,7 +43,7 @@ jobs:
options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
PHPVERSION: [8.1, 8.4]
PHPVERSION: [8.2, 8.4]
TEST: [Unit, E2E]
steps:
- uses: actions/checkout@v4
Expand Down
62 changes: 31 additions & 31 deletions webapp/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}
],
"require": {
"php": "^8.1.0",
"php": "^8.2.0",
"ext-bcmath": "*",
"ext-ctype": "*",
"ext-curl": "*",
Expand All @@ -57,7 +57,7 @@
"doctrine/doctrine-bundle": "^2.8",
"doctrine/doctrine-fixtures-bundle": "^4.0",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^2.14",
"doctrine/orm": "^3.0",
"enshrined/svg-sanitize": "^0.22.0",
"friendsofsymfony/rest-bundle": "^3.5",
"ircmaxell/password-compat": "*",
Expand All @@ -72,32 +72,32 @@
"ramsey/uuid": "^4.2",
"riverline/multipart-parser": "^2.1",
"sentry/sentry-symfony": "^5.0",
"symfony/asset": "6.4.*",
"symfony/browser-kit": "6.4.*",
"symfony/console": "6.4.*",
"symfony/css-selector": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/expression-language": "6.4.*",
"symfony/asset": "7.4.*",
"symfony/browser-kit": "7.4.*",
"symfony/console": "7.4.*",
"symfony/css-selector": "7.4.*",
"symfony/dotenv": "7.4.*",
"symfony/expression-language": "7.4.*",
"symfony/flex": "^2",
"symfony/form": "6.4.*",
"symfony/framework-bundle": "6.4.*",
"symfony/html-sanitizer": "6.4.*",
"symfony/http-client": "6.4.*",
"symfony/intl": "6.4.*",
"symfony/mime": "6.4.*",
"symfony/form": "7.4.*",
"symfony/framework-bundle": "7.4.*",
"symfony/html-sanitizer": "7.4.*",
"symfony/http-client": "7.4.*",
"symfony/intl": "7.4.*",
"symfony/mime": "7.4.*",
"symfony/monolog-bundle": "^3.8.0",
"symfony/property-access": "6.4.*",
"symfony/property-info": "6.4.*",
"symfony/runtime": "6.4.*",
"symfony/security-bundle": "6.4.*",
"symfony/security-csrf": "6.4.*",
"symfony/serializer": "6.4.*",
"symfony/stopwatch": "6.4.*",
"symfony/translation": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/validator": "6.4.*",
"symfony/web-profiler-bundle": "6.4.*",
"symfony/yaml": "6.4.*",
"symfony/property-access": "7.4.*",
"symfony/property-info": "7.4.*",
"symfony/runtime": "7.4.*",
"symfony/security-bundle": "7.4.*",
"symfony/security-csrf": "7.4.*",
"symfony/serializer": "7.4.*",
"symfony/stopwatch": "7.4.*",
"symfony/translation": "7.4.*",
"symfony/twig-bundle": "7.4.*",
"symfony/validator": "7.4.*",
"symfony/web-profiler-bundle": "7.4.*",
"symfony/yaml": "7.4.*",
"twig/extra-bundle": "^3.5",
"twig/markdown-extra": "^3.5",
"twig/string-extra": "^3.5",
Expand All @@ -112,10 +112,10 @@
"phpunit/phpunit": "^9.6",
"sebastian/diff": "*",
"squizlabs/php_codesniffer": "*",
"symfony/debug-bundle": "6.4.*",
"symfony/debug-bundle": "7.4.*",
"symfony/maker-bundle": "^1.42",
"symfony/phpunit-bridge": "6.4.*",
"symfony/var-dumper": "6.4.*"
"symfony/phpunit-bridge": "7.4.*",
"symfony/var-dumper": "7.4.*"
},
"autoload": {
"psr-4": {
Expand All @@ -136,7 +136,7 @@
},
"sort-packages": true,
"platform": {
"php": "8.1.0"
"php": "8.2.0"
},
"allow-plugins": {
"composer/package-versions-deprecated": true,
Expand Down Expand Up @@ -172,7 +172,7 @@
"extra": {
"symfony": {
"allow-contrib": true,
"require": "6.4.*"
"require": "7.4.*"
}
}
}
Loading
Loading