support for PHP 8.1

nette · Sep 12, 2021 · f4c9a05 · f4c9a05
1 parent a8a4753
commit f4c9a05
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.1', '7.2', '7.3', '7.4', '8.0']
+                php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
 
             fail-fast: false
 

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": ">=7.1 <8.1",
+		"php": ">=7.1 <8.2",
 		"nette/utils": "^3.1.4 || ^4.0"
 	},
 	"require-dev": {

diff --git a/readme.md b/readme.md
@@ -21,7 +21,7 @@ Installation:
 composer require nette/schema
 ```
 
-It requires PHP version 7.1 and supports PHP up to 8.0.
+It requires PHP version 7.1 and supports PHP up to 8.1.
 
 
 [Support Me](https://github.com/sponsors/dg)

diff --git a/src/Schema/Helpers.php b/src/Schema/Helpers.php
@@ -57,8 +57,9 @@ public static function merge($value, $base)
 
 	public static function getPropertyType(\ReflectionProperty $prop): ?string
 	{
-		if ($types = Reflection::getPropertyTypes($prop)) {
-			return implode('|', $types);
+		$kind = '|';
+		if ($types = Reflection::getPropertyTypes($prop, $kind)) {
+			return implode($kind, $types);
 		} elseif ($type = preg_replace('#\s.*#', '', (string) self::parseAnnotation($prop, 'var'))) {
 			$class = Reflection::getPropertyDeclaringClass($prop);
 			return preg_replace_callback('#[\w\\\\]+#', function ($m) use ($class) {