From ae56588139d8d077422e3b40ca03c16cd99be634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Glawaty?= Date: Tue, 6 Aug 2024 02:42:42 +0200 Subject: [PATCH] Allowed `nette/utils` v4 and symfony components V7 --- composer.json | 8 ++++---- src/Bridge/Nette/DI/WebpackEncoreBundleExtension.php | 4 ++-- tests/bootstrap.php | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 75ac0b7..2601895 100644 --- a/composer.json +++ b/composer.json @@ -14,9 +14,9 @@ "ext-json": "*", "latte/latte": "^2.5 || ^3.0", "nette/di": "^3.0.10", - "nette/utils": "^3.2.5", - "symfony/asset": "^5.4 || ^6.0", - "symfony/cache": "^5.4 || ^6.0" + "nette/utils": "^3.2.5 || ^4.0", + "symfony/asset": "^5.4 || ^6.0 || ^7.0", + "symfony/cache": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.13", @@ -29,7 +29,7 @@ "phpstan/phpstan-nette": "^1.1", "roave/security-advisories": "dev-latest", "symfony/console": "^5.4", - "symfony/event-dispatcher": "^5.4 || ^6.0" + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0" }, "conflict": { "nette/schema": "<1.2.0" diff --git a/src/Bridge/Nette/DI/WebpackEncoreBundleExtension.php b/src/Bridge/Nette/DI/WebpackEncoreBundleExtension.php index cbeebca..e57a858 100644 --- a/src/Bridge/Nette/DI/WebpackEncoreBundleExtension.php +++ b/src/Bridge/Nette/DI/WebpackEncoreBundleExtension.php @@ -61,8 +61,8 @@ public function getConfigSchema(): Schema Expect::anyOf(Expect::string(), TRUE), 'string' ), - ])->assert(static fn (object $config): bool => !(!isset($config->output_path) && empty($config->builds)), 'No build is defined.') - ->castTo(WebpackEncoreConfig::class); + ])->castTo(WebpackEncoreConfig::class) + ->assert(static fn (object $config): bool => !(!isset($config->output_path) && empty($config->builds)), 'No build is defined.'); } /** diff --git a/tests/bootstrap.php b/tests/bootstrap.php index aac0894..541972a 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -15,6 +15,10 @@ Environment::bypassFinals(); date_default_timezone_set('Europe/Prague'); +if (PHP_VERSION_ID < 80000) { + error_reporting(~E_USER_DEPRECATED); +} + if (PHP_VERSION_ID >= 80200) { error_reporting(~E_DEPRECATED); }