Adapt the Feature layer to the row prototype result set

- Point the RowGatewayFeature tests at the RowPrototypeResultSet helper
- Restore the AbstractTableGateway and Feature class size baseline entries
  dropped when the baselines were regenerated upstream

Author: simon-mundy

analyzer-baseline.toml

@@ -5292,12 +5292,6 @@ code = "imprecise-type"
 message = "Type `array` in return type of `getTable` is imprecise, equivalent to `array<array-key, mixed>`."
 count = 1
 
-[[issues]]
-file = "src/TableGateway/AbstractTableGateway.php"
-code = "invalid-array-access"
-message = 'Cannot access array index on object `PhpDb\Sql\TableIdentifier` that does not implement `ArrayAccess`.'
-count = 2
-
 [[issues]]
 file = "src/TableGateway/AbstractTableGateway.php"
 code = "invalid-clone"
@@ -5502,12 +5496,6 @@ code = "possibly-invalid-clone"
 message = 'Expression of type `PhpDb\Sql\Sql|null` might not be a cloneable object.'
 count = 1
 
-[[issues]]
-file = "src/TableGateway/AbstractTableGateway.php"
-code = "possibly-undefined-string-array-index"
-message = "Possibly undefined array key `string('table')` accessed on `array<array-key, mixed>`."
-count = 2
-
 [[issues]]
 file = "src/TableGateway/AbstractTableGateway.php"
 code = "redundant-comparison"
@@ -5579,3 +5567,28 @@ file = "src/TableGateway/TableGatewayInterface.php"
 code = "missing-api-or-internal"
 message = 'Interface `PhpDb\TableGateway\TableGatewayInterface` is missing an `@api` or `@internal` annotation.'
 count = 1
+
+[[issues]]
+file = "src/TableGateway/AbstractTableGateway.php"
+code = "nullable-return-statement"
+message = 'Function `PhpDb\TableGateway\AbstractTableGateway::getTable` is declared to return `PhpDb\Sql\TableIdentifier|array<array-key, mixed>|string` but possibly returns a nullable value (inferred as `PhpDb\Sql\TableIdentifier|array<array-key, mixed>|null|string`).'
+count = 1
+
+[[issues]]
+file = "src/TableGateway/AbstractTableGateway.php"
+code = "invalid-return-statement"
+message = 'Invalid return type for function `PhpDb\TableGateway\AbstractTableGateway::getTable`: expected `PhpDb\Sql\TableIdentifier|array<array-key, mixed>|string`, but found `PhpDb\Sql\TableIdentifier|array<array-key, mixed>|null|string`.'
+count = 1
+
+
+[[issues]]
+file = "src/TableGateway/AbstractTableGateway.php"
+code = "invalid-array-access"
+message = 'Cannot access array index on object `PhpDb\Sql\TableIdentifier` that does not implement `ArrayAccess`.'
+count = 3
+
+[[issues]]
+file = "src/TableGateway/AbstractTableGateway.php"
+code = "possibly-undefined-string-array-index"
+message = "Possibly undefined array key `string('table')` accessed on `array<array-key, mixed>`."
+count = 3

lint-baseline.toml

@@ -8483,3 +8483,27 @@ file = "test/unit/TableGateway/TableGatewayTest.php"
 code = "strict-assertions"
 message = "Use strict assertions in PHPUnit tests."
 count = 2
+
+[[issues]]
+file = "src/RowGateway/Feature/FeatureSet.php"
+code = "too-many-methods"
+message = 'Class has too many methods.'
+count = 1
+
+[[issues]]
+file = "src/TableGateway/Feature/FeatureSet.php"
+code = "kan-defect"
+message = 'Class has a high kan defect score.'
+count = 1
+
+[[issues]]
+file = "src/TableGateway/Feature/FeatureSet.php"
+code = "too-many-methods"
+message = 'Class has too many methods.'
+count = 1
+
+[[issues]]
+file = "src/TableGateway/Feature/EventFeature.php"
+code = "too-many-methods"
+message = 'Class has too many methods.'
+count = 1

test/unit/TableGateway/Feature/RowGatewayFeatureTest.php

@@ -62,7 +62,7 @@ public function constructorWithNoArguments(): void
     #[Test]
     public function postInitializeIgnoresAnArgumentThatIsNeitherStringNorRowGateway(): void
     {
-        $resultSet    = new ResultSet();
+        $resultSet    = $this->createInitialResultSet();
         $tableGateway = $this->createTableGatewayMock($resultSet);
         $original     = $resultSet->getRowPrototype();
 
@@ -145,7 +145,7 @@ public function postInitializeThrowsExceptionWhenNoMetadataAndNoPrimaryKey(): vo
     #[Test]
     public function postInitializeThrowsWhenMetadataIsNotAnArray(): void
     {
-        $resultSet = new ResultSet();
+        $resultSet = $this->createInitialResultSet();
 
         $metadataFeature = $this->getMockBuilder(MetadataFeature::class)
             ->disableOriginalConstructor()
@@ -172,7 +172,7 @@ public function postInitializeThrowsWhenMetadataIsNotAnArray(): void
     #[Test]
     public function postInitializeThrowsWhenMetadataPrimaryKeyIsUnusable(): void
     {
-        $resultSet = new ResultSet();
+        $resultSet = $this->createInitialResultSet();
 
         $metadataFeature = $this->getMockBuilder(MetadataFeature::class)
             ->disableOriginalConstructor()
@@ -203,7 +203,7 @@ public function postInitializeThrowsWhenMetadataPrimaryKeyIsUnusable(): void
     #[Test]
     public function postInitializeThrowsWhenTableGatewayHasNoFeatureSet(): void
     {
-        $resultSet    = new ResultSet();
+        $resultSet    = $this->createInitialResultSet();
         $tableGateway = $this->createTableGatewayMock($resultSet);
 
         $featureSetProperty = new ReflectionProperty(AbstractTableGateway::class, 'featureSet');
@@ -221,7 +221,7 @@ public function postInitializeThrowsWhenTableGatewayHasNoFeatureSet(): void
     #[Test]
     public function postInitializeThrowsWhenTableIsNotNamed(): void
     {
-        $resultSet    = new ResultSet();
+        $resultSet    = $this->createInitialResultSet();
         $tableGateway = $this->createTableGatewayMock($resultSet);
 
         $tableProperty = new ReflectionProperty(AbstractTableGateway::class, 'table');
@@ -332,7 +332,7 @@ private function createTableGatewayMock(
         $resultSetProperty = new ReflectionProperty(AbstractTableGateway::class, 'resultSetPrototype');
         $resultSetProperty->setValue($tableGateway, $resultSetPrototype);
 
-        if ($featureSet !== null) {
+        if (null !== $featureSet) {
             $featureSetProperty = new ReflectionProperty(AbstractTableGateway::class, 'featureSet');
             $featureSetProperty->setValue($tableGateway, $featureSet);
         }