Skip to content

Commit 4018980

Browse files
committed
Completes AdapterFactoryTest
Resets Psalm baseline Signed-off-by: Joey Smith <jsmith@webinertia.net> Signed-off-by: Joey Smith <jsmith@webinertia.net>
1 parent 9963f1b commit 4018980

File tree

3 files changed

+24
-18
lines changed

3 files changed

+24
-18
lines changed

psalm-baseline.xml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
<ClassMustBeFinal>
3737
<code><![CDATA[Connection]]></code>
3838
</ClassMustBeFinal>
39-
<InvalidArgument>
40-
<code><![CDATA[$resultResource === true ? $this->resource : $resultResource]]></code>
41-
</InvalidArgument>
4239
<InvalidReturnStatement>
4340
<code><![CDATA[$r[0]]]></code>
4441
</InvalidReturnStatement>
@@ -84,6 +81,9 @@
8481
<NullableReturnStatement>
8582
<code><![CDATA[$r[0]]]></code>
8683
</NullableReturnStatement>
84+
<PossiblyInvalidArgument>
85+
<code><![CDATA[$resultResource === true ? $this->resource : $resultResource]]></code>
86+
</PossiblyInvalidArgument>
8787
<PossiblyInvalidMethodCall>
8888
<code><![CDATA[fetch_row]]></code>
8989
</PossiblyInvalidMethodCall>
@@ -130,11 +130,9 @@
130130
<code><![CDATA[Mysqli]]></code>
131131
</ClassMustBeFinal>
132132
<ImplementedParamTypeMismatch>
133+
<code><![CDATA[$resource]]></code>
133134
<code><![CDATA[$sqlOrResource]]></code>
134135
</ImplementedParamTypeMismatch>
135-
<InvalidArgument>
136-
<code><![CDATA[$resource]]></code>
137-
</InvalidArgument>
138136
<InvalidReturnStatement>
139137
<code><![CDATA[$this->getConnection()->getLastGeneratedValue()]]></code>
140138
</InvalidReturnStatement>
@@ -151,14 +149,13 @@
151149
<code><![CDATA[getProfiler]]></code>
152150
<code><![CDATA[getResultPrototype]]></code>
153151
<code><![CDATA[getStatementPrototype]]></code>
154-
<code><![CDATA[registerConnection]]></code>
155152
</PossiblyUnusedMethod>
156-
<PossiblyUnusedParam>
157-
<code><![CDATA[$connection]]></code>
158-
</PossiblyUnusedParam>
159153
<PossiblyUnusedReturnValue>
160154
<code><![CDATA[bool]]></code>
161155
</PossiblyUnusedReturnValue>
156+
<UndefinedDocblockClass>
157+
<code><![CDATA[\mysqli|mysqli_result|mysqli_stmt]]></code>
158+
</UndefinedDocblockClass>
162159
<UnusedVariable>
163160
<code><![CDATA[$options]]></code>
164161
</UnusedVariable>
@@ -238,9 +235,6 @@
238235
<ClassMustBeFinal>
239236
<code><![CDATA[Statement]]></code>
240237
</ClassMustBeFinal>
241-
<InvalidArgument>
242-
<code><![CDATA[$this->resource]]></code>
243-
</InvalidArgument>
244238
<MixedAssignment>
245239
<code><![CDATA[$args[]]]></code>
246240
<code><![CDATA[$value]]></code>

test/integration/Container/AdapterFactoryTest.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,23 @@
44

55
namespace LaminasIntegrationTest\Db\Adapter\Mysql\Container;
66

7+
use Laminas\Db\Adapter\AdapterInterface;
8+
use Laminas\Db\Adapter\Mysql\Container\AdapterFactory;
9+
use LaminasIntegrationTest\Db\Adapter\Mysql\Container\TestAsset\SetupTrait;
10+
use PHPUnit\Framework\Attributes\CoversClass;
11+
use PHPUnit\Framework\Attributes\CoversMethod;
712
use PHPUnit\Framework\TestCase;
813

14+
#[CoversClass(AdapterFactory::class)]
15+
#[CoversMethod(AdapterFactory::class, '__invoke')]
916
final class AdapterFactoryTest extends TestCase
1017
{
18+
use SetupTrait;
19+
1120
public function testFactoryReturnsAdapterInterface(): void
1221
{
13-
$this->markTestIncomplete(
14-
'This test is incomplete and needs to be implemented.'
15-
);
22+
$factory = new AdapterFactory();
23+
$adapter = $factory($this->container);
24+
self::assertInstanceOf(AdapterInterface::class, $adapter);
1625
}
1726
}

test/integration/Container/TestAsset/SetupTrait.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Laminas\Db\Container\ConfigProvider as LaminasDbConfigProvider;
1414
use Laminas\ServiceManager\ServiceManager;
1515
use Laminas\Stdlib\ArrayUtils;
16+
use Psr\Container\ContainerInterface;
1617

1718
use function getenv;
1819

@@ -32,6 +33,8 @@ trait SetupTrait
3233

3334
protected AdapterManager $adapterManager;
3435

36+
protected ContainerInterface $container;
37+
3538
protected DriverInterface|string|null $driver = null;
3639

3740
protected function setUp(): void
@@ -86,8 +89,8 @@ protected function getAdapter(array $config = []): AdapterInterface&Adapter
8689
);
8790

8891
$this->config = $serviceManagerConfig;
89-
$container = new ServiceManager($this->config);
90-
$this->adapterManager = $container->get(AdapterManager::class);
92+
$this->container = new ServiceManager($this->config);
93+
$this->adapterManager = $this->container->get(AdapterManager::class);
9194
$this->adapter = $this->adapterManager->get(AdapterInterface::class);
9295

9396
return $this->adapter;

0 commit comments

Comments
 (0)