Skip to content

Commit 62f7cc3

Browse files
committed
fixed static analysis
1 parent e6f417a commit 62f7cc3

10 files changed

+18
-24
lines changed

src/Bolt/BoltConnectionPool.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313

1414
namespace Laudis\Neo4j\Bolt;
1515

16+
use Bolt\protocol\V3;
1617
use Exception;
18+
use function explode;
1719
use Laudis\Neo4j\BoltFactory;
1820
use Laudis\Neo4j\Common\ConnectionConfiguration;
1921
use Laudis\Neo4j\Contracts\AuthenticateInterface;
@@ -24,9 +26,7 @@
2426
use Laudis\Neo4j\Enum\ConnectionProtocol;
2527
use Laudis\Neo4j\Neo4j\RoutingTable;
2628
use Psr\Http\Message\UriInterface;
27-
use Bolt\protocol\V3;
2829
use Throwable;
29-
use function explode;
3030

3131
/**
3232
* Manages singular Bolt connections.

src/Bolt/BoltResult.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313

1414
namespace Laudis\Neo4j\Bolt;
1515

16+
use function array_splice;
1617
use BadMethodCallException;
18+
use function call_user_func;
19+
use function count;
1720
use Generator;
1821
use Iterator;
1922
use Laudis\Neo4j\Enum\ConnectionProtocol;
20-
use function array_splice;
21-
use function call_user_func;
22-
use function count;
2323

2424
/**
2525
* @psalm-import-type BoltCypherStats from \Laudis\Neo4j\Contracts\FormatterInterface

src/Bolt/BoltUnmanagedTransaction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
use Laudis\Neo4j\ParameterHelper;
2626
use Laudis\Neo4j\Types\AbstractCypherSequence;
2727
use Laudis\Neo4j\Types\CypherList;
28-
use Throwable;
2928
use function microtime;
29+
use Throwable;
3030

3131
/**
3232
* Manages a transaction over the bolt protocol.

src/Contracts/FormatterInterface.php

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

1616
use Bolt\Bolt;
17-
use Bolt\protocol\V3;
1817
use JsonException;
1918
use Laudis\Neo4j\Bolt\BoltConnection;
2019
use Laudis\Neo4j\Bolt\BoltResult;
@@ -74,7 +73,7 @@ interface FormatterInterface
7473
/**
7574
* Formats the results of the bolt protocol to the unified format.
7675
*
77-
* @param BoltMeta $meta
76+
* @param BoltMeta $meta
7877
*
7978
* @return ResultFormat
8079
*/

src/Formatter/SummarizedResultFormatter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313

1414
namespace Laudis\Neo4j\Formatter;
1515

16-
use Laudis\Neo4j\Bolt\BoltConnection;
17-
use Laudis\Neo4j\Databags\DatabaseInfo;
1816
use function in_array;
1917
use function is_int;
18+
use Laudis\Neo4j\Bolt\BoltConnection;
2019
use Laudis\Neo4j\Bolt\BoltResult;
2120
use Laudis\Neo4j\Contracts\ConnectionInterface;
2221
use Laudis\Neo4j\Contracts\FormatterInterface;
22+
use Laudis\Neo4j\Databags\DatabaseInfo;
2323
use Laudis\Neo4j\Databags\ResultSummary;
2424
use Laudis\Neo4j\Databags\ServerInfo;
2525
use Laudis\Neo4j\Databags\Statement;

src/Http/HttpConnectionPool.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313

1414
namespace Laudis\Neo4j\Http;
1515

16-
use Laudis\Neo4j\Common\ConnectionConfiguration;
17-
use Laudis\Neo4j\Databags\DriverConfiguration;
1816
use function json_encode;
17+
use Laudis\Neo4j\Common\ConnectionConfiguration;
1918
use Laudis\Neo4j\Common\Resolvable;
2019
use Laudis\Neo4j\Contracts\AuthenticateInterface;
21-
use Laudis\Neo4j\Contracts\ConnectionInterface;
2220
use Laudis\Neo4j\Contracts\ConnectionPoolInterface;
2321
use Laudis\Neo4j\Databags\DatabaseInfo;
22+
use Laudis\Neo4j\Databags\DriverConfiguration;
2423
use Laudis\Neo4j\Databags\SessionConfiguration;
2524
use Laudis\Neo4j\Enum\ConnectionProtocol;
2625
use Laudis\Neo4j\Formatter\BasicFormatter;

src/Http/HttpDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function createSession(?SessionConfiguration $config = null): SessionInte
118118
$this->formatter,
119119
$factory,
120120
Resolvable::once($this->key.':tsxUrl', function () use ($config, $factory) {
121-
$database = $config->getDatabase();
121+
$database = $config->getDatabase() ?? '';
122122
$request = $factory->resolve()->createRequest('GET', $this->uri);
123123
$client = $this->config->getHttpPsrBindings()->getClient();
124124

src/Http/HttpSession.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Laudis\Neo4j\Common\Resolvable;
1818
use Laudis\Neo4j\Common\TransactionHelper;
1919
use Laudis\Neo4j\Contracts\AuthenticateInterface;
20-
use Laudis\Neo4j\Contracts\ConnectionInterface;
2120
use Laudis\Neo4j\Contracts\FormatterInterface;
2221
use Laudis\Neo4j\Contracts\SessionInterface;
2322
use Laudis\Neo4j\Contracts\UnmanagedTransactionInterface;
@@ -29,7 +28,6 @@
2928
use function microtime;
3029
use function parse_url;
3130
use const PHP_URL_PATH;
32-
use Psr\Http\Client\ClientInterface;
3331
use Psr\Http\Message\RequestInterface;
3432
use Psr\Http\Message\StreamFactoryInterface;
3533
use stdClass;
@@ -193,11 +191,9 @@ public function beginTransaction(?iterable $statements = null, ?TransactionConfi
193191
}
194192

195193
/**
196-
* @param ConnectionInterface<ClientInterface> $connection
197-
*
198194
* @return HttpUnmanagedTransaction<T>
199195
*/
200-
private function makeTransaction(ConnectionInterface $connection, RequestInterface $request): HttpUnmanagedTransaction
196+
private function makeTransaction(HttpConnection $connection, RequestInterface $request): HttpUnmanagedTransaction
201197
{
202198
return new HttpUnmanagedTransaction(
203199
$request,

src/Neo4j/Neo4jConnectionPool.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@
1313

1414
namespace Laudis\Neo4j\Neo4j;
1515

16+
use function array_slice;
17+
use function array_unique;
1618
use Bolt\protocol\V3;
1719
use Bolt\protocol\V4;
1820
use Bolt\protocol\V4_3;
1921
use Bolt\protocol\V4_4;
22+
use function count;
2023
use Exception;
2124
use Laudis\Neo4j\Bolt\BoltConnection;
2225
use Laudis\Neo4j\Bolt\BoltConnectionPool;
@@ -28,9 +31,6 @@
2831
use Laudis\Neo4j\Enum\AccessMode;
2932
use Laudis\Neo4j\Enum\RoutingRoles;
3033
use Psr\Http\Message\UriInterface;
31-
use function array_slice;
32-
use function array_unique;
33-
use function count;
3434
use function random_int;
3535
use function str_starts_with;
3636
use function time;

tests/Integration/BoltResultIntegrationTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
use Bolt\Bolt;
1515
use Bolt\connection\StreamSocket;
1616
use Dotenv\Dotenv;
17+
use function explode;
18+
use function is_string;
1719
use Laudis\Neo4j\Authentication\Authenticate;
1820
use Laudis\Neo4j\Bolt\BoltConnection;
1921
use Laudis\Neo4j\Bolt\BoltResult;
@@ -24,8 +26,6 @@
2426
use Laudis\Neo4j\Enum\AccessMode;
2527
use Laudis\Neo4j\Enum\ConnectionProtocol;
2628
use PHPUnit\Framework\TestCase;
27-
use function explode;
28-
use function is_string;
2929

3030
final class BoltResultIntegrationTest extends TestCase
3131
{

0 commit comments

Comments
 (0)