diff --git a/src/Adapter/Driver/Oci8/Connection.php b/src/Adapter/Driver/Oci8/Connection.php
index 79441ba9a..ecdbd8590 100644
--- a/src/Adapter/Driver/Oci8/Connection.php
+++ b/src/Adapter/Driver/Oci8/Connection.php
@@ -252,7 +252,7 @@ public function execute($sql)
 
     /**
      * @todo Get Last Generated Value in Connection (this might not apply)
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function getLastGeneratedValue($name = null)
     {
diff --git a/src/Sql/Delete.php b/src/Sql/Delete.php
index e7fb0e83a..ffc655ed1 100644
--- a/src/Sql/Delete.php
+++ b/src/Sql/Delete.php
@@ -70,7 +70,6 @@ public function from($table): static
     }
 
     /**
-     * @param ?string $key
      * @return mixed
      */
     public function getRawState(?string $key = null)
diff --git a/src/Sql/Predicate/PredicateSet.php b/src/Sql/Predicate/PredicateSet.php
index 579a1f5ec..9692213e8 100644
--- a/src/Sql/Predicate/PredicateSet.php
+++ b/src/Sql/Predicate/PredicateSet.php
@@ -133,8 +133,6 @@ public function addPredicates($predicates, $combination = self::OP_AND)
 
     /**
      * Return the predicates
-     *
-     * @return array
      */
     public function getPredicates(): array
     {
diff --git a/src/Sql/Select.php b/src/Sql/Select.php
index 338a8dc12..7fdf54f43 100644
--- a/src/Sql/Select.php
+++ b/src/Sql/Select.php
@@ -115,7 +115,7 @@ class Select extends AbstractPreparableSql
     protected bool $prefixColumnsWithTable = true;
 
     /** @var null|string|array|TableIdentifier */
-    protected $table = null;
+    protected $table;
 
     /** @var null|string|Expression */
     protected $quantifier;
@@ -239,7 +239,7 @@ public function columns(array $columns, $prefixColumnsWithTable = true)
      * Create join clause
      *
      * @param  string|array|TableIdentifier $name
-     * @param  string|Predicate\PredicateInterface $on
+     * @param  string|PredicateInterface $on
      * @param  string|array $columns
      * @param  string $type one of the JOIN_* constants
      * @return $this Provides a fluent interface
diff --git a/test/integration/Adapter/Driver/Pdo/Mysql/AdapterTrait.php b/test/integration/Adapter/Driver/Pdo/Mysql/AdapterTrait.php
index cf3f1cffd..abc6928ff 100644
--- a/test/integration/Adapter/Driver/Pdo/Mysql/AdapterTrait.php
+++ b/test/integration/Adapter/Driver/Pdo/Mysql/AdapterTrait.php
@@ -16,8 +16,10 @@ trait AdapterTrait
     #[Override]
     protected function setUp(): void
     {
-        if (! is_string(getenv('TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL')) ||
-            strtolower((string) getenv('TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL')) !== 'true') {
+        if (
+            ! is_string(getenv('TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL')) ||
+            strtolower((string) getenv('TESTS_LAMINAS_DB_ADAPTER_DRIVER_MYSQL')) !== 'true'
+        ) {
             $this->markTestSkipped('pdo_mysql integration tests are not enabled!');
         }
 
diff --git a/test/integration/Adapter/Driver/Pdo/Postgresql/AdapterTrait.php b/test/integration/Adapter/Driver/Pdo/Postgresql/AdapterTrait.php
index 9bdbc5bc2..e67e19294 100644
--- a/test/integration/Adapter/Driver/Pdo/Postgresql/AdapterTrait.php
+++ b/test/integration/Adapter/Driver/Pdo/Postgresql/AdapterTrait.php
@@ -16,7 +16,10 @@ trait AdapterTrait
     #[Override]
     protected function setUp(): void
     {
-        if (! is_string(getenv('TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL')) || strtolower(getenv('TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL')) !== 'true') {
+        if (
+            ! is_string(getenv('TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL'))
+            || strtolower(getenv('TESTS_LAMINAS_DB_ADAPTER_DRIVER_PGSQL')) !== 'true'
+        ) {
             $this->markTestSkipped('pdo_pgsql integration tests are not enabled!');
         }
 
diff --git a/test/unit/Adapter/Driver/IbmDb2/IbmDb2Test.php b/test/unit/Adapter/Driver/IbmDb2/IbmDb2Test.php
index 73b78460b..cefd30d7d 100644
--- a/test/unit/Adapter/Driver/IbmDb2/IbmDb2Test.php
+++ b/test/unit/Adapter/Driver/IbmDb2/IbmDb2Test.php
@@ -42,7 +42,10 @@ protected function setUp(): void
      */
     public function testRegisterConnection(): void
     {
-        $mockConnection = $this->getMockBuilder(Connection::class)->setConstructorArgs([[]])->onlyMethods(['setDriver'])->getMock();
+        $mockConnection = $this->getMockBuilder(Connection::class)
+                            ->setConstructorArgs([[]])
+                            ->onlyMethods(['setDriver'])
+                            ->getMock();
         $mockConnection->expects($this->once())->method('setDriver')->with($this->equalTo($this->ibmdb2));
         self::assertSame($this->ibmdb2, $this->ibmdb2->registerConnection($mockConnection));
     }
@@ -53,7 +56,10 @@ public function testRegisterConnection(): void
     public function testRegisterStatementPrototype(): void
     {
         $this->ibmdb2  = new IbmDb2([]);
-        $mockStatement = $this->getMockBuilder(Statement::class)->setConstructorArgs([])->onlyMethods(['setDriver'])->getMock();
+        $mockStatement = $this->getMockBuilder(Statement::class)
+                            ->setConstructorArgs([])
+                            ->onlyMethods(['setDriver'])
+                            ->getMock();
         $mockStatement->expects($this->once())->method('setDriver')->with($this->equalTo($this->ibmdb2));
         self::assertSame($this->ibmdb2, $this->ibmdb2->registerStatementPrototype($mockStatement));
     }
diff --git a/test/unit/Adapter/Driver/Oci8/Oci8Test.php b/test/unit/Adapter/Driver/Oci8/Oci8Test.php
index 4182dd97c..3ee6fadbf 100644
--- a/test/unit/Adapter/Driver/Oci8/Oci8Test.php
+++ b/test/unit/Adapter/Driver/Oci8/Oci8Test.php
@@ -41,7 +41,10 @@ protected function setUp(): void
      */
     public function testRegisterConnection(): void
     {
-        $mockConnection = $this->getMockBuilder(Connection::class)->setConstructorArgs([[]])->onlyMethods(['setDriver'])->getMock();
+        $mockConnection = $this->getMockBuilder(Connection::class)
+            ->setConstructorArgs([[]])
+            ->onlyMethods(['setDriver'])
+            ->getMock();
         $mockConnection->expects($this->once())->method('setDriver')->with($this->equalTo($this->oci8));
         self::assertSame($this->oci8, $this->oci8->registerConnection($mockConnection));
     }
@@ -52,7 +55,10 @@ public function testRegisterConnection(): void
     public function testRegisterStatementPrototype(): void
     {
         $this->oci8    = new Oci8([]);
-        $mockStatement = $this->getMockBuilder(Statement::class)->setConstructorArgs([])->onlyMethods(['setDriver'])->getMock();
+        $mockStatement = $this->getMockBuilder(Statement::class)
+            ->setConstructorArgs([])
+            ->onlyMethods(['setDriver'])
+            ->getMock();
         $mockStatement->expects($this->once())->method('setDriver')->with($this->equalTo($this->oci8));
         self::assertSame($this->oci8, $this->oci8->registerStatementPrototype($mockStatement));
     }
@@ -63,7 +69,10 @@ public function testRegisterStatementPrototype(): void
     public function testRegisterResultPrototype(): void
     {
         $this->oci8    = new Oci8([]);
-        $mockStatement = $this->getMockBuilder(Result::class)->setConstructorArgs([])->onlyMethods([])->getMock();
+        $mockStatement = $this->getMockBuilder(Result::class)
+            ->setConstructorArgs([])
+            ->onlyMethods([])
+            ->getMock();
         self::assertSame($this->oci8, $this->oci8->registerResultPrototype($mockStatement));
     }
 
diff --git a/test/unit/Adapter/Driver/Pgsql/PgsqlTest.php b/test/unit/Adapter/Driver/Pgsql/PgsqlTest.php
index 444f56291..65b647dc9 100644
--- a/test/unit/Adapter/Driver/Pgsql/PgsqlTest.php
+++ b/test/unit/Adapter/Driver/Pgsql/PgsqlTest.php
@@ -55,7 +55,10 @@ public function testCheckEnvironment(): void
      */
     public function testRegisterConnection(): void
     {
-        $mockConnection = $this->getMockBuilder(Connection::class)->setConstructorArgs([[]])->onlyMethods(['setDriver'])->getMock();
+        $mockConnection = $this->getMockBuilder(Connection::class)
+                            ->setConstructorArgs([[]])
+                            ->onlyMethods(['setDriver'])
+                            ->getMock();
         $mockConnection->expects($this->once())->method('setDriver')->with($this->equalTo($this->pgsql));
         self::assertSame($this->pgsql, $this->pgsql->registerConnection($mockConnection));
     }
@@ -66,7 +69,10 @@ public function testRegisterConnection(): void
     public function testRegisterStatementPrototype(): void
     {
         $this->pgsql   = new Pgsql([]);
-        $mockStatement = $this->getMockBuilder(Statement::class)->setConstructorArgs([])->onlyMethods(['setDriver'])->getMock();
+        $mockStatement = $this->getMockBuilder(Statement::class)
+                            ->setConstructorArgs([])
+                            ->onlyMethods(['setDriver'])
+                            ->getMock();
         $mockStatement->expects($this->once())->method('setDriver')->with($this->equalTo($this->pgsql));
         self::assertSame($this->pgsql, $this->pgsql->registerStatementPrototype($mockStatement));
     }
@@ -77,7 +83,10 @@ public function testRegisterStatementPrototype(): void
     public function testRegisterResultPrototype(): void
     {
         $this->pgsql   = new Pgsql([]);
-        $mockStatement = $this->getMockBuilder(Result::class)->setConstructorArgs([])->onlyMethods([])->getMock();
+        $mockStatement = $this->getMockBuilder(Result::class)
+                            ->setConstructorArgs([])
+                            ->onlyMethods([])
+                            ->getMock();
         self::assertSame($this->pgsql, $this->pgsql->registerResultPrototype($mockStatement));
     }
 
diff --git a/test/unit/Adapter/Driver/Sqlsrv/SqlsrvTest.php b/test/unit/Adapter/Driver/Sqlsrv/SqlsrvTest.php
index c760a3bbc..7f6bdd3ec 100644
--- a/test/unit/Adapter/Driver/Sqlsrv/SqlsrvTest.php
+++ b/test/unit/Adapter/Driver/Sqlsrv/SqlsrvTest.php
@@ -42,7 +42,10 @@ protected function setUp(): void
      */
     public function testRegisterConnection(): void
     {
-        $mockConnection = $this->getMockBuilder(Connection::class)->setConstructorArgs([[]])->onlyMethods(['setDriver'])->getMock();
+        $mockConnection = $this->getMockBuilder(Connection::class)
+            ->setConstructorArgs([[]])
+            ->onlyMethods(['setDriver'])
+            ->getMock();
         $mockConnection->expects($this->once())->method('setDriver')->with($this->equalTo($this->sqlsrv));
         self::assertSame($this->sqlsrv, $this->sqlsrv->registerConnection($mockConnection));
     }
@@ -53,7 +56,10 @@ public function testRegisterConnection(): void
     public function testRegisterStatementPrototype(): void
     {
         $this->sqlsrv  = new Sqlsrv([]);
-        $mockStatement = $this->getMockBuilder(Statement::class)->setConstructorArgs([])->onlyMethods(['setDriver'])->getMock();
+        $mockStatement = $this->getMockBuilder(Statement::class)
+            ->setConstructorArgs([])
+            ->onlyMethods(['setDriver'])
+            ->getMock();
         $mockStatement->expects($this->once())->method('setDriver')->with($this->equalTo($this->sqlsrv));
         self::assertSame($this->sqlsrv, $this->sqlsrv->registerStatementPrototype($mockStatement));
     }
diff --git a/test/unit/Adapter/Platform/PostgresqlTest.php b/test/unit/Adapter/Platform/PostgresqlTest.php
index b50bce013..30ed5acb6 100644
--- a/test/unit/Adapter/Platform/PostgresqlTest.php
+++ b/test/unit/Adapter/Platform/PostgresqlTest.php
@@ -120,8 +120,8 @@ public function testQuoteValueList(): void
         //    'Attempting to quote a value in Laminas\Db\Adapter\Platform\Postgresql without extension/driver'
         //    . ' support can introduce security vulnerabilities in a production environment'
         //);
-        $fooOBar = $this->platform->quoteTrustedValue("Foo O'Bar");
-        self::assertEquals($fooOBar, $this->platform->quoteValueList("Foo O'Bar"));
+        $fooBar = $this->platform->quoteTrustedValue("Foo O'Bar");
+        self::assertEquals($fooBar, $this->platform->quoteValueList("Foo O'Bar"));
     }
 
     public function testGetIdentifierSeparator(): void
diff --git a/test/unit/Adapter/Platform/Sql92Test.php b/test/unit/Adapter/Platform/Sql92Test.php
index 7bd2649d4..af3807322 100644
--- a/test/unit/Adapter/Platform/Sql92Test.php
+++ b/test/unit/Adapter/Platform/Sql92Test.php
@@ -65,7 +65,8 @@ public function testQuoteValueRaisesNoticeWithoutPlatformSupport(): void
          */
         //$this->expectNotice();
         //$this->expectExceptionMessage(
-        //    'Attempting to quote a value without specific driver level support can introduce security vulnerabilities '
+        //    'Attempting to quote a value without specific driver level '
+        //    . ' support can introduce security vulnerabilities'
         //    . 'in a production environment.'
         //);
         $this->expectNotToPerformAssertions();
@@ -109,7 +110,8 @@ public function testQuoteValueList(): void
          */
         //$this->expectError();
         //$this->expectExceptionMessage(
-        //    'Attempting to quote a value without specific driver level support can introduce security vulnerabilities '
+        //    'Attempting to quote a value without specific driver level '
+        //    . 'support can introduce security vulnerabilities '
         //    . 'in a production environment.'
         //);
         self::assertEquals("'Foo O\\'Bar'", $this->platform->quoteValueList("Foo O'Bar"));
diff --git a/test/unit/Adapter/Platform/SqlServerTest.php b/test/unit/Adapter/Platform/SqlServerTest.php
index bbf4655d6..87e5e501d 100644
--- a/test/unit/Adapter/Platform/SqlServerTest.php
+++ b/test/unit/Adapter/Platform/SqlServerTest.php
@@ -70,7 +70,8 @@ public function testQuoteValueRaisesNoticeWithoutPlatformSupport(): void
          */
         //$this->expectNotice();
         //$this->expectExceptionMessage(
-        //    'Attempting to quote a value in Laminas\Db\Adapter\Platform\SqlServer without extension/driver support can '
+        //    'Attempting to quote a value in Laminas\Db\Adapter\Platform\SqlServer '
+        //    . 'without extension/driver support can '
         //    . 'introduce security vulnerabilities in a production environment'
         //);
         $this->expectNotToPerformAssertions();
@@ -112,7 +113,8 @@ public function testQuoteValueList(): void
          */
         //$this->expectError();
         //$this->expectExceptionMessage(
-        //    'Attempting to quote a value in Laminas\Db\Adapter\Platform\SqlServer without extension/driver support can '
+        //    'Attempting to quote a value in Laminas\Db\Adapter\Platform\SqlServer '
+        //    . 'without extension/driver support can '
         //    . 'introduce security vulnerabilities in a production environment'
         //);
         self::assertEquals("'Foo O''Bar'", $this->platform->quoteValueList("Foo O'Bar"));
diff --git a/test/unit/Metadata/Source/AbstractSourceTest.php b/test/unit/Metadata/Source/AbstractSourceTest.php
index 3cf4632f5..2c520f346 100644
--- a/test/unit/Metadata/Source/AbstractSourceTest.php
+++ b/test/unit/Metadata/Source/AbstractSourceTest.php
@@ -22,7 +22,11 @@ final class AbstractSourceTest extends TestCase
     #[Override]
     protected function setUp(): void
     {
-        $this->abstractSourceMock = $this->getMockBuilder(AbstractSource::class)->setConstructorArgs([])->onlyMethods([])->disableOriginalConstructor()->getMock();
+        $this->abstractSourceMock = $this->getMockBuilder(AbstractSource::class)
+            ->setConstructorArgs([])
+            ->onlyMethods([])
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     /**
diff --git a/test/unit/RowGateway/AbstractRowGatewayTest.php b/test/unit/RowGateway/AbstractRowGatewayTest.php
index 354b6f91a..601844b3f 100644
--- a/test/unit/RowGateway/AbstractRowGatewayTest.php
+++ b/test/unit/RowGateway/AbstractRowGatewayTest.php
@@ -174,7 +174,10 @@ public function testSaveInsertMultiKey(): void
     {
         $this->rowGateway = $this->getMockBuilder(AbstractRowGateway::class)->onlyMethods([])->getMock();
 
-        $mockSql = $this->getMockBuilder(Sql::class)->setConstructorArgs([$this->mockAdapter])->onlyMethods([])->getMock();
+        $mockSql = $this->getMockBuilder(Sql::class)
+                    ->setConstructorArgs([$this->mockAdapter])
+                    ->onlyMethods([])
+                    ->getMock();
 
         $rgPropertyValues = [
             'primaryKeyColumn' => ['one', 'two'],
diff --git a/test/unit/Sql/Ddl/Column/AbstractLengthColumnTest.php b/test/unit/Sql/Ddl/Column/AbstractLengthColumnTest.php
index ea1ba4f34..5b63c61f8 100644
--- a/test/unit/Sql/Ddl/Column/AbstractLengthColumnTest.php
+++ b/test/unit/Sql/Ddl/Column/AbstractLengthColumnTest.php
@@ -17,7 +17,10 @@ final class AbstractLengthColumnTest extends TestCase
      */
     public function testSetLength(): void
     {
-        $column = $this->getMockBuilder(AbstractLengthColumn::class)->setConstructorArgs(['foo', 55])->onlyMethods([])->getMock();
+        $column = $this->getMockBuilder(AbstractLengthColumn::class)
+            ->setConstructorArgs(['foo', 55])
+            ->onlyMethods([])
+            ->getMock();
         self::assertEquals(55, $column->getLength());
         self::assertSame($column, $column->setLength(20));
         self::assertEquals(20, $column->getLength());
@@ -28,7 +31,10 @@ public function testSetLength(): void
      */
     public function testGetLength(): void
     {
-        $column = $this->getMockBuilder(AbstractLengthColumn::class)->setConstructorArgs(['foo', 55])->onlyMethods([])->getMock();
+        $column = $this->getMockBuilder(AbstractLengthColumn::class)
+            ->setConstructorArgs(['foo', 55])
+            ->onlyMethods([])
+            ->getMock();
         self::assertEquals(55, $column->getLength());
     }
 
@@ -37,7 +43,10 @@ public function testGetLength(): void
      */
     public function testGetExpressionData(): void
     {
-        $column = $this->getMockBuilder(AbstractLengthColumn::class)->setConstructorArgs(['foo', 4])->onlyMethods([])->getMock();
+        $column = $this->getMockBuilder(AbstractLengthColumn::class)
+            ->setConstructorArgs(['foo', 4])
+            ->onlyMethods([])
+            ->getMock();
 
         self::assertEquals(
             [['%s %s NOT NULL', ['foo', 'INTEGER(4)'], [$column::TYPE_IDENTIFIER, $column::TYPE_LITERAL]]],
diff --git a/test/unit/Sql/Ddl/Column/AbstractPrecisionColumnTest.php b/test/unit/Sql/Ddl/Column/AbstractPrecisionColumnTest.php
index 66b9a874d..b01860fde 100644
--- a/test/unit/Sql/Ddl/Column/AbstractPrecisionColumnTest.php
+++ b/test/unit/Sql/Ddl/Column/AbstractPrecisionColumnTest.php
@@ -19,7 +19,10 @@ final class AbstractPrecisionColumnTest extends TestCase
      */
     public function testSetDigits(): void
     {
-        $column = $this->getMockBuilder(AbstractPrecisionColumn::class)->setConstructorArgs(['foo', 10])->onlyMethods([])->getMock();
+        $column = $this->getMockBuilder(AbstractPrecisionColumn::class)
+            ->setConstructorArgs(['foo', 10])
+            ->onlyMethods([])
+            ->getMock();
         self::assertEquals(10, $column->getDigits());
         self::assertSame($column, $column->setDigits(12));
         self::assertEquals(12, $column->getDigits());
@@ -30,7 +33,10 @@ public function testSetDigits(): void
      */
     public function testGetDigits(): void
     {
-        $column = $this->getMockBuilder(AbstractPrecisionColumn::class)->setConstructorArgs(['foo', 10])->onlyMethods([])->getMock();
+        $column = $this->getMockBuilder(AbstractPrecisionColumn::class)
+            ->setConstructorArgs(['foo', 10])
+            ->onlyMethods([])
+            ->getMock();
         self::assertEquals(10, $column->getDigits());
     }
 
@@ -39,7 +45,10 @@ public function testGetDigits(): void
      */
     public function testSetDecimal(): void
     {
-        $column = $this->getMockBuilder(AbstractPrecisionColumn::class)->setConstructorArgs(['foo', 10, 5])->onlyMethods([])->getMock();
+        $column = $this->getMockBuilder(AbstractPrecisionColumn::class)
+            ->setConstructorArgs(['foo', 10, 5])
+            ->onlyMethods([])
+            ->getMock();
         self::assertEquals(5, $column->getDecimal());
         self::assertSame($column, $column->setDecimal(2));
         self::assertEquals(2, $column->getDecimal());
@@ -50,7 +59,10 @@ public function testSetDecimal(): void
      */
     public function testGetDecimal(): void
     {
-        $column = $this->getMockBuilder(AbstractPrecisionColumn::class)->setConstructorArgs(['foo', 10, 5])->onlyMethods([])->getMock();
+        $column = $this->getMockBuilder(AbstractPrecisionColumn::class)
+            ->setConstructorArgs(['foo', 10, 5])
+            ->onlyMethods([])
+            ->getMock();
         self::assertEquals(5, $column->getDecimal());
     }
 
@@ -59,7 +71,10 @@ public function testGetDecimal(): void
      */
     public function testGetExpressionData(): void
     {
-        $column = $this->getMockBuilder(AbstractPrecisionColumn::class)->setConstructorArgs(['foo', 10, 5])->onlyMethods([])->getMock();
+        $column = $this->getMockBuilder(AbstractPrecisionColumn::class)
+            ->setConstructorArgs(['foo', 10, 5])
+            ->onlyMethods([])
+            ->getMock();
 
         self::assertEquals(
             [['%s %s NOT NULL', ['foo', 'INTEGER(10,5)'], [$column::TYPE_IDENTIFIER, $column::TYPE_LITERAL]]],
diff --git a/test/unit/Sql/Platform/PlatformTest.php b/test/unit/Sql/Platform/PlatformTest.php
index 94b03451c..c55b8627b 100644
--- a/test/unit/Sql/Platform/PlatformTest.php
+++ b/test/unit/Sql/Platform/PlatformTest.php
@@ -122,8 +122,12 @@ protected function resolveAdapter(string $platformName): Adapter
         /** @var DriverInterface|MockObject $mockDriver */
         $mockDriver = $this->getMockBuilder(DriverInterface::class)->getMock();
 
-        $mockDriver->expects($this->any())->method('formatParameterName')->willReturn('?');
-        $mockDriver->expects($this->any())->method('createStatement')->willReturnCallback(fn() => new StatementContainer());
+        $mockDriver->expects($this->any())
+            ->method('formatParameterName')
+            ->willReturn('?');
+        $mockDriver->expects($this->any())
+            ->method('createStatement')
+            ->willReturnCallback(fn() => new StatementContainer());
 
         return new Adapter($mockDriver, $platform);
     }
diff --git a/test/unit/Sql/Predicate/NotBetweenTest.php b/test/unit/Sql/Predicate/NotBetweenTest.php
index d62374a03..af9819093 100644
--- a/test/unit/Sql/Predicate/NotBetweenTest.php
+++ b/test/unit/Sql/Predicate/NotBetweenTest.php
@@ -34,7 +34,11 @@ public function testRetrievingWherePartsReturnsSpecificationArrayOfIdentifierAnd
             [
                 $this->notBetween->getSpecification(),
                 ['foo.bar', 10, 19],
-                [ExpressionInterface::TYPE_IDENTIFIER, ExpressionInterface::TYPE_VALUE, ExpressionInterface::TYPE_VALUE],
+                [
+                    ExpressionInterface::TYPE_IDENTIFIER,
+                    ExpressionInterface::TYPE_VALUE,
+                    ExpressionInterface::TYPE_VALUE,
+                ],
             ],
         ];
         self::assertEquals($expected, $this->notBetween->getExpressionData());
@@ -47,7 +51,11 @@ public function testRetrievingWherePartsReturnsSpecificationArrayOfIdentifierAnd
             [
                 $this->notBetween->getSpecification(),
                 [10, 'foo.bar', 'foo.baz'],
-                [ExpressionInterface::TYPE_VALUE, ExpressionInterface::TYPE_IDENTIFIER, ExpressionInterface::TYPE_IDENTIFIER],
+                [
+                    ExpressionInterface::TYPE_VALUE,
+                    ExpressionInterface::TYPE_IDENTIFIER,
+                    ExpressionInterface::TYPE_IDENTIFIER,
+                ],
             ],
         ];
         self::assertEquals($expected, $this->notBetween->getExpressionData());
diff --git a/test/unit/Sql/SelectTest.php b/test/unit/Sql/SelectTest.php
index 6d30f4f60..68340079b 100644
--- a/test/unit/Sql/SelectTest.php
+++ b/test/unit/Sql/SelectTest.php
@@ -339,7 +339,7 @@ public function testWhereArgument1IsClosure(): void
     {
         $select = new Select();
         /** @var Where $where */
-        $where  = $select->getRawState('where');
+        $where = $select->getRawState('where');
 
         $select->where(function (Where $what) use ($where): void {
             self::assertSame($where, $what);
@@ -719,8 +719,13 @@ public function testCloning(): void
     #[DataProvider('providerData')]
     #[TestDox('unit test: Text process*() methods will return proper array when internally called,
                     part of extension API')]
-    public function testProcessMethods(Select $select, mixed $unused, mixed $unused2, mixed $unused3, array $internalTests)
-    {
+    public function testProcessMethods(
+        Select $select,
+        mixed $unused,
+        mixed $unused2,
+        mixed $unused3,
+        array $internalTests
+    ) {
         if (! $internalTests) {
             $this->expectNotToPerformAssertions();
             return;
@@ -865,7 +870,7 @@ public static function providerData(): array
         $select10 = new Select();
         $select10->from('foo')->join('zac', 'm = n');
         $sqlPrep10       = // same
-        $sqlStr10        = 'SELECT "foo".*, "zac".* FROM "foo" INNER JOIN "zac" ON "m" = "n"';
+            $sqlStr10    = 'SELECT "foo".*, "zac".* FROM "foo" INNER JOIN "zac" ON "m" = "n"';
         $internalTests10 = [
             'processSelect' => [[['"foo".*'], ['"zac".*']], '"foo"'],
             'processJoins'  => [[['INNER', '"zac"', '"m" = "n"']]],
@@ -875,7 +880,7 @@ public static function providerData(): array
         $select11 = new Select();
         $select11->from('foo')->join('zac', 'm = n', ['bar', 'baz']);
         $sqlPrep11       = // same
-        $sqlStr11        = 'SELECT "foo".*, "zac"."bar" AS "bar", "zac"."baz" AS "baz" FROM "foo" INNER JOIN "zac" ON "m" = "n"';
+            $sqlStr11    = 'SELECT "foo".*, "zac"."bar" AS "bar", "zac"."baz" AS "baz" FROM "foo" INNER JOIN "zac" ON "m" = "n"';
         $internalTests11 = [
             'processSelect' => [[['"foo".*'], ['"zac"."bar"', '"bar"'], ['"zac"."baz"', '"baz"']], '"foo"'],
             'processJoins'  => [[['INNER', '"zac"', '"m" = "n"']]],
@@ -885,7 +890,7 @@ public static function providerData(): array
         $select12 = new Select();
         $select12->from('foo')->join('zac', 'm = n', ['bar', 'baz'], Select::JOIN_OUTER);
         $sqlPrep12       = // same
-        $sqlStr12        = 'SELECT "foo".*, "zac"."bar" AS "bar", "zac"."baz" AS "baz" FROM "foo" OUTER JOIN "zac" ON "m" = "n"';
+            $sqlStr12    = 'SELECT "foo".*, "zac"."bar" AS "bar", "zac"."baz" AS "baz" FROM "foo" OUTER JOIN "zac" ON "m" = "n"';
         $internalTests12 = [
             'processSelect' => [[['"foo".*'], ['"zac"."bar"', '"bar"'], ['"zac"."baz"', '"baz"']], '"foo"'],
             'processJoins'  => [[['OUTER', '"zac"', '"m" = "n"']]],
@@ -895,7 +900,7 @@ public static function providerData(): array
         $select13 = new Select();
         $select13->from('foo')->join('zac', 'm = n', ['BAR' => 'bar', 'BAZ' => 'baz']);
         $sqlPrep13       = // same
-        $sqlStr13        = 'SELECT "foo".*, "zac"."bar" AS "BAR", "zac"."baz" AS "BAZ" FROM "foo" INNER JOIN "zac" ON "m" = "n"';
+            $sqlStr13    = 'SELECT "foo".*, "zac"."bar" AS "BAR", "zac"."baz" AS "BAZ" FROM "foo" INNER JOIN "zac" ON "m" = "n"';
         $internalTests13 = [
             'processSelect' => [[['"foo".*'], ['"zac"."bar"', '"BAR"'], ['"zac"."baz"', '"BAZ"']], '"foo"'],
             'processJoins'  => [[['INNER', '"zac"', '"m" = "n"']]],
@@ -905,7 +910,7 @@ public static function providerData(): array
         $select14 = new Select();
         $select14->from('foo')->join(['b' => 'bar'], 'b.foo_id = foo.foo_id');
         $sqlPrep14       = // same
-        $sqlStr14        = 'SELECT "foo".*, "b".* FROM "foo" INNER JOIN "bar" AS "b" ON "b"."foo_id" = "foo"."foo_id"';
+            $sqlStr14    = 'SELECT "foo".*, "b".* FROM "foo" INNER JOIN "bar" AS "b" ON "b"."foo_id" = "foo"."foo_id"';
         $internalTests14 = [
             'processSelect' => [[['"foo".*'], ['"b".*']], '"foo"'],
             'processJoins'  => [[['INNER', '"bar" AS "b"', '"b"."foo_id" = "foo"."foo_id"']]],
@@ -915,7 +920,7 @@ public static function providerData(): array
         $select15 = new Select();
         $select15->from('foo')->where('x = 5');
         $sqlPrep15       = // same
-        $sqlStr15        = 'SELECT "foo".* FROM "foo" WHERE x = 5';
+            $sqlStr15    = 'SELECT "foo".* FROM "foo" WHERE x = 5';
         $internalTests15 = [
             'processSelect' => [[['"foo".*']], '"foo"'],
             'processWhere'  => ['x = 5'],
@@ -936,7 +941,7 @@ public static function providerData(): array
         $select17 = new Select();
         $select17->from('foo')->group(['col1', 'col2']);
         $sqlPrep17       = // same
-        $sqlStr17        = 'SELECT "foo".* FROM "foo" GROUP BY "col1", "col2"';
+            $sqlStr17    = 'SELECT "foo".* FROM "foo" GROUP BY "col1", "col2"';
         $internalTests17 = [
             'processSelect' => [[['"foo".*']], '"foo"'],
             'processGroup'  => [['"col1"', '"col2"']],
@@ -945,7 +950,7 @@ public static function providerData(): array
         $select18 = new Select();
         $select18->from('foo')->group('col1')->group('col2');
         $sqlPrep18       = // same
-        $sqlStr18        = 'SELECT "foo".* FROM "foo" GROUP BY "col1", "col2"';
+            $sqlStr18    = 'SELECT "foo".* FROM "foo" GROUP BY "col1", "col2"';
         $internalTests18 = [
             'processSelect' => [[['"foo".*']], '"foo"'],
             'processGroup'  => [['"col1"', '"col2"']],
@@ -954,7 +959,7 @@ public static function providerData(): array
         $select19 = new Select();
         $select19->from('foo')->group(new Expression('DAY(?)', [['col1' => ExpressionInterface::TYPE_IDENTIFIER]]));
         $sqlPrep19       = // same
-        $sqlStr19        = 'SELECT "foo".* FROM "foo" GROUP BY DAY("col1")';
+            $sqlStr19    = 'SELECT "foo".* FROM "foo" GROUP BY DAY("col1")';
         $internalTests19 = [
             'processSelect' => [[['"foo".*']], '"foo"'],
             'processGroup'  => [['DAY("col1")']],
@@ -964,7 +969,7 @@ public static function providerData(): array
         $select20 = new Select();
         $select20->from('foo')->having('x = 5');
         $sqlPrep20       = // same
-        $sqlStr20        = 'SELECT "foo".* FROM "foo" HAVING x = 5';
+            $sqlStr20    = 'SELECT "foo".* FROM "foo" HAVING x = 5';
         $internalTests20 = [
             'processSelect' => [[['"foo".*']], '"foo"'],
             'processHaving' => ['x = 5'],
@@ -985,7 +990,7 @@ public static function providerData(): array
         $select22 = new Select();
         $select22->from('foo')->order('c1');
         $sqlPrep22       =
-        $sqlStr22        = 'SELECT "foo".* FROM "foo" ORDER BY "c1" ASC';
+            $sqlStr22    = 'SELECT "foo".* FROM "foo" ORDER BY "c1" ASC';
         $internalTests22 = [
             'processSelect' => [[['"foo".*']], '"foo"'],
             'processOrder'  => [[['"c1"', Select::ORDER_ASCENDING]]],
@@ -994,7 +999,7 @@ public static function providerData(): array
         $select23 = new Select();
         $select23->from('foo')->order(['c1', 'c2']);
         $sqlPrep23       = // same
-        $sqlStr23        = 'SELECT "foo".* FROM "foo" ORDER BY "c1" ASC, "c2" ASC';
+            $sqlStr23    = 'SELECT "foo".* FROM "foo" ORDER BY "c1" ASC, "c2" ASC';
         $internalTests23 = [
             'processSelect' => [[['"foo".*']], '"foo"'],
             'processOrder'  => [[['"c1"', Select::ORDER_ASCENDING], ['"c2"', Select::ORDER_ASCENDING]]],
@@ -1003,7 +1008,7 @@ public static function providerData(): array
         $select24 = new Select();
         $select24->from('foo')->order(['c1' => 'DESC', 'c2' => 'Asc']); // notice partially lower case ASC
         $sqlPrep24       = // same
-        $sqlStr24        = 'SELECT "foo".* FROM "foo" ORDER BY "c1" DESC, "c2" ASC';
+            $sqlStr24    = 'SELECT "foo".* FROM "foo" ORDER BY "c1" DESC, "c2" ASC';
         $internalTests24 = [
             'processSelect' => [[['"foo".*']], '"foo"'],
             'processOrder'  => [[['"c1"', Select::ORDER_DESCENDING], ['"c2"', Select::ORDER_ASCENDING]]],
@@ -1012,7 +1017,7 @@ public static function providerData(): array
         $select25 = new Select();
         $select25->from('foo')->order(['c1' => 'asc'])->order('c2 desc'); // notice partially lower case ASC
         $sqlPrep25       = // same
-        $sqlStr25        = 'SELECT "foo".* FROM "foo" ORDER BY "c1" ASC, "c2" DESC';
+            $sqlStr25    = 'SELECT "foo".* FROM "foo" ORDER BY "c1" ASC, "c2" DESC';
         $internalTests25 = [
             'processSelect' => [[['"foo".*']], '"foo"'],
             'processOrder'  => [[['"c1"', Select::ORDER_ASCENDING], ['"c2"', Select::ORDER_DESCENDING]]],
@@ -1045,7 +1050,7 @@ public static function providerData(): array
         $select28 = new Select();
         $select28->from('foo')->join('zac', '(m = n AND c.x) BETWEEN x AND y.z OR (c.x < y.z AND c.x <= y.z AND c.x > y.z AND c.x >= y.z)');
         $sqlPrep28       = // same
-        $sqlStr28        = 'SELECT "foo".*, "zac".* FROM "foo" INNER JOIN "zac" ON ("m" = "n" AND "c"."x") BETWEEN "x" AND "y"."z" OR ("c"."x" < "y"."z" AND "c"."x" <= "y"."z" AND "c"."x" > "y"."z" AND "c"."x" >= "y"."z")';
+            $sqlStr28    = 'SELECT "foo".*, "zac".* FROM "foo" INNER JOIN "zac" ON ("m" = "n" AND "c"."x") BETWEEN "x" AND "y"."z" OR ("c"."x" < "y"."z" AND "c"."x" <= "y"."z" AND "c"."x" > "y"."z" AND "c"."x" >= "y"."z")';
         $internalTests28 = [
             'processSelect' => [[['"foo".*'], ['"zac".*']], '"foo"'],
             'processJoins'  => [[['INNER', '"zac"', '("m" = "n" AND "c"."x") BETWEEN "x" AND "y"."z" OR ("c"."x" < "y"."z" AND "c"."x" <= "y"."z" AND "c"."x" > "y"."z" AND "c"."x" >= "y"."z")']]],
@@ -1055,7 +1060,7 @@ public static function providerData(): array
         $select29 = new Select();
         $select29->from('foo')->order('c1.d2');
         $sqlPrep29       =
-        $sqlStr29        = 'SELECT "foo".* FROM "foo" ORDER BY "c1"."d2" ASC';
+            $sqlStr29    = 'SELECT "foo".* FROM "foo" ORDER BY "c1"."d2" ASC';
         $internalTests29 = [
             'processSelect' => [[['"foo".*']], '"foo"'],
             'processOrder'  => [[['"c1"."d2"', Select::ORDER_ASCENDING]]],
@@ -1065,7 +1070,7 @@ public static function providerData(): array
         $select30 = new Select();
         $select30->from('foo')->group('c1.d2');
         $sqlPrep30       = // same
-        $sqlStr30        = 'SELECT "foo".* FROM "foo" GROUP BY "c1"."d2"';
+            $sqlStr30    = 'SELECT "foo".* FROM "foo" GROUP BY "c1"."d2"';
         $internalTests30 = [
             'processSelect' => [[['"foo".*']], '"foo"'],
             'processGroup'  => [['"c1"."d2"']],
@@ -1075,7 +1080,7 @@ public static function providerData(): array
         $select31 = new Select();
         $select31->from('foo')->join('zac', new Predicate\Expression('(m = n AND c.x) BETWEEN x AND y.z'));
         $sqlPrep31       = // same
-        $sqlStr31        = 'SELECT "foo".*, "zac".* FROM "foo" INNER JOIN "zac" ON (m = n AND c.x) BETWEEN x AND y.z';
+            $sqlStr31    = 'SELECT "foo".*, "zac".* FROM "foo" INNER JOIN "zac" ON (m = n AND c.x) BETWEEN x AND y.z';
         $internalTests31 = [
             'processSelect' => [[['"foo".*'], ['"zac".*']], '"foo"'],
             'processJoins'  => [[['INNER', '"zac"', '(m = n AND c.x) BETWEEN x AND y.z']]],
@@ -1121,7 +1126,7 @@ public static function providerData(): array
         $select35 = new Select();
         $select35->from('foo')->columns([])->join('bar', 'm = n', ['thecount' => new Expression("COUNT(*)")]);
         $sqlPrep35       = // same
-        $sqlStr35        = 'SELECT COUNT(*) AS "thecount" FROM "foo" INNER JOIN "bar" ON "m" = "n"';
+            $sqlStr35    = 'SELECT COUNT(*) AS "thecount" FROM "foo" INNER JOIN "bar" ON "m" = "n"';
         $internalTests35 = [
             'processSelect' => [[['COUNT(*)', '"thecount"']], '"foo"'],
             'processJoins'  => [[['INNER', '"bar"', '"m" = "n"']]],
@@ -1151,7 +1156,7 @@ public static function providerData(): array
         $select37 = new Select();
         $select37->from('foo')->columns(['bar'], false);
         $sqlPrep37       = // same
-        $sqlStr37        = 'SELECT "bar" AS "bar" FROM "foo"';
+            $sqlStr37    = 'SELECT "bar" AS "bar" FROM "foo"';
         $internalTests37 = [
             'processSelect' => [[['"bar"', '"bar"']], '"foo"'],
         ];
@@ -1162,7 +1167,7 @@ public static function providerData(): array
         $select38->from('foo')->columns([])
             ->join(new TableIdentifier('bar', 'baz'), 'm = n', ['thecount' => new Expression("COUNT(*)")]);
         $sqlPrep38       = // same
-        $sqlStr38        = 'SELECT COUNT(*) AS "thecount" FROM "foo" INNER JOIN "baz"."bar" ON "m" = "n"';
+            $sqlStr38    = 'SELECT COUNT(*) AS "thecount" FROM "foo" INNER JOIN "baz"."bar" ON "m" = "n"';
         $internalTests38 = [
             'processSelect' => [[['COUNT(*)', '"thecount"']], '"foo"'],
             'processJoins'  => [[['INNER', '"baz"."bar"', '"m" = "n"']]],
@@ -1188,7 +1193,7 @@ public static function providerData(): array
             ->join(['a' => new TableIdentifier('another_foo', 'another_schema')], 'a.x = foo.foo_column')
             ->join('bar', 'foo.colx = bar.colx');
         $sqlPrep40       = // same
-        $sqlStr40        = 'SELECT "foo".*, "a".*, "bar".* FROM "foo"'
+            $sqlStr40    = 'SELECT "foo".*, "a".*, "bar".* FROM "foo"'
             . ' INNER JOIN "another_schema"."another_foo" AS "a" ON "a"."x" = "foo"."foo_column"'
             . ' INNER JOIN "bar" ON "foo"."colx" = "bar"."colx"';
         $internalTests40 = [
@@ -1204,7 +1209,7 @@ public static function providerData(): array
         $select41 = new Select();
         $select41->from('foo')->quantifier(Select::QUANTIFIER_DISTINCT);
         $sqlPrep41       = // same
-        $sqlStr41        = 'SELECT DISTINCT "foo".* FROM "foo"';
+            $sqlStr41    = 'SELECT DISTINCT "foo".* FROM "foo"';
         $internalTests41 = [
             'processSelect' => [Select::QUANTIFIER_DISTINCT, [['"foo".*']], '"foo"'],
         ];
@@ -1231,7 +1236,7 @@ public static function providerData(): array
         $select44b->from('bar')->where('c = d');
         $select44->combine($select44b, Select::COMBINE_UNION, 'ALL');
         $sqlPrep44       = // same
-        $sqlStr44        = '( SELECT "foo".* FROM "foo" WHERE a = b ) UNION ALL ( SELECT "bar".* FROM "bar" WHERE c = d )';
+            $sqlStr44    = '( SELECT "foo".* FROM "foo" WHERE a = b ) UNION ALL ( SELECT "bar".* FROM "bar" WHERE c = d )';
         $internalTests44 = [
             'processCombine' => ['UNION ALL', 'SELECT "bar".* FROM "bar" WHERE c = d'],
         ];
@@ -1281,7 +1286,7 @@ public static function providerData(): array
         $select48combined = new Select();
         $select48         = $select48combined->from(['sub' => $select48])->order('id DESC');
         $sqlPrep48        = // same
-        $sqlStr48         = 'SELECT "sub".* FROM (( SELECT "foo".* FROM "foo" WHERE a = b ) UNION ( SELECT "bar".* FROM "bar" WHERE c = d )) AS "sub" ORDER BY "id" DESC';
+            $sqlStr48     = 'SELECT "sub".* FROM (( SELECT "foo".* FROM "foo" WHERE a = b ) UNION ( SELECT "bar".* FROM "bar" WHERE c = d )) AS "sub" ORDER BY "id" DESC';
         $internalTests48  = [
             'processCombine' => null,
         ];
@@ -1289,9 +1294,9 @@ public static function providerData(): array
         //Expression as joinName
         $select49 = new Select();
         $select49->from(new TableIdentifier('foo'))
-                ->join(['bar' => new Expression('psql_function_which_returns_table')], 'foo.id = bar.fooid');
+            ->join(['bar' => new Expression('psql_function_which_returns_table')], 'foo.id = bar.fooid');
         $sqlPrep49       = // same
-        $sqlStr49        = 'SELECT "foo".*, "bar".* FROM "foo" INNER JOIN psql_function_which_returns_table AS "bar" ON "foo"."id" = "bar"."fooid"';
+            $sqlStr49    = 'SELECT "foo".*, "bar".* FROM "foo" INNER JOIN psql_function_which_returns_table AS "bar" ON "foo"."id" = "bar"."fooid"';
         $internalTests49 = [
             'processSelect' => [[['"foo".*'], ['"bar".*']], '"foo"'],
             'processJoins'  => [[['INNER', 'psql_function_which_returns_table AS "bar"', '"foo"."id" = "bar"."fooid"']]],
@@ -1302,12 +1307,12 @@ public static function providerData(): array
         $select50->from(new TableIdentifier('foo'))
             ->where
             ->nest
-                ->isNull('bar')
-                ->and
-                ->predicate(new Predicate\Literal('1=1'))
+            ->isNull('bar')
+            ->and
+            ->predicate(new Predicate\Literal('1=1'))
             ->unnest;
         $sqlPrep50       = // same
-        $sqlStr50        = 'SELECT "foo".* FROM "foo" WHERE ("bar" IS NULL AND 1=1)';
+            $sqlStr50    = 'SELECT "foo".* FROM "foo" WHERE ("bar" IS NULL AND 1=1)';
         $internalTests50 = [];
 
         // Test generic predicate is appended with OR
@@ -1315,12 +1320,12 @@ public static function providerData(): array
         $select51->from(new TableIdentifier('foo'))
             ->where
             ->nest
-                ->isNull('bar')
-                ->or
-                ->predicate(new Predicate\Literal('1=1'))
+            ->isNull('bar')
+            ->or
+            ->predicate(new Predicate\Literal('1=1'))
             ->unnest;
         $sqlPrep51       = // same
-        $sqlStr51        = 'SELECT "foo".* FROM "foo" WHERE ("bar" IS NULL OR 1=1)';
+            $sqlStr51    = 'SELECT "foo".* FROM "foo" WHERE ("bar" IS NULL OR 1=1)';
         $internalTests51 = [];
 
         /**
@@ -1329,7 +1334,7 @@ public static function providerData(): array
         $select52 = new Select();
         $select52->from('foo')->join('zac', '(catalog_category_website.category_id = catalog_category.category_id)');
         $sqlPrep52       = // same
-        $sqlStr52        = 'SELECT "foo".*, "zac".* FROM "foo" INNER JOIN "zac" ON ("catalog_category_website"."category_id" = "catalog_category"."category_id")';
+            $sqlStr52    = 'SELECT "foo".*, "zac".* FROM "foo" INNER JOIN "zac" ON ("catalog_category_website"."category_id" = "catalog_category"."category_id")';
         $internalTests52 = [
             'processSelect' => [[['"foo".*'], ['"zac".*']], '"foo"'],
             'processJoins'  => [
@@ -1357,7 +1362,7 @@ public static function providerData(): array
         $select54 = new Select();
         $select54->from('foo')->join('zac', 'm = n', ['bar', 'baz'], Select::JOIN_FULL_OUTER);
         $sqlPrep54       = // same
-        $sqlStr54        = 'SELECT "foo".*, "zac"."bar" AS "bar", "zac"."baz" AS "baz" FROM "foo" FULL OUTER JOIN "zac" ON "m" = "n"';
+            $sqlStr54    = 'SELECT "foo".*, "zac"."bar" AS "bar", "zac"."baz" AS "baz" FROM "foo" FULL OUTER JOIN "zac" ON "m" = "n"';
         $internalTests54 = [
             'processSelect' => [[['"foo".*'], ['"zac"."bar"', '"bar"'], ['"zac"."baz"', '"baz"']], '"foo"'],
             'processJoins'  => [[['FULL OUTER', '"zac"', '"m" = "n"']]],
diff --git a/test/unit/Sql/SqlFunctionalTest.php b/test/unit/Sql/SqlFunctionalTest.php
index 35dba7167..e5f419a4a 100644
--- a/test/unit/Sql/SqlFunctionalTest.php
+++ b/test/unit/Sql/SqlFunctionalTest.php
@@ -120,20 +120,20 @@ protected static function dataProviderCommonProcessMethods(): array
             // Github issue https://github.com/zendframework/zend-db/issues/98
             'Select::processJoinNoJoinedColumns()' => [
                 'sqlObject' => self::select('my_table')
-                                    ->join(
-                                        'joined_table2',
-                                        'my_table.id = joined_table2.id',
-                                        []
-                                    )
-                                    ->join(
-                                        'joined_table3',
-                                        'my_table.id = joined_table3.id',
-                                        [Select::SQL_STAR]
-                                    )
-                                    ->columns([
-                                        'my_table_column',
-                                        'aliased_column' => new Expression('NOW()'),
-                                    ]),
+                    ->join(
+                        'joined_table2',
+                        'my_table.id = joined_table2.id',
+                        []
+                    )
+                    ->join(
+                        'joined_table3',
+                        'my_table.id = joined_table3.id',
+                        [Select::SQL_STAR]
+                    )
+                    ->columns([
+                        'my_table_column',
+                        'aliased_column' => new Expression('NOW()'),
+                    ]),
                 'expected'  => [
                     'sql92'     => [
                         'string' => 'SELECT "my_table"."my_table_column" AS "my_table_column", NOW() AS "aliased_column", "joined_table3".* FROM "my_table" INNER JOIN "joined_table2" ON "my_table"."id" = "joined_table2"."id" INNER JOIN "joined_table3" ON "my_table"."id" = "joined_table3"."id"',
@@ -151,7 +151,7 @@ protected static function dataProviderCommonProcessMethods(): array
             ],
             'Select::processJoin()'                => [
                 'sqlObject' => self::select('a')
-                                    ->join(['b' => self::select('c')->where(['cc' => 10])], 'd=e')->where(['x' => 20]),
+                    ->join(['b' => self::select('c')->where(['cc' => 10])], 'd=e')->where(['x' => 20]),
                 'expected'  => [
                     'sql92'     => [
                         'string'     => 'SELECT "a".*, "b".* FROM "a" INNER JOIN (SELECT "c".* FROM "c" WHERE "cc" = \'10\') AS "b" ON "d"="e" WHERE "x" = \'20\'',
@@ -177,12 +177,12 @@ protected static function dataProviderCommonProcessMethods(): array
             ],
             'Ddl::CreateTable::processColumns()'   => [
                 'sqlObject' => self::createTable('foo')
-                                    ->addColumn(self::createColumn('col1')
-                                        ->setOption('identity', true)
-                                        ->setOption('comment', 'Comment1'))
-                                    ->addColumn(self::createColumn('col2')
-                                        ->setOption('identity', true)
-                                        ->setOption('comment', 'Comment2')),
+                    ->addColumn(self::createColumn('col1')
+                        ->setOption('identity', true)
+                        ->setOption('comment', 'Comment1'))
+                    ->addColumn(self::createColumn('col2')
+                        ->setOption('identity', true)
+                        ->setOption('comment', 'Comment2')),
                 'expected'  => [
                     'sql92'     => "CREATE TABLE \"foo\" ( \n    \"col1\" INTEGER NOT NULL,\n    \"col2\" INTEGER NOT NULL \n)",
                     'MySql'     => "CREATE TABLE `foo` ( \n    `col1` INTEGER NOT NULL AUTO_INCREMENT COMMENT 'Comment1',\n    `col2` INTEGER NOT NULL AUTO_INCREMENT COMMENT 'Comment2' \n)",
@@ -204,7 +204,7 @@ protected static function dataProviderCommonProcessMethods(): array
                     'a' => self::select([
                         'b' => self::select('c')->where(['cc' => 'CC']),
                     ])
-                            ->where(['bb' => 'BB']),
+                        ->where(['bb' => 'BB']),
                 ])
                     ->where(['aa' => 'AA']),
                 'expected'  => [
@@ -535,11 +535,6 @@ public static function dataProvider(): array
         return $res;
     }
 
-    /**
-     * @param PreparableSqlInterface|SqlInterface $sqlObject
-     * @param string                              $platform
-     * @param array|string                        $expected
-     */
     #[DataProvider('dataProvider')]
     public function test(PreparableSqlInterface|SqlInterface $sqlObject, string $platform, string|array $expected): void
     {
@@ -610,8 +605,12 @@ protected function resolveAdapter(string $platform): Adapter\Adapter
         };
 
         $mockDriver = $this->getMockBuilder(DriverInterface::class)->getMock();
-        $mockDriver->expects($this->any())->method('formatParameterName')->willReturn('?');
-        $mockDriver->expects($this->any())->method('createStatement')->willReturnCallback(fn() => new Adapter\StatementContainer());
+        $mockDriver->expects($this->any())
+            ->method('formatParameterName')
+            ->willReturn('?');
+        $mockDriver->expects($this->any())
+            ->method('createStatement')
+            ->willReturnCallback(fn() => new Adapter\StatementContainer());
 
         return new Adapter\Adapter($mockDriver, $platform);
     }
diff --git a/test/unit/Sql/SqlTest.php b/test/unit/Sql/SqlTest.php
index a79c00955..dfd19e713 100644
--- a/test/unit/Sql/SqlTest.php
+++ b/test/unit/Sql/SqlTest.php
@@ -163,14 +163,14 @@ public function testForDifferentAdapters(): void
             $this->sql->buildSqlString($select)
         );
 
+        /** @var MockObject&StatementInterface $stmt */
         $stmt = $this
             ->mockAdapter
             ->getDriver()
             ->createStatement();
 
-        /** @var MockObject&StatementInterface $stmt */
         $stmt->expects($this->any())->method('setSql')
-                ->with($this->equalTo('SELECT "foo".* FROM "foo" OFFSET ?'));
+            ->with($this->equalTo('SELECT "foo".* FROM "foo" OFFSET ?'));
         $this->sql->prepareStatementForSqlObject($select);
 
         // Sql92
@@ -178,13 +178,14 @@ public function testForDifferentAdapters(): void
             'SELECT "foo".* FROM "foo" OFFSET \'10\'',
             $this->sql->buildSqlString($select, $adapterSql92)
         );
+
+        /** @var MockObject&StatementInterface $stmt */
         $stmt = $adapterSql92
             ->getDriver()
             ->createStatement();
 
-        /** @var MockObject&StatementInterface $stmt */
         $stmt->expects($this->any())->method('setSql')
-                ->with($this->equalTo('SELECT "foo".* FROM "foo" OFFSET ?'));
+            ->with($this->equalTo('SELECT "foo".* FROM "foo" OFFSET ?'));
         $this->sql->prepareStatementForSqlObject($select, null, $adapterSql92);
 
         // MySql
@@ -192,13 +193,14 @@ public function testForDifferentAdapters(): void
             'SELECT `foo`.* FROM `foo` LIMIT 18446744073709551615 OFFSET 10',
             $this->sql->buildSqlString($select, $adapterMySql)
         );
+
+        /** @var MockObject&StatementInterface $stmt */
         $stmt = $adapterMySql
             ->getDriver()
             ->createStatement();
 
-        /** @var MockObject&StatementInterface $stmt */
         $stmt->expects($this->any())->method('setSql')
-                ->with($this->equalTo('SELECT `foo`.* FROM `foo` LIMIT 18446744073709551615 OFFSET ?'));
+            ->with($this->equalTo('SELECT `foo`.* FROM `foo` LIMIT 18446744073709551615 OFFSET ?'));
         $this->sql->prepareStatementForSqlObject($select, null, $adapterMySql);
 
         // Oracle
@@ -214,7 +216,7 @@ public function testForDifferentAdapters(): void
         // @codingStandardsIgnoreStart
         /** @var MockObject&StatementInterface $stmt */
         $stmt->expects($this->any())->method('setSql')
-                ->with($this->equalTo('SELECT * FROM (SELECT b.*, rownum b_rownum FROM ( SELECT "foo".* FROM "foo" ) b ) WHERE b_rownum > (:offset)'));
+            ->with($this->equalTo('SELECT * FROM (SELECT b.*, rownum b_rownum FROM ( SELECT "foo".* FROM "foo" ) b ) WHERE b_rownum > (:offset)'));
         // @codingStandardsIgnoreEnd
         $this->sql->prepareStatementForSqlObject($select, null, $adapterOracle);
 
@@ -224,15 +226,15 @@ public function testForDifferentAdapters(): void
             $this->sql->buildSqlString($select, $adapterSqlServer)
         );
 
+        /** @var MockObject&StatementInterface $stmt */
         $stmt = $adapterSqlServer
             ->getDriver()
             ->createStatement();
 
-        /** @var MockObject&StatementInterface $stmt */
         $stmt->expects($this->any())->method('setSql')
-                ->with($this->stringContains(
-                    'WHERE [LAMINAS_SQL_SERVER_LIMIT_OFFSET_EMULATION].[__LAMINAS_ROW_NUMBER] BETWEEN ?+1 AND ?+?'
-                ));
+            ->with($this->stringContains(
+                'WHERE [LAMINAS_SQL_SERVER_LIMIT_OFFSET_EMULATION].[__LAMINAS_ROW_NUMBER] BETWEEN ?+1 AND ?+?'
+            ));
         $this->sql->prepareStatementForSqlObject($select, null, $adapterSqlServer);
     }
 
diff --git a/test/unit/TableGateway/Feature/EventFeatureTest.php b/test/unit/TableGateway/Feature/EventFeatureTest.php
index e6952840f..3d3d6a944 100644
--- a/test/unit/TableGateway/Feature/EventFeatureTest.php
+++ b/test/unit/TableGateway/Feature/EventFeatureTest.php
@@ -273,7 +273,10 @@ protected function setUp(): void
         $this->eventManager = new EventManager();
         $this->event        = new EventFeature\TableGatewayEvent();
         $this->feature      = new EventFeature($this->eventManager, $this->event);
-        $this->tableGateway = $this->getMockBuilder(TableGateway::class)->disableOriginalConstructor()->onlyMethods([])->getMock();
+        $this->tableGateway = $this->getMockBuilder(TableGateway::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods([])
+            ->getMock();
         $this->feature->setTableGateway($this->tableGateway);
 
         // typically runs before everything else
diff --git a/test/unit/TableGateway/Feature/MasterSlaveFeatureTest.php b/test/unit/TableGateway/Feature/MasterSlaveFeatureTest.php
index d18f17964..fa6a168fd 100644
--- a/test/unit/TableGateway/Feature/MasterSlaveFeatureTest.php
+++ b/test/unit/TableGateway/Feature/MasterSlaveFeatureTest.php
@@ -47,7 +47,10 @@ protected function setUp(): void
      */
     public function testPostInitialize(): void
     {
-        $this->getMockBuilder(TableGateway::class)->setConstructorArgs(['foo', $this->mockMasterAdapter, $this->feature])->onlyMethods([])->getMock();
+        $this->getMockBuilder(TableGateway::class)
+            ->setConstructorArgs(['foo', $this->mockMasterAdapter, $this->feature])
+            ->onlyMethods([])
+            ->getMock();
         // postInitialize is run
         self::assertSame($this->mockSlaveAdapter, $this->feature->getSlaveSql()->getAdapter());
     }
@@ -64,12 +67,12 @@ public function testPreSelect(): void
             ->setConstructorArgs(['foo', $this->mockMasterAdapter, $this->feature])
             ->onlyMethods([])->getMock();
 
+        /** @var MockObject&StatementInterface $stmt */
         $stmt = $this
             ->mockSlaveAdapter
             ->getDriver()
             ->createStatement();
 
-        /** @var MockObject&StatementInterface $stmt */
         $stmt
             ->expects($this->once())
             ->method('execute')
@@ -82,17 +85,25 @@ public function testPreSelect(): void
      */
     public function testPostSelect(): void
     {
-        $table = $this->getMockBuilder(TableGateway::class)->setConstructorArgs(['foo', $this->mockMasterAdapter, $this->feature])->onlyMethods([])->getMock();
+        $table = $this->getMockBuilder(TableGateway::class)
+            ->setConstructorArgs(['foo', $this->mockMasterAdapter, $this->feature])
+            ->onlyMethods([])
+            ->getMock();
+
+        /** @var MockObject&StatementInterface $stmt */
         $stmt = $this
             ->mockSlaveAdapter
             ->getDriver()
             ->createStatement();
 
-        /** @var MockObject&StatementInterface $stmt */
         $stmt
             ->expects($this->once())
             ->method('execute')
-            ->willReturn($this->getMockBuilder(ResultSet::class)->onlyMethods([])->getMock());
+            ->willReturn(
+                $this->getMockBuilder(ResultSet::class)
+                    ->onlyMethods([])
+                    ->getMock()
+            );
 
         $masterSql = $table->getSql();
         $table->select('foo = bar');
diff --git a/test/unit/TableGateway/TableGatewayTest.php b/test/unit/TableGateway/TableGatewayTest.php
index 95c780362..9b7c9ab91 100644
--- a/test/unit/TableGateway/TableGatewayTest.php
+++ b/test/unit/TableGateway/TableGatewayTest.php
@@ -155,8 +155,10 @@ public static function aliasedTables(): array
      */
     #[DataProvider('aliasedTables')]
     #[Group('7311')]
-    public function testInsertShouldResetTableToUnaliasedTable(array $tableValue, string|TableIdentifier $expected): void
-    {
+    public function testInsertShouldResetTableToUnaliasedTable(
+        array $tableValue,
+        string|TableIdentifier $expected
+    ): void {
         $insert = new Insert();
         $insert->into($tableValue);
 
@@ -218,8 +220,10 @@ public function testInsertShouldResetTableToUnaliasedTable(array $tableValue, st
      * @param AliasedTable           $tableValue
      */
     #[DataProvider('aliasedTables')]
-    public function testUpdateShouldResetTableToUnaliasedTable(array $tableValue, string|TableIdentifier $expected): void
-    {
+    public function testUpdateShouldResetTableToUnaliasedTable(
+        array $tableValue,
+        string|TableIdentifier $expected
+    ): void {
         $update = new Update();
         $update->table($tableValue);
 
@@ -283,8 +287,10 @@ public function testUpdateShouldResetTableToUnaliasedTable(array $tableValue, st
      * @param AliasedTable           $tableValue
      */
     #[DataProvider('aliasedTables')]
-    public function testDeleteShouldResetTableToUnaliasedTable(array $tableValue, string|TableIdentifier $expected): void
-    {
+    public function testDeleteShouldResetTableToUnaliasedTable(
+        array $tableValue,
+        string|TableIdentifier $expected
+    ): void {
         $delete = new Delete();
         $delete->from($tableValue);