Merge pull request #42 from AJenbo/phpstan

Update PHPStan intergration

Author: condor2

phpstan.neon

@@ -13,6 +13,4 @@ parameters:
         - ./upload/system/storage/cache/
     tmpDir: .cache
     ignoreErrors:
-        - '#Class Event constructor invoked with 1 parameter, 4-5 required\.#'
         - '#Constant [A-Z_]+ not found\.#'
-        - '#Class Session constructor invoked with 0 parameters, 1-2 required\.#'

tools/phpstan/RegistryPropertyReflectionExtension.php

@@ -3,16 +3,22 @@
 namespace Tools\PHPStan;
 
 use Registry;
-use PHPStan\Broker\Broker;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\PropertiesClassReflectionExtension;
 use PHPStan\Reflection\PropertyReflection;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\TypeCombinator;
 
 class RegistryPropertyReflectionExtension implements PropertiesClassReflectionExtension {
+	private ReflectionProvider $reflectionProvider;
+
+	public function __construct(ReflectionProvider $reflectionProvider) {
+		$this->reflectionProvider = $reflectionProvider;
+	}
+
 	public function hasProperty(ClassReflection $classReflection, string $propertyName): bool {
 		if (!$classReflection->is(Registry::class)) {
 			return false;
@@ -25,10 +31,9 @@ public function getProperty(ClassReflection $classReflection, string $propertyNa
 		preg_match('/^(model_.+)$/', $propertyName, $matches);
 		$className = $this->convertSnakeToStudly($matches[1]);
 
-		$broker = Broker::getInstance();
 
 		$type = new NullType();
-		if ($broker->hasClass($className)) {
+		if ($this->reflectionProvider->hasClass($className)) {
 			$found = new ObjectType($className);
 			$type = new GenericObjectType('\Proxy', [$found]);
 			$type = TypeCombinator::addNull($type);

upload/admin/index.php

@@ -4,6 +4,7 @@
 
 // Configuration
 if (is_file('config.php')) {
+	/** @phpstan-ignore requireOnce.fileNotFound */
 	require_once('config.php');
 }
 

upload/index.php

@@ -4,6 +4,7 @@
 
 // Configuration
 if (is_file('config.php')) {
+	/** @phpstan-ignore requireOnce.fileNotFound */
 	require_once('config.php');
 }
 

upload/system/framework.php

@@ -58,6 +58,7 @@
 });
 
 // Event
+/** @phpstan-ignore arguments.count */
 $event = new \Event($registry);
 $registry->set('event', $event);
 

upload/system/framework_db.php

@@ -58,6 +58,7 @@
 });
 
 // Event
+/** @phpstan-ignore arguments.count */
 $event = new \Event($registry);
 $registry->set('event', $event);
 
@@ -97,7 +98,7 @@
 }
 
 // Session
-$session = new Session($config->get('session_engine'), $registry);
+$session = new Session($config->get('session_engine'));
 $registry->set('session', $session);
 
 if ($config->get('session_autostart')) {