Increased level PHPStan up to 9, fixed PHPStan errors, removed useles…

…s checks in Container
renakdup · Nov 29, 2023 · 6671de7 · 6671de7
1 parent df11738
commit 6671de7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,5 @@
 parameters:
-	level: 6
+	level: 9
 	phpVersion: 70400 # PHP 7.4
 	parallel:
 		jobSize: 20

diff --git a/src/Container.php b/src/Container.php
@@ -117,13 +117,9 @@ protected function resolve( string $id ) {
 				return $service( $this );
 			} elseif ( is_string( $service ) && class_exists( $service ) ) {
 				return $this->resolve_object( $service );
-			} elseif ( is_scalar( $service ) || is_array( $service ) || $service === null ) {
-				return $service;
-			} elseif ( is_object( $service ) ) {
-				return $service;
 			}
 
-			throw new ContainerNotFoundException( "Service '{$service}' not found in the Container." );
+			return $service;
 		} else {
 			if ( is_string( $id ) && class_exists( $id ) ) {
 				return $this->resolve_object( $id );
@@ -133,6 +129,9 @@ protected function resolve( string $id ) {
 		}
 	}
 
+	/**
+	 * @param class-string $service
+	 */
 	protected function resolve_object( string $service ): object {
 		$reflected_class = new ReflectionClass( $service );
 		$constructor     = $reflected_class->getConstructor();