Merge pull request #75 from transistive/new-client

Integration with new php client

Author: transistive

.env.example

@@ -0,0 +1 @@
+NEO4J_CONNECTIONS=bolt://neo4j:test@neo4j,http://neo4j:test@neo4j,bolt://neo4j:test@core1

.github/workflows/ci.yml

@@ -8,16 +8,15 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        php: [ '7.2', '7.3', '7.4']
-        sf_version: [ '4.4.*', '5.1.*' ]
+        php: [ '7.4', '8.0']
+        sf_version: [ '5.1.*', '5.0.*', '5.2.*', '5.3.*' ]
 
     steps:
       - name: Set up PHP
         uses: shivammathur/[email protected]
         with:
           php-version: ${{ matrix.php }}
           coverage: none
-          tools: flex
 
       - name: Checkout code
         uses: actions/checkout@v2
@@ -29,26 +28,4 @@ jobs:
           composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable
 
       - name: Run tests
-        run: ./vendor/bin/simple-phpunit
-
-  lowest:
-    name: Lowest deps
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up PHP
-        uses: shivammathur/[email protected]
-        with:
-          php-version: 7.3
-          coverage: none
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Download dependencies
-        run: |
-          composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable --prefer-lowest
-
-      - name: Run tests
-        env:
-          SYMFONY_DEPRECATIONS_HELPER: "max[self]=0"
-        run: ./vendor/bin/simple-phpunit
+        run: ./vendor/bin/phpunit

.github/workflows/static.yml

@@ -17,14 +17,6 @@ jobs:
       - name: Download dependencies
         run: composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable
 
-      - name: PHPStan
-        uses: docker://oskarstark/phpstan-ga
-        env:
-          REQUIRE_DEV: false
-          CHECK_PLATFORM_REQUIREMENTS: false
-        with:
-          args: analyze --no-progress
-
   php-cs-fixer:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest
@@ -33,7 +25,7 @@ jobs:
       - name: PHP-CS-Fixer
         uses: docker://oskarstark/php-cs-fixer-ga
         with:
-          args: --dry-run --diff-format udiff
+          args: --dry-run
 
   psalm:
     name: Psalm

.gitignore

@@ -6,3 +6,6 @@
 /vendor/
 .php_cs.cache
 .phpunit.result.cache
+.idea
+.env
+.php-cs-fixer.cache

.php-cs-fixer.php

@@ -0,0 +1,20 @@
+<?php
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+if (file_exists(__DIR__.'/vendor/autoload.php')) {
+    require __DIR__.'/vendor/autoload.php';
+}
+
+$finder = Finder::create()
+    ->in(__DIR__.'/')
+    ->exclude(__DIR__.'/vendor')
+;
+
+return (new Config())
+    ->setRules([
+        '@Symfony' => true,
+    ])
+    ->setFinder($finder)
+;

.php_cs

@@ -7,16 +7,14 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+use Throwable;
 
 /**
  * @author Xavier Coureau <[email protected]>
  */
 final class Neo4jDataCollector extends DataCollector
 {
-    /**
-     * @var QueryLogger
-     */
-    private $queryLogger;
+    private QueryLogger $queryLogger;
 
     public function __construct(QueryLogger $logger)
     {
@@ -26,70 +24,54 @@ public function __construct(QueryLogger $logger)
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, Throwable $exception = null): void
     {
         $this->data['time'] = $this->queryLogger->getElapsedTime();
         $this->data['nb_queries'] = count($this->queryLogger);
         $this->data['statements'] = $this->queryLogger->getStatements();
-        $this->data['failed_statements'] = array_filter($this->queryLogger->getStatements(), function ($statement) {
-            return !isset($statement['success']) || !$statement['success'];
+        $this->data['failed_statements'] = array_filter($this->queryLogger->getStatements(), static function ($statement) {
+            return empty($statement['success']);
         });
     }
 
-    public function reset()
+    public function reset(): void
     {
         $this->data = [];
         $this->queryLogger->reset();
     }
 
-    /**
-     * @return int
-     */
-    public function getQueryCount()
+    public function getQueryCount(): int
     {
         return $this->data['nb_queries'];
     }
 
     /**
      * Return all statements, successful and not successful.
-     *
-     * @return array
      */
-    public function getStatements()
+    public function getStatements(): array
     {
         return $this->data['statements'];
     }
 
     /**
      * Return not successful statements.
-     *
-     * @return array
      */
-    public function getFailedStatements()
+    public function getFailedStatements(): array
     {
         return $this->data['failed_statements'];
     }
 
-    /**
-     * @return float
-     */
-    public function getTime()
+    public function getTime(): float
     {
         return $this->data['time'];
     }
 
-    /**
-     * @return float
-     */
-    public function getTimeForQuery()
+    public function getTimeForQuery(): float
     {
         return $this->data['time'];
     }
 
-    /**
-     * @return string
-     */
-    public function getName()
+    public function getName(): string
     {
         return 'neo4j';
     }