Fix phpcs violations: alignment, FQCN imports, unused imports

Author: simon-mundy

test/unit/Adapter/Container/AbstractAdapterInterfaceFactoryTest.php

@@ -173,15 +173,15 @@ public function testInvokeUsesResultSetFromContainer(): void
         $profiler  = $this->createMock(ProfilerInterface::class);
 
         /** @var PdoDriverInterface&MockObject $driverMock */
-        $driverMock   = $this->createMock(PdoDriverInterface::class);
+        $driverMock = $this->createMock(PdoDriverInterface::class);
         /** @var PlatformInterface&MockObject $platformMock */
         $platformMock = $this->createMock(PlatformInterface::class);
 
         $container = new ServiceManager([
             'abstract_factories' => [AbstractAdapterInterfaceFactory::class],
             'factories'          => [
-                PdoStubDriver::class     => static fn() => $driverMock,
-                PlatformInterface::class => static fn() => $platformMock,
+                PdoStubDriver::class      => static fn() => $driverMock,
+                PlatformInterface::class  => static fn() => $platformMock,
                 ResultSetInterface::class => static fn() => $resultSet,
                 ProfilerInterface::class  => static fn() => $profiler,
             ],

test/unit/Adapter/ParameterContainerTest.php

@@ -312,7 +312,6 @@ public function testOffsetSetThrowsOnInvalidKeyType(): void
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Keys must be string, integer or null');
 
-        /** @phpstan-ignore argument.type */
         $container->offsetSet(1.5, 'value');
     }
 

test/unit/ResultSet/AbstractResultSetTest.php

@@ -14,12 +14,12 @@
 use PhpDb\Adapter\Driver\Pdo\Result;
 use PhpDb\Adapter\Driver\ResultInterface;
 use PhpDb\ResultSet\AbstractResultSet;
-use PhpDb\ResultSet\Exception\InvalidArgumentException;
 use PhpDb\ResultSet\Exception\RuntimeException;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use stdClass;
 use TypeError;
 
 use function assert;
@@ -584,7 +584,7 @@ public function testCountReturnsCachedResult(): void
     public function testToArrayThrowsOnNonCastableRows(): void
     {
         $resultSet = $this->createResultSetMock();
-        $resultSet->initialize(new ArrayIterator([new \stdClass()]));
+        $resultSet->initialize(new ArrayIterator([new stdClass()]));
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('cannot be cast to an array');

test/unit/ResultSet/HydratingResultSetTest.php

@@ -10,6 +10,7 @@
 use Laminas\Hydrator\ArraySerializableHydrator;
 use Laminas\Hydrator\ClassMethodsHydrator;
 use Override;
+use PhpDb\ResultSet\Exception\RuntimeException;
 use PhpDb\ResultSet\HydratingResultSet;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\Group;
@@ -204,13 +205,13 @@ public function testToArrayUsesHydratorExtract(): void
     public function testCurrentDisablesBufferingImplicitly(): void
     {
         $hydratingRs = new HydratingResultSet();
-        $hydratingRs->initialize(new \ArrayIterator([
+        $hydratingRs->initialize(new ArrayIterator([
             ['id' => 1],
         ]));
 
         $hydratingRs->current();
 
-        $this->expectException(\PhpDb\ResultSet\Exception\RuntimeException::class);
+        $this->expectException(RuntimeException::class);
         $hydratingRs->buffer();
     }
 }

test/unit/Sql/AbstractSqlTest.php

@@ -5,18 +5,25 @@
 namespace PhpDbTest\Sql;
 
 use Override;
+use PhpDb\Adapter\Adapter;
 use PhpDb\Adapter\Driver\DriverInterface;
+use PhpDb\Adapter\Driver\StatementInterface;
 use PhpDb\Adapter\ParameterContainer;
 use PhpDb\Adapter\StatementContainer;
 use PhpDb\Sql\AbstractSql;
 use PhpDb\Sql\Argument;
 use PhpDb\Sql\Argument\Identifier;
+use PhpDb\Sql\ArgumentInterface;
+use PhpDb\Sql\ArgumentType;
+use PhpDb\Sql\Exception\InvalidArgumentException;
 use PhpDb\Sql\Exception\RuntimeException;
 use PhpDb\Sql\Expression;
 use PhpDb\Sql\ExpressionInterface;
+use PhpDb\Sql\Join;
 use PhpDb\Sql\Predicate;
 use PhpDb\Sql\Select;
 use PhpDb\Sql\TableIdentifier;
+use PhpDbTest\TestAsset\SelectDecorator;
 use PhpDbTest\TestAsset\TrustingSql92Platform;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\Group;
@@ -435,7 +442,7 @@ protected function invokeProcessExpressionMethod(
      */
     public function testProcessJoinWithArrayAlias(): void
     {
-        $join = new \PhpDb\Sql\Join();
+        $join = new Join();
         $join->join(['b' => 'bar'], 'foo.id = b.foo_id');
 
         $method = new ReflectionMethod($this->abstractSql, 'processJoin');
@@ -456,8 +463,8 @@ public function testProcessJoinWithArrayAlias(): void
      */
     public function testProcessJoinWithTableIdentifier(): void
     {
-        $join = new \PhpDb\Sql\Join();
-        $join->join(new \PhpDb\Sql\TableIdentifier('bar', 'myschema'), 'foo.id = bar.foo_id');
+        $join = new Join();
+        $join->join(new TableIdentifier('bar', 'myschema'), 'foo.id = bar.foo_id');
 
         $method = new ReflectionMethod($this->abstractSql, 'processJoin');
         $result = $method->invoke(
@@ -478,7 +485,7 @@ public function testProcessJoinWithTableIdentifier(): void
      */
     public function testProcessJoinWithPredicateExpressionOnClause(): void
     {
-        $join = new \PhpDb\Sql\Join();
+        $join = new Join();
         $join->join('bar', new Predicate\Expression('foo.id = bar.foo_id AND bar.active = 1'));
 
         $method = new ReflectionMethod($this->abstractSql, 'processJoin');
@@ -527,7 +534,7 @@ public function testRenderTableWithAlias(): void
      */
     public function testProcessJoinWithExpressionNameViaArray(): void
     {
-        $join = new \PhpDb\Sql\Join();
+        $join = new Join();
         $join->join(['x' => new Expression('LATERAL(SELECT 1)')], 'true');
 
         $method = new ReflectionMethod($this->abstractSql, 'processJoin');
@@ -548,7 +555,7 @@ public function testProcessJoinWithExpressionNameViaArray(): void
     public function testProcessJoinWithSelectSubqueryViaArray(): void
     {
         $subselect = new Select('bar');
-        $join      = new \PhpDb\Sql\Join();
+        $join      = new Join();
         $join->join(['b' => $subselect], 'foo.id = b.foo_id');
 
         $method = new ReflectionMethod($this->abstractSql, 'processJoin');
@@ -644,10 +651,10 @@ public function testCreateSqlFromSpecNonCombinedByThrowsOnUnsupportedCount(): vo
 
     public function testProcessExpressionThrowsOnUnknownArgumentType(): void
     {
-        $unknownArg = new class implements \PhpDb\Sql\ArgumentInterface {
-            public function getType(): \PhpDb\Sql\ArgumentType
+        $unknownArg = new class implements ArgumentInterface {
+            public function getType(): ArgumentType
             {
-                return \PhpDb\Sql\ArgumentType::Value;
+                return ArgumentType::Value;
             }
 
             public function getValue(): string
@@ -663,7 +670,7 @@ public function getSpecification(): string
 
         $expression = new Expression('?', [$unknownArg]);
 
-        $this->expectException(\PhpDb\Sql\Exception\InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Unknown argument type');
         $this->invokeProcessExpressionMethod($expression);
     }
@@ -679,11 +686,11 @@ public function testResolveColumnValueWithNamedParameterPrefix(): void
             ->willReturnCallback(fn(string $name): string => ':' . $name);
 
         $parameterContainer = new ParameterContainer();
-        $mockStatement      = $this->createMock(\PhpDb\Adapter\Driver\StatementInterface::class);
+        $mockStatement      = $this->createMock(StatementInterface::class);
         $mockStatement->method('getParameterContainer')->willReturn($parameterContainer);
         $mockStatement->method('setSql')->willReturnSelf();
 
-        $adapter = $this->getMockBuilder(\PhpDb\Adapter\Adapter::class)
+        $adapter = $this->getMockBuilder(Adapter::class)
             ->setConstructorArgs([$mockDriver, new TrustingSql92Platform()])
             ->getMock();
         $adapter->method('getDriver')->willReturn($mockDriver);
@@ -696,7 +703,7 @@ public function testResolveColumnValueWithNamedParameterPrefix(): void
 
     public function testLocalizeVariablesCopiesSubjectProperties(): void
     {
-        $decorator = new \PhpDbTest\TestAsset\SelectDecorator();
+        $decorator = new SelectDecorator();
         $select    = new Select('users');
         $select->columns(['id', 'name']);
         $decorator->setSubject($select);
@@ -709,7 +716,7 @@ public function testLocalizeVariablesCopiesSubjectProperties(): void
 
     public function testProcessSubSelectUsesDecoratorWhenPlatformDecorator(): void
     {
-        $decorator = new \PhpDbTest\TestAsset\SelectDecorator();
+        $decorator = new SelectDecorator();
         $outer     = new Select('foo');
         $outer->where(['x' => new Select('bar')]);
 
@@ -741,10 +748,10 @@ public function testFlattenExpressionValuesViaInPredicateWithParameterContainer(
             ->willReturnCallback(fn(string $name): string => ':' . $name);
 
         $parameterContainer = new ParameterContainer();
-        $mockStatement      = $this->createMock(\PhpDb\Adapter\Driver\StatementInterface::class);
+        $mockStatement      = $this->createMock(StatementInterface::class);
         $mockStatement->method('getParameterContainer')->willReturn($parameterContainer);
 
-        $adapter = $this->getMockBuilder(\PhpDb\Adapter\Adapter::class)
+        $adapter = $this->getMockBuilder(Adapter::class)
             ->setConstructorArgs([$mockDriver, new TrustingSql92Platform()])
             ->getMock();
         $adapter->method('getDriver')->willReturn($mockDriver);

test/unit/Sql/Platform/PlatformTest.php

@@ -11,6 +11,8 @@
 use PhpDb\Adapter\StatementContainer;
 use PhpDb\ResultSet\ResultSet;
 use PhpDb\Sql\Exception\RuntimeException;
+use PhpDb\Sql\Insert;
+use PhpDb\Sql\Platform\AbstractPlatform;
 use PhpDb\Sql\Platform\Platform;
 use PhpDb\Sql\Platform\PlatformDecoratorInterface;
 use PhpDb\Sql\PreparableSqlInterface;
@@ -245,7 +247,7 @@ public function testGetTypeDecoratorFallsThroughWhenNoMatch(): void
         $platform        = new Platform($adapterPlatform);
 
         $decorator = $this->createMock(PlatformDecoratorInterface::class);
-        $platform->setTypeDecorator(\PhpDb\Sql\Insert::class, $decorator);
+        $platform->setTypeDecorator(Insert::class, $decorator);
 
         $select = new Select('foo');
         $result = $platform->getTypeDecorator($select);
@@ -258,7 +260,7 @@ public function testGetTypeDecoratorMatchesByInstanceofLoop(): void
         $adapterPlatform = new TestAsset\TrustingSql92Platform();
         $platform        = new Platform($adapterPlatform);
 
-        $innerPlatform = new \PhpDb\Sql\Platform\AbstractPlatform();
+        $innerPlatform = new AbstractPlatform();
         $platform->setTypeDecorator(SqlInterface::class, $innerPlatform);
 
         $select = new Select('foo');

test/unit/Sql/SqlTest.php

@@ -10,12 +10,13 @@
 use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Driver\ResultInterface;
 use PhpDb\Adapter\Driver\StatementInterface;
+use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Sql\Delete;
 use PhpDb\Sql\Exception\InvalidArgumentException;
 use PhpDb\Sql\Exception\RuntimeException;
 use PhpDb\Sql\Insert;
-use PhpDb\Sql\Select;
 use PhpDb\Sql\Platform\PlatformDecoratorInterface;
+use PhpDb\Sql\Select;
 use PhpDb\Sql\Sql;
 use PhpDb\Sql\TableIdentifier;
 use PhpDb\Sql\Update;
@@ -206,7 +207,7 @@ public function testGetSqlPlatformReturnsPlatformDecorator(): void
     public function testPrepareStatementThrowsWhenPlatformNotPreparable(): void
     {
         $decorator = $this->createMock(PlatformDecoratorInterface::class);
-        $platform  = $this->createMock(\PhpDb\Adapter\Platform\PlatformInterface::class);
+        $platform  = $this->createMock(PlatformInterface::class);
         $platform->method('getSqlPlatformDecorator')->willReturn($decorator);
 
         $adapter = $this->getMockBuilder(Adapter::class)
@@ -227,7 +228,7 @@ public function testPrepareStatementThrowsWhenPlatformNotPreparable(): void
     public function testBuildSqlStringThrowsWhenPlatformNotSqlInterface(): void
     {
         $decorator = $this->createMock(PlatformDecoratorInterface::class);
-        $platform  = $this->createMock(\PhpDb\Adapter\Platform\PlatformInterface::class);
+        $platform  = $this->createMock(PlatformInterface::class);
         $platform->method('getSqlPlatformDecorator')->willReturn($decorator);
 
         $adapter = $this->getMockBuilder(Adapter::class)