Fixed CS and make the build green (#73)

* Fixed CS

* Use anyitsolutions

* Fixed CS

* Syntax fixes

* psalm fixes

Author: Nyholm

.github/workflows/static.yml

@@ -9,10 +9,19 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Set up PHP
+        uses: shivammathur/[email protected]
+        with:
+          php-version: 7.4
+
+      - name: Download dependencies
+        run: composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable
+
       - name: PHPStan
         uses: docker://oskarstark/phpstan-ga
         env:
-          REQUIRE_DEV: true
+          REQUIRE_DEV: false
+          CHECK_PLATFORM_REQUIREMENTS: false
         with:
           args: analyze --no-progress
 
@@ -35,3 +44,5 @@ jobs:
 
       - name: Psalm
         uses: docker://vimeo/psalm-github-actions
+        env:
+          CHECK_PLATFORM_REQUIREMENTS: false

.gitignore

@@ -4,3 +4,5 @@
 /phpspec.yml
 /phpunit.xml
 /vendor/
+.php_cs.cache
+.phpunit.result.cache

.php_cs

@@ -1,13 +1,13 @@
 <?php
 
-/*
- * In order to make it work, fabpot/php-cs-fixer and sllh/php-cs-fixer-styleci-bridge must be installed globally
- * with composer.
- *
- * @link https://github.com/Soullivaneuh/php-cs-fixer-styleci-bridge
- * @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
- */
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__.'/')
+    ->exclude(__DIR__.'/vendor')
+;
 
-use SLLH\StyleCIBridge\ConfigBridge;
-
-return ConfigBridge::create();
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+    ])
+    ->setFinder($finder)
+;

.styleci.yml

@@ -26,7 +26,7 @@ public function __construct(QueryLogger $logger)
     /**
      * {@inheritdoc}
      */
-    public function collect(Request $request, Response $response, \Exception $exception = null)
+    public function collect(Request $request, Response $response, \Throwable $exception = null)
     {
         $this->data['time'] = $this->queryLogger->getElapsedTime();
         $this->data['nb_queries'] = count($this->queryLogger);

.travis.yml

@@ -30,9 +30,6 @@ class QueryLogger implements \Countable
      */
     private $statementsHash = [];
 
-    /**
-     * @param StatementInterface $statement
-     */
     public function record(StatementInterface $statement)
     {
         $statementText = $statement->text();
@@ -63,9 +60,6 @@ public function record(StatementInterface $statement)
         $this->statementsHash[$statementText][$statementParams][$tag] = $idx;
     }
 
-    /**
-     * @param StatementResultInterface $statementResult
-     */
     public function finish(StatementResultInterface $statementResult)
     {
         $scheme = 'Http';
@@ -103,9 +97,6 @@ public function reset()
         $this->statementsHash = [];
     }
 
-    /**
-     * @param Neo4jExceptionInterface $exception
-     */
     public function logException(Neo4jExceptionInterface $exception)
     {
         $idx = $this->nbQueries - 1;

Collector/Neo4jDataCollector.php

@@ -6,6 +6,7 @@
 
 use GraphAware\Neo4j\Client\Formatter\Type\Node;
 use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -20,14 +21,12 @@ class Neo4jResultExtension extends AbstractExtension
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('neo4jResult', [$this, 'getType']),
+            new TwigFilter('neo4jResult', [$this, 'getType']),
         ];
     }
 
     /**
      * @param mixed $object
-     *
-     * @return string
      */
     public function getType($object): string
     {
@@ -41,9 +40,6 @@ public function getName(): string
 
     /**
      * @param mixed $object
-     * @param bool  $recursive
-     *
-     * @return string
      */
     private function doGetType($object, bool $recursive): string
     {

Collector/QueryLogger.php

@@ -7,8 +7,8 @@
 use GraphAware\Bolt\Driver as BoltDriver;
 use GraphAware\Neo4j\Client\ClientInterface;
 use GraphAware\Neo4j\Client\Connection\Connection;
-use GraphAware\Neo4j\OGM\EntityManager;
 use GraphAware\Neo4j\Client\HttpDriver\Driver as HttpDriver;
+use GraphAware\Neo4j\OGM\EntityManager;
 use GraphAware\Neo4j\OGM\EntityManagerInterface;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
@@ -75,9 +75,6 @@ public function getAlias(): string
     }
 
     /**
-     * @param array            $config
-     * @param ContainerBuilder $container
-     *
      * @return array with service ids
      */
     private function handleClients(array &$config, ContainerBuilder $container): array
@@ -93,11 +90,7 @@ private function handleClients(array &$config, ContainerBuilder $container): arr
             $serviceIds[$name] = $serviceId = sprintf('neo4j.client.%s', $name);
             foreach ($data['connections'] as $connectionName) {
                 if (empty($config['connections'][$connectionName])) {
-                    throw new InvalidConfigurationException(sprintf(
-                        'Client "%s" is configured to use connection named "%s" but there is no such connection',
-                        $name,
-                        $connectionName
-                    ));
+                    throw new InvalidConfigurationException(sprintf('Client "%s" is configured to use connection named "%s" but there is no such connection', $name, $connectionName));
                 }
                 $connections[] = $connectionName;
             }
@@ -117,25 +110,14 @@ private function handleClients(array &$config, ContainerBuilder $container): arr
         return $serviceIds;
     }
 
-    /**
-     * @param array            $config
-     * @param ContainerBuilder $container
-     * @param array            $clientServiceIds
-     *
-     * @return array
-     */
     private function handleEntityManagers(array &$config, ContainerBuilder $container, array $clientServiceIds): array
     {
         $serviceIds = [];
         foreach ($config['entity_managers'] as $name => $data) {
             $serviceIds[] = $serviceId = sprintf('neo4j.entity_manager.%s', $name);
             $clientName = $data['client'];
             if (empty($clientServiceIds[$clientName])) {
-                throw new InvalidConfigurationException(sprintf(
-                    'EntityManager "%s" is configured to use client named "%s" but there is no such client',
-                    $name,
-                    $clientName
-                ));
+                throw new InvalidConfigurationException(sprintf('EntityManager "%s" is configured to use client named "%s" but there is no such client', $name, $clientName));
             }
 
             $definition = class_exists(ChildDefinition::class)
@@ -154,9 +136,6 @@ private function handleEntityManagers(array &$config, ContainerBuilder $containe
     }
 
     /**
-     * @param array            $config
-     * @param ContainerBuilder $container
-     *
      * @return array with service ids
      */
     private function handleConnections(array &$config, ContainerBuilder $container): array
@@ -191,10 +170,6 @@ private function handleConnections(array &$config, ContainerBuilder $container):
 
     /**
      * Get URL form config.
-     *
-     * @param array $config
-     *
-     * @return string
      */
     private function getUrl(array $config): string
     {
@@ -215,8 +190,6 @@ private function getUrl(array $config): string
     /**
      * Return the correct default port if not manually set.
      *
-     * @param array $config
-     *
      * @return int
      */
     private function getPort(array $config)
@@ -246,9 +219,7 @@ private function validateEntityManagers(array &$config): bool
             // Add default entity manager if none set.
             $config['entity_managers']['default'] = ['client' => 'default'];
         } elseif (!$dependenciesInstalled && $entityManagersConfigured) {
-            throw new \LogicException(
-                'You need to install "graphaware/neo4j-php-ogm" to be able to use the EntityManager'
-            );
+            throw new \LogicException('You need to install "graphaware/neo4j-php-ogm" to be able to use the EntityManager');
         }
 
         return $dependenciesInstalled;

Collector/Twig/Neo4jResultExtension.php

@@ -18,9 +18,6 @@ class LoggerSubscriber implements EventSubscriberInterface
      */
     private $queryLogger;
 
-    /**
-     * @param QueryLogger $queryLogger
-     */
     public function __construct(QueryLogger $queryLogger)
     {
         $this->queryLogger = $queryLogger;
@@ -38,29 +35,20 @@ public static function getSubscribedEvents()
         ];
     }
 
-    /**
-     * @param PreRunEvent $event
-     */
     public function onPreRun(PreRunEvent $event)
     {
         foreach ($event->getStatements() as $statement) {
             $this->queryLogger->record($statement);
         }
     }
 
-    /**
-     * @param PostRunEvent $event
-     */
     public function onPostRun(PostRunEvent $event)
     {
         foreach ($event->getResults() as $result) {
             $this->queryLogger->finish($result);
         }
     }
 
-    /**
-     * @param FailureEvent $event
-     */
     public function onFailure(FailureEvent $event)
     {
         $this->queryLogger->logException($event->getException());