Merge pull request #48 from peckadesign/php81

PHP 8.1 support
peckadesign · Mar 29, 2022 · a8faa87 · a8faa87
2 parents e05b23e + bed4d4c
commit a8faa87
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/php-package-ci.yml b/.github/workflows/php-package-ci.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ 7.4, 8.0 ]
+        php: [ 7.4, 8.0, 8.1 ]
     steps:
       - uses: actions/checkout@v2
       - uses: shivammathur/setup-php@v2
@@ -18,10 +18,10 @@ jobs:
 
       - run: make composer
 
-      - if: matrix.php == '8.0'
+      - if: matrix.php == '8.1'
         run: make cs
 
-      - if: matrix.php == '8.0'
+      - if: matrix.php == '8.1'
         run: make phpstan
 
       - run: make run-tests
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
 		"nette/tester": "~2.3.2",
 		"mockery/mockery": "^1.0",
 		"pd/coding-standard": "1.27.*",
-		"phpstan/phpstan": "0.12.77"
+		"phpstan/phpstan": "^1.4.0"
 	},
 	"autoload": {
 		"psr-4": {
@@ -42,5 +42,10 @@
 		"psr-4": {
 			"PdTests\\": "tests"
 		}
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "pd-forms",
 	"title": "pdForms",
 	"description": "Customization of netteForms for use in PeckaDesign.",
-	"version": "3.4.6",
+	"version": "3.5.0",
 	"author": "PeckaDesign, s.r.o <support@peckadesign.cz>",
 	"contributors": [
 		"Radek Šerý <radek.sery@peckadesign.cz>",

diff --git a/src/RuleOptions.php b/src/RuleOptions.php
@@ -179,6 +179,7 @@ public function getNormalizedDependentInputs(): array
 	/**
 	 * @return array<mixed>
 	 */
+	#[\ReturnTypeWillChange]
 	public function jsonSerialize()
 	{
 		$serialized = [

diff --git a/src/Validation/ValidationResult.php b/src/Validation/ValidationResult.php
@@ -75,6 +75,7 @@ public function setMessage(?string $message): void
 	/**
 	 * @return array<mixed>
 	 */
+	#[\ReturnTypeWillChange]
 	public function jsonSerialize()
 	{
 		$valid = [

diff --git a/src/assets/pdForms.js b/src/assets/pdForms.js
@@ -1,7 +1,7 @@
 /**
  * @name pdForms
  * @author Radek Šerý <radek.sery@peckadesign.cz>
- * @version 3.4.4
+ * @version 3.5.0
  *
  * Features:
  * - live validation
@@ -45,7 +45,7 @@
 
 	var pdForms = window.pdForms || {};
 
-	pdForms.version = '3.4.4';
+	pdForms.version = '3.5.0';
 
 
 	/**

diff --git a/tests/Unit/Forms/RuleOptionsTest.php b/tests/Unit/Forms/RuleOptionsTest.php
@@ -53,6 +53,7 @@ public function testSerialization(): void
 			->addContext('gimme 2', ['fuel', 'fire'])
 			->addContext('class', new class () implements \JsonSerializable {
 
+				#[\ReturnTypeWillChange]
 				public function jsonSerialize()
 				{
 					return ['serialized' => 'class'];