Skip to content

Commit 2e08cc7

Browse files
transistivetransistive
committed
fixed static analysis
1 parent 3b49180 commit 2e08cc7

7 files changed

Lines changed: 33 additions & 27 deletions

File tree

‎src/ParameterHelper.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ private static function cypherMapToStdClass($value): ?stdClass
134134
if ($value instanceof CypherMap) {
135135
$tbr = new stdClass();
136136
foreach ($value as $key => $val) {
137-
$key = (string) $key;
138137
$tbr->$key = $val;
139138
}
140139

‎testkit-backend/src/Backend.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
use DI\ContainerBuilder;
1717
use Exception;
18-
use Laudis\Neo4j\TestkitBackend\Responses\DriverErrorResponse;
1918
use function get_debug_type;
2019
use function json_decode;
2120
use function json_encode;

‎testkit-backend/src/Handlers/AbstractRunner.php‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
use Symfony\Component\Uid\Uuid;
3030

3131
/**
32-
* @psalm-import-type OGMResults from \Laudis\Neo4j\Formatter\OGMFormatter
32+
* @psalm-import-type OGMTypes from \Laudis\Neo4j\Formatter\OGMFormatter
3333
*
3434
* @template T of \Laudis\Neo4j\TestkitBackend\Requests\SessionRunRequest|\Laudis\Neo4j\TestkitBackend\Requests\TransactionRunRequest
3535
*
@@ -78,7 +78,7 @@ public function handle($request): ResultResponse
7878
}
7979
$this->repository->addRecords($id, $result);
8080

81-
return new ResultResponse($id, $result->getResult()->isEmpty() ? [] : $result->getResult()->first()->keys());
81+
return new ResultResponse($id, $result->isEmpty() ? [] : $result->first()->keys());
8282
}
8383

8484
/**
@@ -93,7 +93,12 @@ private function decodeToValue(array $param)
9393
if ($param['name'] === 'CypherMap') {
9494
/** @psalm-suppress MixedArgumentTypeCoercion */
9595
$map = [];
96+
/**
97+
* @var numeric $k
98+
* @var mixed $v
99+
*/
96100
foreach ($value as $k => $v) {
101+
/** @psalm-suppress MixedArgument */
97102
$map[(string) $k] = $this->decodeToValue($v);
98103
}
99104

@@ -102,7 +107,11 @@ private function decodeToValue(array $param)
102107

103108
if ($param['name'] === 'CypherList') {
104109
$list = [];
110+
/**
111+
* @var mixed $v
112+
*/
105113
foreach ($value as $v) {
114+
/** @psalm-suppress MixedArgument */
106115
$list[] = $this->decodeToValue($v);
107116
}
108117

@@ -116,7 +125,7 @@ private function decodeToValue(array $param)
116125
/**
117126
* @param T $request
118127
*
119-
* @return SessionInterface<SummarizedResult<OGMResults>>|TransactionInterface<SummarizedResult<OGMResults>>
128+
* @return SessionInterface<SummarizedResult<CypherMap<OGMTypes>>>|TransactionInterface<SummarizedResult<CypherMap<OGMTypes>>>
120129
*/
121130
abstract protected function getRunner($request);
122131

‎testkit-backend/src/Handlers/GetRoutingTable.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
namespace Laudis\Neo4j\TestkitBackend\Handlers;
1515

1616
use Exception;
17-
use Laudis\Neo4j\Contracts\ConnectionPoolInterface;
1817
use Laudis\Neo4j\Enum\RoutingRoles;
1918
use Laudis\Neo4j\Neo4j\Neo4jConnectionPool;
2019
use Laudis\Neo4j\Neo4j\Neo4jDriver;
@@ -42,6 +41,7 @@ public function __construct(MainRepository $repository)
4241

4342
/**
4443
* @param GetRoutingTableRequest $request
44+
*
4545
* @throws ReflectionException
4646
* @throws Exception
4747
*/
@@ -60,7 +60,6 @@ public function handle($request): TestkitResponseInterface
6060
/** @var RoutingTable $table */
6161
$table = $tableProperty->getValue($pool);
6262

63-
6463
return new RoutingTableResponse(
6564
$request->getDatabase(),
6665
$table->getTtl(),

‎testkit-backend/src/Handlers/NewDriver.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function handle($request): DriverResponse
5252
$config = $config->withUserAgent($ua);
5353
}
5454

55-
$formatter = new SummarizedResultFormatter(OGMFormatter::create());
55+
$formatter = SummarizedResultFormatter::create();
5656
$authenticate = Authenticate::basic($user, $pass);
5757
$driver = DriverFactory::create($request->getUri(), $config, $authenticate, $timeout, $formatter);
5858
$id = Uuid::v4();

‎testkit-backend/src/MainRepository.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,24 @@
2828
*/
2929
final class MainRepository
3030
{
31-
/** @var array<string, DriverInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>>> */
31+
/** @var array<string, DriverInterface<SummarizedResult<CypherMap<OGMTypes>>>> */
3232
private array $drivers;
33-
/** @var array<string, SessionInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>>> */
33+
/** @var array<string, SessionInterface<SummarizedResult<CypherMap<OGMTypes>>>> */
3434
private array $sessions;
35-
/** @var array<string, SummarizedResult<CypherList<CypherMap<OGMTypes>>>|TestkitResponseInterface> */
35+
/** @var array<string, SummarizedResult<CypherMap<OGMTypes>>|TestkitResponseInterface> */
3636
private array $records;
3737
/** @var array<string, Iterator<int, CypherMap<OGMTypes>>> */
3838
private array $recordIterators;
39-
/** @var array<string, UnmanagedTransactionInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>>> */
39+
/** @var array<string, UnmanagedTransactionInterface<SummarizedResult<CypherMap<OGMTypes>>>> */
4040
private array $transactions;
4141
/** @var array<string, Uuid> */
4242
private array $sessionToTransactions = [];
4343

4444
/**
45-
* @param array<string, DriverInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>>> $drivers
46-
* @param array<string, SessionInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>>> $sessions
47-
* @param array<string, SummarizedResult<CypherList<CypherMap<OGMTypes>>>|TestkitResponseInterface> $records
48-
* @param array<string, UnmanagedTransactionInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>>> $transactions
45+
* @param array<string, DriverInterface<SummarizedResult<CypherMap<OGMTypes>>>> $drivers
46+
* @param array<string, SessionInterface<SummarizedResult<CypherMap<OGMTypes>>>> $sessions
47+
* @param array<string, SummarizedResult<CypherMap<OGMTypes>>|TestkitResponseInterface> $records
48+
* @param array<string, UnmanagedTransactionInterface<SummarizedResult<CypherMap<OGMTypes>>>> $transactions
4949
*/
5050
public function __construct(array $drivers, array $sessions, array $records, array $transactions)
5151
{
@@ -57,7 +57,7 @@ public function __construct(array $drivers, array $sessions, array $records, arr
5757
}
5858

5959
/**
60-
* @param DriverInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>> $driver
60+
* @param DriverInterface<SummarizedResult<CypherMap<OGMTypes>>> $driver
6161
*/
6262
public function addDriver(Uuid $id, DriverInterface $driver): void
6363
{
@@ -78,15 +78,15 @@ public function getIterator(Uuid $id): Iterator
7878
}
7979

8080
/**
81-
* @return DriverInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>>
81+
* @return DriverInterface<SummarizedResult<CypherMap<OGMTypes>>>
8282
*/
8383
public function getDriver(Uuid $id): DriverInterface
8484
{
8585
return $this->drivers[$id->toRfc4122()];
8686
}
8787

8888
/**
89-
* @param SessionInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>> $session
89+
* @param SessionInterface<SummarizedResult<CypherMap<OGMTypes>>> $session
9090
*/
9191
public function addSession(Uuid $id, SessionInterface $session): void
9292
{
@@ -99,22 +99,22 @@ public function removeSession(Uuid $id): void
9999
}
100100

101101
/**
102-
* @return SessionInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>>
102+
* @return SessionInterface<SummarizedResult<CypherMap<OGMTypes>>>
103103
*/
104104
public function getSession(Uuid $id): SessionInterface
105105
{
106106
return $this->sessions[$id->toRfc4122()];
107107
}
108108

109109
/**
110-
* @param SummarizedResult<CypherList<CypherMap<OGMTypes>>>|TestkitResponseInterface $result
110+
* @param SummarizedResult<CypherMap<OGMTypes>>|TestkitResponseInterface $result
111111
*/
112112
public function addRecords(Uuid $id, $result): void
113113
{
114114
$this->records[$id->toRfc4122()] = $result;
115115
if ($result instanceof SummarizedResult) {
116-
/** @var SummarizedResult<CypherList<CypherMap<OGMTypes>>> $result */
117-
$this->recordIterators[$id->toRfc4122()] = $result->getResult()->getIterator();
116+
/** @var SummarizedResult<CypherMap<OGMTypes>> $result */
117+
$this->recordIterators[$id->toRfc4122()] = $result->getIterator();
118118
}
119119
}
120120

@@ -124,15 +124,15 @@ public function removeRecords(Uuid $id): void
124124
}
125125

126126
/**
127-
* @return SummarizedResult<CypherList<CypherMap<OGMTypes>>>|TestkitResponseInterface
127+
* @return SummarizedResult<CypherMap<OGMTypes>>|TestkitResponseInterface
128128
*/
129129
public function getRecords(Uuid $id)
130130
{
131131
return $this->records[$id->toRfc4122()];
132132
}
133133

134134
/**
135-
* @param UnmanagedTransactionInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>> $transaction
135+
* @param UnmanagedTransactionInterface<SummarizedResult<CypherMap<OGMTypes>>> $transaction
136136
*/
137137
public function addTransaction(Uuid $id, UnmanagedTransactionInterface $transaction): void
138138
{
@@ -145,7 +145,7 @@ public function removeTransaction(Uuid $id): void
145145
}
146146

147147
/**
148-
* @return UnmanagedTransactionInterface<SummarizedResult<CypherList<CypherMap<OGMTypes>>>>
148+
* @return UnmanagedTransactionInterface<SummarizedResult<CypherMap<OGMTypes>>>
149149
*/
150150
public function getTransaction(Uuid $id): UnmanagedTransactionInterface
151151
{

‎testkit-backend/testkit.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
export TEST_NEO4J_HOST=localhost
3+
export TEST_NEO4J_HOST=neo4j
44
export TEST_NEO4J_USER=neo4j
55
export TEST_NEO4J_PASS=test
66
export TEST_DRIVER_NAME=php

0 commit comments

Comments
 (0)