Fixed inconsistent typing

Author: simon-mundy

phpstan.neon.dist

@@ -1,7 +1,7 @@
 includes:
     - phpstan-baseline.neon
 parameters:
-    level: 4
+    level: 8
     paths:
         - src
         - test
@@ -16,4 +16,4 @@ parameters:
         - stubs/Laminas/ServiceManager/Factory/InvokableFactory.stub
         - stubs/Laminas/ServiceManager/Initializer/InitializerInterface.stub
         - stubs/Psr/Container/ContainerInterface.stub
-    treatPhpDocTypesAsCertain: false
+    treatPhpDocTypesAsCertain: false

src/TableGateway/Feature/EventFeature.php

@@ -22,23 +22,13 @@ class EventFeature extends AbstractFeature implements
     EventFeatureEventsInterface,
     EventsCapableInterface
 {
-    protected EventManagerInterface $eventManager;
-
-    protected ?EventFeature\TableGatewayEvent $event;
-
     public function __construct(
-        ?EventManagerInterface $eventManager = null,
-        ?EventFeature\TableGatewayEvent $tableGatewayEvent = null
+        protected EventManagerInterface $eventManager = new EventManager(),
+        protected EventFeature\TableGatewayEvent $event = new EventFeature\TableGatewayEvent()
     ) {
-        $this->eventManager = $eventManager instanceof EventManagerInterface
-                            ? $eventManager
-                            : new EventManager();
-
         $this->eventManager->addIdentifiers([
             TableGateway::class,
         ]);
-
-        $this->event = $tableGatewayEvent ?: new EventFeature\TableGatewayEvent();
     }
 
     /**

test/unit/TableGateway/TableGatewayTest.php

@@ -89,8 +89,8 @@ public function testConstructor(): void
 
         // constructor expects exception - native type declaration throws TypeError for null table
         $this->expectException(TypeError::class);
-        /** @psalm-suppress NullArgument - Testing incorrect constructor */
         new TableGateway(
+            /** @phpstan-ignore argument.type */
             null,
             $this->mockAdapter
         );
@@ -373,7 +373,6 @@ public function testConstructorWithSingleFeature(): void
         $table = new TableGateway('foo', $this->mockAdapter, $feature);
 
         $featureSet = $table->getFeatureSet();
-        self::assertInstanceOf(FeatureSet::class, $featureSet);
         self::assertSame($feature, $featureSet->getFeatureByClassName(Feature\SequenceFeature::class));
     }
 

test/unit/TestAsset/TrustingSql92Platform.php

@@ -13,8 +13,8 @@ final class TrustingSql92Platform extends Sql92
      * {@inheritDoc}
      */
     #[Override]
-    public function quoteValue($value): string
+    public function quoteValue(mixed $value): string
     {
-        return $this->quoteTrustedValue($value);
+        return $this->quoteTrustedValue($value) . '';
     }
 }