Upgrade PHPStan to level 8

nkl-kst · Jun 28, 2024 · c6dcefe · c6dcefe
1 parent 1f6445c
commit c6dcefe
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 41 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,5 @@
 parameters:
-    level: 7
+    level: 8
     paths:
         - src
         - test
diff --git a/src/Dependency/DependencyContainer.php b/src/Dependency/DependencyContainer.php
@@ -11,6 +11,7 @@
 use NklKst\TheSportsDb\Client\Endpoint\LookupEndpoint;
 use NklKst\TheSportsDb\Client\Endpoint\ScheduleEndpoint;
 use NklKst\TheSportsDb\Client\Endpoint\SearchEndpoint;
+use NklKst\TheSportsDb\Exception\ClientInstantiationException;
 use NklKst\TheSportsDb\Request\RequestBuilder;
 use NklKst\TheSportsDb\Serializer\CountrySerializer;
 use NklKst\TheSportsDb\Serializer\EquipmentSerializer;
@@ -72,7 +73,7 @@ class DependencyContainer
         TimelineSerializer::class,
     ];
 
-    private static ?ContainerBuilder $builder = null;
+    private static ContainerBuilder $builder;
 
     private static function load(): void
     {
@@ -127,7 +128,7 @@ private static function compile(): void
         self::$builder->compile();
     }
 
-    public static function getClient(): ?Client
+    public static function getClient(): Client
     {
         // Load dependency container
         self::load();
@@ -139,6 +140,6 @@ public static function getClient(): ?Client
         }
 
         // Something went wrong...
-        return null;
+        throw new ClientInstantiationException();
     }
 }
diff --git a/src/Exception/ClientInstantiationException.php b/src/Exception/ClientInstantiationException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace NklKst\TheSportsDb\Exception;
+
+use RuntimeException;
+
+class ClientInstantiationException extends RuntimeException {}
diff --git a/src/Serializer/AbstractSerializer.php b/src/Serializer/AbstractSerializer.php
@@ -33,7 +33,7 @@ abstract protected function getValidJsonRootNames(): array;
     /**
      * Get the JSON root property containing data.
      */
-    private function getJsonRootName(?object $json): ?string
+    private function getJsonRootName(object $json): ?string
     {
         foreach ($this->getValidJsonRootNames() as $rootName) {
             if (property_exists($json, $rootName)) {

diff --git a/test/unit/Util/TestUtils.php b/test/unit/Util/TestUtils.php
@@ -29,41 +29,38 @@ public static function expectEndpoint(MockObject $requestBuilderMock, string $en
     }
 
     /**
-     * @param object $object   Object to get property from
+     * @param object $object Object to get property from
      * @param string $property Property to get
      *
      * @return mixed|null
+     *
+     * @throws ReflectionException
      */
     public static function getHiddenProperty(object $object, string $property)
     {
         $ref = new ReflectionObject($object);
 
-        try {
-            $prop = $ref->hasProperty($property) ? $ref->getProperty($property) : null;
-            if (!$prop && $ref->getParentClass()) {
-                $prop = $ref->getParentClass()->getProperty($property);
-            }
-        } catch (ReflectionException $e) {
-            return null;
+        $prop = $ref->hasProperty($property) ? $ref->getProperty($property) : null;
+        if (!$prop && $ref->getParentClass()) {
+            $prop = $ref->getParentClass()->getProperty($property);
         }
-        $prop->setAccessible(true);
+        assert(!is_null($prop));
 
+        $prop->setAccessible(true);
         return $prop->getValue($object);
     }
 
     /**
-     * @param class-string $class    Class to get static property from
-     * @param string       $property Property to get
+     * @param class-string $class Class to get static property from
+     * @param string $property Property to get
      *
-     * @return mixed|null
+     * @return mixed
+     *
+     * @throws ReflectionException
      */
     public static function getHiddenStaticProperty(string $class, string $property)
     {
-        try {
-            return (new ReflectionClass($class))->getStaticPropertyValue($property);
-        } catch (ReflectionException $e) {
-            return null;
-        }
+        return (new ReflectionClass($class))->getStaticPropertyValue($property);
     }
 
     /**
@@ -83,38 +80,35 @@ public static function setHiddenStaticProperty(string $class, string $property,
     /**
      * @param object $object Object to get method from
      * @param string $method Method to get
+     *
+     * @throws ReflectionException
      */
-    public static function getHiddenMethod(object $object, string $method): ?Closure
+    public static function getHiddenMethod(object $object, string $method): Closure
     {
         $ref = new ReflectionObject($object);
 
-        try {
-            $meth = $ref->hasMethod($method) ? $ref->getMethod($method) : null;
-            if (!$meth && $ref->getParentClass()) {
-                $meth = $ref->getParentClass()->getMethod($method);
-            }
-        } catch (ReflectionException $e) {
-            return null;
+        $meth = $ref->hasMethod($method) ? $ref->getMethod($method) : null;
+        if (!$meth && $ref->getParentClass()) {
+            $meth = $ref->getParentClass()->getMethod($method);
         }
-        $meth->setAccessible(true);
+        assert(!is_null($meth));
 
+        $meth->setAccessible(true);
         return $meth->getClosure($object);
     }
 
     /**
-     * @param class-string $class  Class to get static method from
-     * @param string       $method Method to get
+     * @param class-string $class Class to get static method from
+     * @param string $method Method to get
+     *
+     * @throws ReflectionException
      */
-    public static function getHiddenStaticMethod(string $class, string $method): ?Closure
+    public static function getHiddenStaticMethod(string $class, string $method): Closure
     {
-        try {
-            $meth = (new ReflectionClass($class))->getMethod($method);
-        } catch (ReflectionException $e) {
-            return null;
-        }
+        $meth = (new ReflectionClass($class))->getMethod($method);
         $meth->setAccessible(true);
 
-        return $meth->getClosure(null);
+        return $meth->getClosure();
     }
 
     /**
@@ -142,7 +136,9 @@ public static function assertThatAllPropertiesAreInitialized($objects): void
                 $reflectionProperty = new ReflectionProperty($class, $property);
 
                 // Don't check property if null is allowed
-                if ($reflectionProperty->getType()->allowsNull()) {
+                $refPropType = $reflectionProperty->getType();
+                assert(!is_null($refPropType));
+                if ($refPropType->allowsNull()) {
                     continue;
                 }