Allow nette/utils 4.x, cleanup

Gappa · Jan 23, 2023 · 0224bee · 0224bee
1 parent ac5fa2c
commit 0224bee
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -22,10 +22,10 @@
 		"php": "^8.0",
 		"nette/application": "^3.1",
 		"nette/di": "^3.0",
-		"nette/utils": "^3.2",
+		"nette/utils": "^3.2 || ^4.0",
 		"ext-json": "*",
 		"nette/schema": "^1.2",
-		"nette/finder": "^2.5",
+		"nette/finder": "^2.5 || ^3.0",
 		"latte/latte": "^3.0",
 		"tracy/tracy": "^2.8"
     },
@@ -43,7 +43,7 @@
 		"nette/component-model": "^3.0",
 		"nette/http": "^3.0",
 		"nette/neon": "^3.0",
-		"nette/robot-loader": "^3.0",
+		"nette/robot-loader": "^3.0 || ^4.0",
 		"wikimedia/less.php": "^3.0.0",
 		"scssphp/scssphp": "^1.1.0",
 		"mockery/mockery": "1.*",
@@ -58,8 +58,8 @@
 		"tedivm/jshrink": "^1.3"
 	},
 	"scripts": {
-		"phpstan": "./phpstan/phpstan",
-		"tests": "./vendor/bin/phpunit --configuration tests/phpunit.xml tests"
+		"phpstan": "@php ./vendor/bin/phpstan analyse --configuration ./phpstan/phpstan.neon --memory-limit 512M",
+		"tests": "@php ./vendor/bin/phpunit --configuration tests/phpunit.xml tests"
 	},
 	"config": {
 		"allow-plugins": {

diff --git a/phpstan/phpstan b/phpstan/phpstan
diff --git a/src/Nette/Extension.php b/src/Nette/Extension.php
@@ -4,7 +4,7 @@
 
 namespace WebLoader\Nette;
 
-use Nette\Configurator;
+use Nette\Bootstrap\Configurator;
 use Nette\DI\Compiler;
 use Nette\DI\CompilerExtension;
 use Nette\DI\ContainerBuilder;

diff --git a/tests/Nette/ExtensionTest.php b/tests/Nette/ExtensionTest.php
@@ -3,7 +3,7 @@
 
 namespace WebLoader\Test\Nette;
 
-use Nette\Configurator;
+use Nette\Bootstrap\Configurator;
 use Nette\DI\Compiler;
 use Nette\DI\Container;
 use Nette\Utils\Finder;