Updated upstream and added Nette Forms 3.3 compatibility

.editorconfig

@@ -11,6 +11,6 @@ indent_style = tab
 indent_size = tab
 tab_width = 4
 
-[{*.json, *.yaml, *.yml, *.md}]
+[*.{json,yaml,yml,md}]
 indent_style = space
 indent_size = 2

.gitattributes

@@ -1,11 +1,11 @@
-# Not archived
 .docs export-ignore
-tests export-ignore
+.github export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
 Makefile export-ignore
-phpstan.neon export-ignore
 README.md export-ignore
+phpstan.neon export-ignore
 ruleset.xml export-ignore
+tests export-ignore

.github/workflows/codesniffer.yml

@@ -2,6 +2,7 @@ name: "Codesniffer"
 
 on:
   pull_request:
+  workflow_dispatch:
 
   push:
     branches: ["*"]
@@ -12,4 +13,6 @@ on:
 jobs:
   codesniffer:
     name: "Codesniffer"
-    uses: contributte/.github/.github/workflows/codesniffer.yml@v1
+    uses: contributte/.github/.github/workflows/codesniffer.yml@master
+    with:
+      php: "8.2"

.github/workflows/coverage.yml

@@ -2,14 +2,17 @@ name: "Coverage"
 
 on:
   pull_request:
+  workflow_dispatch:
 
   push:
     branches: ["*"]
 
   schedule:
-    - cron: "0 8 * * 1"
+    - cron: "0 9 * * 1"
 
 jobs:
   coverage:
     name: "Nette Tester"
-    uses: contributte/.github/.github/workflows/nette-tester-coverage.yml@v1
+    uses: contributte/.github/.github/workflows/nette-tester-coverage-v2.yml@master
+    with:
+      php: "8.2"

.github/workflows/phpstan.yml

@@ -2,14 +2,17 @@ name: "Phpstan"
 
 on:
   pull_request:
+  workflow_dispatch:
 
   push:
     branches: ["*"]
 
   schedule:
-    - cron: "0 8 * * 1"
+    - cron: "0 10 * * 1"
 
 jobs:
   phpstan:
     name: "Phpstan"
-    uses: contributte/.github/.github/workflows/phpstan.yml@v1
+    uses: contributte/.github/.github/workflows/phpstan.yml@master
+    with:
+      php: "8.2"

.github/workflows/tests.yml

@@ -2,35 +2,42 @@ name: "Nette Tester"
 
 on:
   pull_request:
+  workflow_dispatch:
 
   push:
     branches: ["*"]
 
   schedule:
-    - cron: "0 8 * * 1"
+    - cron: "0 10 * * 1"
 
 jobs:
-  test82:
+  test85:
     name: "Nette Tester"
-    uses: contributte/.github/.github/workflows/nette-tester.yml@v1
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.2"
+      php: "8.5"
+
+  test84:
+    name: "Nette Tester"
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
+    with:
+      php: "8.4"
 
-  test81:
+  test83:
     name: "Nette Tester"
-    uses: contributte/.github/.github/workflows/nette-tester.yml@v1
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.1"
+      php: "8.3"
 
-  test80:
+  test82:
     name: "Nette Tester"
-    uses: contributte/.github/.github/workflows/nette-tester.yml@v1
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.0"
+      php: "8.2"
 
   testlower:
     name: "Nette Tester"
-    uses: contributte/.github/.github/workflows/nette-tester.yml@v1
+    uses: contributte/.github/.github/workflows/nette-tester.yml@master
     with:
-      php: "8.0"
+      php: "8.2"
       composer: "composer update --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest"

.gitignore

@@ -1,11 +1,14 @@
-# IDE
-/.idea
-
-# Composer
-/vendor
-/composer.lock
-
-# Tests
-/tests/_output
-/tests/_support
-/coverage.xml
+# IDE
+/.idea
+
+# Composer
+/vendor
+/composer.lock
+
+# Tests
+/tests/tmp
+/coverage.*
+/tests/**/*.log
+/tests/**/*.html
+/tests/**/*.expected
+/tests/**/*.actual

Makefile

@@ -1,29 +1,34 @@
-.PHONY: install qa cs csf phpstan tests coverage
-
+.PHONY: install
 install:
 	composer update
 
+.PHONY: qa
 qa: phpstan cs
 
+.PHONY: cs
 cs:
 ifdef GITHUB_ACTION
 	vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --extensions="php,phpt" --colors -nsp -q --report=checkstyle src tests | cs2pr
 else
 	vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --extensions="php,phpt" --colors -nsp src tests
 endif
 
+.PHONY: csf
 csf:
-	vendor/bin/phpcbf --standard=ruleset.xml --encoding=utf-8 --colors -nsp src tests
+	vendor/bin/phpcbf --standard=ruleset.xml --encoding=utf-8 --extensions="php,phpt" --colors -nsp src tests
 
+.PHONY: phpstan
 phpstan:
 	vendor/bin/phpstan analyse -c phpstan.neon
 
+.PHONY: tests
 tests:
-	vendor/bin/codecept run
+	vendor/bin/tester -s -p php --colors 1 -C tests/Cases
 
+.PHONY: coverage
 coverage:
 ifdef GITHUB_ACTION
-	phpdbg -qrr vendor/bin/codecept run --coverage-xml
+	vendor/bin/tester -s -p php --colors 1 -C --coverage coverage.xml --coverage-src src tests/Cases
 else
-	phpdbg -qrr vendor/bin/codecept run --coverage-html
+	vendor/bin/tester -s -p php --colors 1 -C --coverage coverage.html --coverage-src src tests/Cases
 endif

README.md

@@ -35,8 +35,8 @@ For details on how to use this package, check out our [documentation](.docs).
 
 | State       | Version | Branch   | PHP     |
 |-------------|---------|----------|---------|
-| dev         | `^4.1`  | `master` | `>=8.0` |
-| stable      | `^4.0`  | `master` | `>=8.0` |
+| dev         | `^4.1`  | `master` | `>=8.1` |
+| stable      | `^4.0`  | `v4`     | `>=8.0` |
 
 ## Development
 

composer.json

@@ -1,40 +1,50 @@
 {
   "name": "contributte/forms-multiplier",
-  "type": "library",
   "description": "Multiplier for nette forms",
   "keywords": [
     "nette",
     "contributte",
     "forms",
     "multiplier"
   ],
+  "type": "library",
+  "license": "MIT",
+  "homepage": "https://github.com/contributte/forms-multiplier",
+  "authors": [
+    {
+      "name": "Milan Felix Sulc",
+      "homepage": "https://f3l1x.io"
+    }
+  ],
   "require": {
-    "php": ">=8.0",
-    "nette/forms": "^3.1.0"
+    "php": ">=8.2",
+    "nette/forms": "^3.2.0"
   },
   "require-dev": {
-    "codeception/codeception": "^4.1.9",
-    "codeception/module-asserts": "^1.3.1",
-    "codeception/module-phpbrowser": "^1.0.2",
-    "nette/application": "^3.1.11",
-    "nette/di": "^3.1.0",
+    "contributte/phpstan": "~0.2.0",
+    "contributte/qa": "~0.4.0",
+    "contributte/tester": "~0.4.0",
     "latte/latte": "^3.0.0",
-    "contributte/qa": "^0.3",
-    "contributte/phpstan": "^0.1",
-    "webchemistry/testing-helpers": "~2.0.0"
+    "nette/application": ">=3.2.0 <3.3.0",
+    "nette/di": "^3.2.0",
+    "webchemistry/testing-helpers": "^4.1.1"
+  },
+  "conflict": {
+    "latte/latte": "<3.0.0",
+    "nette/component-model": "<3.1.0"
   },
   "autoload": {
     "psr-4": {
       "Contributte\\FormMultiplier\\": "src"
     }
   },
   "autoload-dev": {
-    "classmap": [
-      "tests/includes"
-    ]
+    "psr-4": {
+      "Tests\\": "tests"
+    }
   },
-  "prefer-stable": true,
   "minimum-stability": "dev",
+  "prefer-stable": true,
   "config": {
     "sort-packages": true,
     "allow-plugins": {

phpstan.neon

@@ -1,11 +1,9 @@
 includes:
-	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
-	- vendor/phpstan/phpstan-nette/extension.neon
-	- vendor/phpstan/phpstan-nette/rules.neon
+	- vendor/contributte/phpstan/phpstan.neon
 
 parameters:
 	level: 8
-	phpVersion: 80000
+	phpVersion: 80200
 
 	scanDirectories:
 		- src
@@ -16,3 +14,48 @@ parameters:
 	paths:
 		- src
 		- .docs
+
+	ignoreErrors:
+		# https://github.com/phpstan/phpstan-nette/issues/141
+		-
+			message: '#^Parameter \#1 \$array of function array_filter expects array, Iterator\<int\|string, Nette\\ComponentModel\\IComponent\> given\.$#'
+			identifier: argument.type
+			count: 4
+			path: src/Multiplier.php
+
+		# Strict rules - boolean conditions
+		-
+			identifier: if.condNotBoolean
+			path: src/ComponentResolver.php
+		-
+			identifier: if.condNotBoolean
+			path: src/Multiplier.php
+		-
+			identifier: booleanAnd.leftNotBoolean
+			path: src/Latte/Extension/Node/MultiplierAddNode.php
+		-
+			identifier: booleanAnd.leftNotBoolean
+			path: src/Multiplier.php
+		-
+			identifier: booleanAnd.rightNotBoolean
+			path: src/Multiplier.php
+		-
+			identifier: booleanNot.exprNotBoolean
+			path: src/Latte/Extension/Node/MultiplierRemoveNode.php
+		-
+			identifier: booleanNot.exprNotBoolean
+			path: src/Multiplier.php
+		-
+			identifier: ternary.condNotBoolean
+			path: src/Latte/Extension/Node/MultiplierAddNode.php
+		-
+			identifier: ternary.condNotBoolean
+			path: src/Latte/Extension/Node/MultiplierRemoveNode.php
+
+		# Strict rules - covariance/contravariance
+		-
+			identifier: method.childReturnType
+			path: src/Latte/Extension/MultiplierExtension.php
+		-
+			identifier: method.childParameterType
+			path: src/Multiplier.php