diff --git a/.env b/.env index d50cb4e6..8d2460a8 100644 --- a/.env +++ b/.env @@ -29,7 +29,7 @@ LOCK_DSN=flock ###< symfony/lock ### ###> symfony/mailer ### -# MAILER_DSN=null://null +MAILER_DSN=null://null ###< symfony/mailer ### ###> doctrine/phpcr-bundle ### diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 0d9a5f37..49543f82 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -39,7 +39,7 @@ jobs: DATABASE_URL: "mysql://root:@127.0.0.1:3306/sulu_test?serverVersion=5.7" - php-version: '8.3' - node-version: '18' + node-version: '20' npm-version: '9' mysql-version: '8.0' create-project: true @@ -55,8 +55,8 @@ jobs: SULU_ADMIN_EMAIL: DATABASE_URL: "mysql://root:@127.0.0.1:3306/sulu_test?serverVersion=8.0" - - php-version: '8.3' - node-version: '20' + - php-version: '8.4' + node-version: '22' npm-version: '10' mysql-version: '8.0' create-project: true @@ -71,6 +71,7 @@ jobs: MAILER_URL: null://localhost SULU_ADMIN_EMAIL: DATABASE_URL: "mysql://root:@127.0.0.1:3306/sulu_test?serverVersion=8.0" + PHP_CS_FIXER_IGNORE_ENV: true # remove when php cs fixer add support for PHP 8.4 services: mysql: diff --git a/composer.json b/composer.json index 074bd837..ef655381 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "scheb/2fa-email": "^7.2", "scheb/2fa-trusted-device": "^7.2", "stof/doctrine-extensions-bundle": "^1.11", - "sulu/sulu": "2.6.*@dev", + "sulu/sulu": "2.6.x-dev", "symfony/config": "^7.1", "symfony/dotenv": "^7.1", "symfony/flex": "^1.17 || ^2.0", diff --git a/symfony.lock b/symfony.lock index 34fbb586..799cd8f9 100644 --- a/symfony.lock +++ b/symfony.lock @@ -248,7 +248,7 @@ "repo": "github.com/symfony/recipes", "branch": "main", "version": "4.3", - "ref": "df66ee1f226c46f01e85c29c2f7acce0596ba35a" + "ref": "09051cfde49476e3c12cd3a0e44289ace1c75a4f" }, "files": [ "config/packages/mailer.yaml"