uses nette/phpstan-rules

Author: dg

composer.json

@@ -21,7 +21,9 @@
 	"require-dev": {
 		"nette/tester": "^2.6",
 		"tracy/tracy": "^2.8",
-		"phpstan/phpstan-nette": "^2.0@stable"
+		"phpstan/phpstan": "^2.1@stable",
+		"phpstan/extension-installer": "^1.4@stable",
+		"nette/phpstan-rules": "^1.0"
 	},
 	"autoload": {
 		"classmap": ["src/"],
@@ -38,5 +40,10 @@
 		"branch-alias": {
 			"dev-master": "1.3-dev"
 		}
+	},
+	"config": {
+		"allow-plugins": {
+			"phpstan/extension-installer": true
+		}
 	}
 }

phpstan.neon

@@ -1,10 +1,5 @@
 parameters:
 	level: 8
-	checkMissingIterableValueType: false
-	errorFormat: raw
 
 	paths:
 		- src
-
-includes:
-	- vendor/phpstan/phpstan-nette/extension.neon

src/Schema/Expect.php

@@ -70,8 +70,8 @@ public static function from(object $object, array $items = []): Structure
 			: $ro->getProperties();
 
 		foreach ($props as $prop) {
-			$item = &$items[$prop->getName()];
-			if (!$item) {
+			$name = $prop->getName();
+			if (!isset($items[$name])) {
 				$type = Helpers::getPropertyType($prop) ?? 'mixed';
 				$item = new Type($type);
 				if ($prop instanceof \ReflectionProperty ? $prop->isInitialized($object) : $prop->isOptional()) {
@@ -86,6 +86,7 @@ public static function from(object $object, array $items = []): Structure
 				} else {
 					$item->required();
 				}
+				$items[$name] = $item;
 			}
 		}
 
@@ -98,7 +99,8 @@ public static function from(object $object, array $items = []): Structure
 	 */
 	public static function array(?array $shape = []): Structure|Type
 	{
-		return Nette\Utils\Arrays::first($shape ?? []) instanceof Schema
+		$shape ??= [];
+		return Nette\Utils\Arrays::first($shape) instanceof Schema
 			? (new Structure($shape))->castTo('array')
 			: (new Type('array'))->default($shape);
 	}

src/Schema/Message.php

@@ -7,7 +7,6 @@
 
 namespace Nette\Schema;
 
-use Nette;
 use function implode, preg_replace_callback;
 
 
@@ -85,6 +84,6 @@ public function toString(): string
 		return preg_replace_callback('~( ?)%(\w+)%~', function ($m) use ($vars) {
 			[, $space, $key] = $m;
 			return $vars[$key] === null ? '' : $space . $vars[$key];
-		}, $this->message) ?? throw new Nette\InvalidStateException(preg_last_error_msg());
+		}, $this->message);
 	}
 }

tests/types/schema-types.php

@@ -0,0 +1,57 @@
+<?php declare(strict_types=1);
+
+/**
+ * PHPStan type tests.
+ */
+
+use Nette\Schema\Elements\AnyOf;
+use Nette\Schema\Elements\Structure;
+use Nette\Schema\Elements\Type;
+use Nette\Schema\Expect;
+use function PHPStan\Testing\assertType;
+
+
+// Magic methods return Type
+assertType(Type::class, Expect::string());
+assertType(Type::class, Expect::int());
+assertType(Type::class, Expect::bool());
+assertType(Type::class, Expect::float());
+assertType(Type::class, Expect::scalar());
+assertType(Type::class, Expect::null());
+assertType(Type::class, Expect::mixed());
+assertType(Type::class, Expect::list());
+assertType(Type::class, Expect::email());
+assertType(Type::class, Expect::unicode());
+
+// Explicit type creation
+assertType(Type::class, Expect::type('string'));
+assertType(Type::class, Expect::arrayOf('string'));
+assertType(Type::class, Expect::listOf('string'));
+
+// Structure creation
+assertType(Structure::class, Expect::structure(['a' => Expect::string()]));
+assertType(Structure::class, Expect::from(new stdClass));
+
+// AnyOf creation
+assertType(AnyOf::class, Expect::anyOf('a', 'b'));
+
+// Expect::array() conditional return (via PHPStan extension)
+assertType(Type::class, Expect::array());
+assertType(Type::class, Expect::array([]));
+assertType(Structure::class, Expect::array(['a' => Expect::string()]));
+
+// Fluent methods preserve concrete type
+assertType(Type::class, Expect::string()->required());
+assertType(Type::class, Expect::string()->nullable());
+assertType(Type::class, Expect::string()->default('foo'));
+assertType(Type::class, Expect::int()->min(0)->max(100));
+
+assertType(Structure::class, Expect::structure([])->required());
+assertType(Structure::class, Expect::structure([])->otherItems('string'));
+assertType(Structure::class, Expect::structure([])->skipDefaults());
+
+assertType(AnyOf::class, Expect::anyOf('a', 'b')->required());
+assertType(AnyOf::class, Expect::anyOf('a', 'b')->firstIsDefault());
+
+// Structure::extend() returns Structure
+assertType(Structure::class, Expect::structure([])->extend(['b' => Expect::int()]));

tests/types/types.phpt

@@ -0,0 +1,7 @@
+<?php declare(strict_types=1);
+
+require __DIR__ . '/../bootstrap.php';
+
+use Nette\PHPStan\Tester\TypeAssert;
+
+TypeAssert::assertTypes(__DIR__ . '/schema-types.php');