Nette 3

README.md

@@ -22,11 +22,12 @@ Extra contribution to [`nette/forms`](https://github.com/nette/forms).
 
 ## Versions
 
-| State       | Version | Branch   | PHP      |
-|-------------|---------|----------|----------|
-| dev         | `^0.4`  | `master` | `>= 7.1` |
-| stable      | `^0.3`  | `master` | `>= 7.1` |
-| stable      | `^0.1`  | `master` | `>= 5.6` |
+| State       | Version | Branch   | Nette | PHP     |
+|-------------|---------|----------|-------|---------|
+| dev         | `^0.5`  | `master` | 3.0+  | `^7.2`  |
+| stable      | `^0.4`  | `master` | 3.0+  | `^7.2`  |
+| stable      | `^0.3`  | `master` | 2.4   | `>=7.1` |
+| stable      | `^0.1`  | `master` | 2.4   | `>=5.6` |
 
 ## Maintainers
 

composer.json

@@ -24,13 +24,12 @@
     }
   ],
   "require": {
-    "php": ">= 7.1",
-    "nette/forms": "~2.4.8"
+    "php": "^7.2",
+    "nette/forms": "~3.0.0"
   },
   "require-dev": {
-    "nette/application": "~2.4.13",
-    "nette/di": "~2.4.13",
-    "nette/utils": "~2.5.2",
+    "nette/application": "~3.0.0",
+    "nette/di": "~3.0.0",
     "ninjify/nunjuck": "^0.2",
     "ninjify/qa": "^0.8.0",
     "phpstan/extension-installer": "^1.0",
@@ -43,9 +42,7 @@
     "nette/di": "to use FormFactoryExtension[CompilerExtension]"
   },
   "conflict": {
-    "nette/application": "<2.4.12",
-    "nette/utils": "<2.5.0",
-    "nette/http": "<2.4.9"
+    "nette/di": "<3.0.0"
   },
   "autoload": {
     "psr-4": {
@@ -59,7 +56,7 @@
   "prefer-stable": true,
   "extra": {
     "branch-alias": {
-      "dev-master": "0.4.x-dev"
+      "dev-master": "0.5.x-dev"
     }
   }
 }

phpstan.neon

@@ -1,5 +1,4 @@
 parameters:
 	ignoreErrors:
 		# It is contravariant, original typehint is not recognized properly
-		- '#^Parameter \#2 \$mode \(string\|null\) of method .+ should be contravariant with parameter \$mode \(mixed\) of method Nette\\Forms\\Rendering\\DefaultFormRenderer\:\:render\(\)$#'
 		- '#^Parameter \#1 \$value \(string\) of method Contributte\\Forms\\Controls\\ProtectionFastInput\:\:setValue\(\) should be contravariant with parameter \$value \(mixed\) of method Nette\\Forms\\.+\:\:setValue\(\)$#'

src/DI/ApplicationFormFactoryExtension.php

@@ -10,9 +10,6 @@
 class ApplicationFormFactoryExtension extends CompilerExtension
 {
 
-	/**
-	 * Register services
-	 */
 	public function loadConfiguration(): void
 	{
 		if (!class_exists(Form::class)) {
@@ -21,7 +18,7 @@ public function loadConfiguration(): void
 
 		$builder = $this->getContainerBuilder();
 
-		$builder->addDefinition($this->prefix('factory'))
+		$builder->addFactoryDefinition($this->prefix('factory'))
 			->setImplement(IApplicationFormFactory::class);
 	}
 

src/DI/StandaloneFormFactoryExtension.php

@@ -8,14 +8,11 @@
 class StandaloneFormFactoryExtension extends CompilerExtension
 {
 
-	/**
-	 * Register services
-	 */
 	public function loadConfiguration(): void
 	{
 		$builder = $this->getContainerBuilder();
 
-		$builder->addDefinition($this->prefix('factory'))
+		$builder->addFactoryDefinition($this->prefix('factory'))
 			->setImplement(IStandaloneFormFactory::class);
 	}