Merge pull request #5 from Syndesi/main

Syndesi · web-flow · commit 2e69ac55a753 · 2023-12-03T11:40:04.000+01:00
General maintenance.
diff --git a/.github/workflows/ci-code-style.yml b/.github/workflows/ci-code-style.yml
@@ -18,9 +18,9 @@ jobs:
                   key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.1'
+                  php-version: '8.3'
                   tools: composer:v2
-            - run: composer install --dev
+            - run: composer install --dev --ignore-platform-req=php
               shell: bash
             - run: composer cs:list
               shell: bash
diff --git a/.github/workflows/ci-leak-test.yml b/.github/workflows/ci-leak-test.yml
@@ -12,7 +12,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['8.1']
+                php-version: ['8.1', '8.2', '8.3']
         steps:
             - uses: actions/checkout@v2
             - name: Cache Composer dependencies
@@ -24,7 +24,7 @@ jobs:
               with:
                   php-version: ${{ matrix.php-version }}
                   tools: composer:v2
-            - run: composer install
+            - run: composer install --ignore-platform-req=php
               shell: bash
             - run: composer test:leak
               shell: bash
diff --git a/.github/workflows/ci-mutant-test.yml b/.github/workflows/ci-mutant-test.yml
@@ -8,7 +8,7 @@ on:
 jobs:
     tests:
         runs-on: ubuntu-latest
-        name: "Running mutant tests for PHP 8.1"
+        name: "Running mutant tests"
         steps:
             - uses: actions/checkout@v2
             - name: Cache Composer dependencies
@@ -18,9 +18,9 @@ jobs:
                   key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.1'
+                  php-version: '8.3'
                   tools: composer:v2
-            - run: composer install
+            - run: composer install --ignore-platform-req=php
               shell: bash
             - run: composer test:mutant
               shell: bash
diff --git a/.github/workflows/ci-phpstan.yml b/.github/workflows/ci-phpstan.yml
@@ -18,9 +18,9 @@ jobs:
                   key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.1'
+                  php-version: '8.3'
                   tools: composer:v2
-            - run: composer install
+            - run: composer install --ignore-platform-req=php
               shell: bash
             - run: composer phpstan
               shell: bash
diff --git a/.github/workflows/ci-psalm.yml b/.github/workflows/ci-psalm.yml
@@ -18,9 +18,9 @@ jobs:
                   key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.1'
+                  php-version: '8.3'
                   tools: composer:v2
-            - run: composer install
+            - run: composer install --ignore-platform-req=php
               shell: bash
             - run: composer psalm
               shell: bash
diff --git a/.github/workflows/ci-unit-test-coverage.yml b/.github/workflows/ci-unit-test-coverage.yml
@@ -20,10 +20,10 @@ jobs:
                   key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.1'
+                  php-version: '8.3'
                   extensions: xdebug
                   tools: composer:v2
-            - run: composer install
+            - run: composer install --ignore-platform-req=php
               shell: bash
             - run: composer test:coverage:xml
               shell: bash
diff --git a/.github/workflows/ci-unit-test.yml b/.github/workflows/ci-unit-test.yml
@@ -13,8 +13,8 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php-version: ['8.1', '8.2-rc']
-                neo4j-version: ['4.4', '5.1.0', '5.2.0']
+                php-version: ['8.1', '8.2', '8.3']
+                neo4j-version: ['4.4', '5.1.0', '5.13.0']
         env:
             ENABLE_FEATURE_TEST: true
             NEO4J_VERSION: ${{ matrix.neo4j-version }}
@@ -38,7 +38,7 @@ jobs:
               with:
                   php-version: ${{ matrix.php-version }}
                   tools: composer:v2
-            - run: composer install --ignore-platform-reqs
+            - run: composer install --ignore-platform-req=php
               shell: bash
             - run: composer test
               shell: bash
diff --git a/composer.json b/composer.json
@@ -7,9 +7,7 @@
     "authors": [
         {
             "name": "Syndesi (Sören Klein)",
-            "email": "soerenklein98@gmail.com",
-            "homepage": "https://syndesi.dev",
-            "role": "Developer"
+            "email": "soerenklein98@gmail.com"
         }
     ],
     "keywords": [
@@ -19,8 +17,8 @@
     ],
     "require": {
         "php": "^8.1",
-        "syndesi/cypher-data-structures": "^0.2.0",
-        "laudis/neo4j-php-client": "^2.8",
+        "syndesi/cypher-data-structures": "^0.3.0",
+        "laudis/neo4j-php-client": "^3.0",
         "psr/log": "^3.0",
         "psr/event-dispatcher": "^1.0"
     },
@@ -36,11 +34,11 @@
         }
     },
     "require-dev": {
-        "vimeo/psalm": "^4.23",
+        "vimeo/psalm": "^5.16",
         "boesing/psalm-plugin-stringf": "^1.1",
         "phpstan/phpstan": "^1.6",
         "phpunit/php-code-coverage": "^9.2",
-        "infection/infection": "^0.26.10",
+        "infection/infection": "^0.27.8",
         "friendsofphp/php-cs-fixer": "^3.8",
         "phpunit/phpunit": "^9.5",
         "roave/no-leaks": "^1.3",
@@ -69,7 +67,8 @@
     },
     "config": {
         "allow-plugins": {
-            "infection/extension-installer": true
+            "infection/extension-installer": true,
+            "php-http/discovery": true
         }
     }
 }
diff --git a/psalm.xml b/psalm.xml
@@ -5,6 +5,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedBaselineEntry="false"
+    findUnusedCode="false"
 >
     <projectFiles>
         <directory name="src"/>
diff --git a/src/Contract/ActionCypherElementQueueInterface.php b/src/Contract/ActionCypherElementQueueInterface.php
@@ -4,6 +4,11 @@
 
 namespace Syndesi\CypherEntityManager\Contract;
 
+use Iterator;
+
+/**
+ * @extends Iterator<int, ActionCypherElementInterface>
+ */
 interface ActionCypherElementQueueInterface extends \Iterator
 {
     public function enqueue(ActionCypherElementInterface $element): self;
diff --git a/src/Contract/SimilarNodeQueueInterface.php b/src/Contract/SimilarNodeQueueInterface.php
@@ -4,8 +4,12 @@
 
 namespace Syndesi\CypherEntityManager\Contract;
 
+use Iterator;
 use Syndesi\CypherDataStructures\Contract\NodeInterface;
 
+/**
+ * @extends Iterator<int, NodeInterface>
+ */
 interface SimilarNodeQueueInterface extends \Iterator
 {
     public function enqueue(NodeInterface $node): self;
diff --git a/src/Contract/SimilarRelationQueueInterface.php b/src/Contract/SimilarRelationQueueInterface.php
@@ -4,8 +4,12 @@
 
 namespace Syndesi\CypherEntityManager\Contract;
 
+use Iterator;
 use Syndesi\CypherDataStructures\Contract\RelationInterface;
 
+/**
+ * @extends Iterator<int, RelationInterface>
+ */
 interface SimilarRelationQueueInterface extends \Iterator
 {
     public function enqueue(RelationInterface $relation): self;
diff --git a/src/Helper/ActionCypherElementHelper.php b/src/Helper/ActionCypherElementHelper.php
@@ -10,17 +10,17 @@
 use Syndesi\CypherDataStructures\Contract\RelationConstraintInterface;
 use Syndesi\CypherDataStructures\Contract\RelationIndexInterface;
 use Syndesi\CypherDataStructures\Contract\RelationInterface;
+use Syndesi\CypherEntityManager\Contract\ActionCypherElementInterface;
 use Syndesi\CypherEntityManager\Contract\SimilarNodeQueueInterface;
 use Syndesi\CypherEntityManager\Contract\SimilarRelationQueueInterface;
-use Syndesi\CypherEntityManager\Type\ActionCypherElement;
 use Syndesi\CypherEntityManager\Type\ActionCypherElementType;
 
 class ActionCypherElementHelper
 {
     /**
      * @psalm-suppress InvalidReturnType
      */
-    public static function getTypeFromActionCypherElement(ActionCypherElement $actionCypherElement): ActionCypherElementType
+    public static function getTypeFromActionCypherElement(ActionCypherElementInterface $actionCypherElement): ActionCypherElementType
     {
         $element = $actionCypherElement->getElement();
         if ($element instanceof NodeInterface) {
@@ -47,5 +47,6 @@ public static function getTypeFromActionCypherElement(ActionCypherElement $actio
         if ($element instanceof SimilarRelationQueueInterface) {
             return ActionCypherElementType::SIMILAR_RELATION_QUEUE;
         }
+        throw new \LogicException("Provided element can not be mapped to ActionCypherElementType.");
     }
 }
diff --git a/src/Helper/LifecycleEventHelper.php b/src/Helper/LifecycleEventHelper.php
@@ -4,6 +4,7 @@
 
 namespace Syndesi\CypherEntityManager\Helper;
 
+use Syndesi\CypherEntityManager\Contract\ActionCypherElementInterface;
 use Syndesi\CypherEntityManager\Contract\Event\LifecycleEventInterface;
 use Syndesi\CypherEntityManager\Contract\SimilarNodeQueueInterface;
 use Syndesi\CypherEntityManager\Contract\SimilarRelationQueueInterface;
@@ -35,7 +36,6 @@
 use Syndesi\CypherEntityManager\Event\RelationPreCreateEvent;
 use Syndesi\CypherEntityManager\Event\RelationPreDeleteEvent;
 use Syndesi\CypherEntityManager\Event\RelationPreMergeEvent;
-use Syndesi\CypherEntityManager\Type\ActionCypherElement;
 use Syndesi\CypherEntityManager\Type\ActionCypherElementType;
 use Syndesi\CypherEntityManager\Type\ActionType;
 
@@ -44,7 +44,7 @@ class LifecycleEventHelper
     /**
      * @return LifecycleEventInterface[]
      */
-    public static function getLifecycleEventForCypherActionElement(ActionCypherElement $actionCypherElement, bool $isPre): array
+    public static function getLifecycleEventForCypherActionElement(ActionCypherElementInterface $actionCypherElement, bool $isPre): array
     {
         $eventClasses = [
             ActionCypherElementType::NODE->name => [
@@ -132,11 +132,13 @@ public static function getLifecycleEventForCypherActionElement(ActionCypherEleme
         $element = $actionCypherElement->getElement();
         if ($element instanceof SimilarNodeQueueInterface) {
             $events = [];
+
             // todo build events
             return $events;
         }
         if ($element instanceof SimilarRelationQueueInterface) {
             $events = [];
+
             // todo build events
             return $events;
         }
diff --git a/src/Type/EntityManager.php b/src/Type/EntityManager.php
@@ -30,7 +30,7 @@ class EntityManager implements EntityManagerInterface
     private ActionCypherElementQueueInterface $queue;
     private EventDispatcherInterface $dispatcher;
 
-    public function __construct(ClientInterface $client, EventDispatcherInterface $dispatcher, ?LoggerInterface $logger = null)
+    public function __construct(ClientInterface $client, EventDispatcherInterface $dispatcher, LoggerInterface $logger = null)
     {
         $this->client = $client;
         $this->dispatcher = $dispatcher;
diff --git a/tests/EventListener/OpenCypher/SimilarRelationQueueCreateToStatementEventListenerTest.php b/tests/EventListener/OpenCypher/SimilarRelationQueueCreateToStatementEventListenerTest.php
@@ -111,23 +111,23 @@ public function testOnActionCypherElementToStatementEventWithEmptyQueue(): void
         $this->assertSame('MATCH (n) LIMIT 0', $event->getStatement()->getText());
     }
 
-//    todo :)
-//    public function testOnActionCypherElementToStatementEventWithNoStartNode(): void
-//    {
-//        $node = $this->createNode(1000);
-//        $relation = $this->createRelation(2000, null, $node);
-//        $similarRelationQueue = (new SimilarRelationQueue())
-//            ->enqueue($relation);
-//
-//        $actionCypherElement = new ActionCypherElement(ActionType::CREATE, $similarRelationQueue);
-//        $event = new ActionCypherElementToStatementEvent($actionCypherElement);
-//
-//        $this->expectException(InvalidArgumentException::class);
-//        $this->expectExceptionMessage('---');
-//
-//        $eventListener = new SimilarRelationQueueCreateToStatementEventListener($this->prophet->prophesize(LoggerInterface::class)->reveal());
-//        $eventListener->onActionCypherElementToStatementEvent($event);
-//    }
+    //    todo :)
+    //    public function testOnActionCypherElementToStatementEventWithNoStartNode(): void
+    //    {
+    //        $node = $this->createNode(1000);
+    //        $relation = $this->createRelation(2000, null, $node);
+    //        $similarRelationQueue = (new SimilarRelationQueue())
+    //            ->enqueue($relation);
+    //
+    //        $actionCypherElement = new ActionCypherElement(ActionType::CREATE, $similarRelationQueue);
+    //        $event = new ActionCypherElementToStatementEvent($actionCypherElement);
+    //
+    //        $this->expectException(InvalidArgumentException::class);
+    //        $this->expectExceptionMessage('---');
+    //
+    //        $eventListener = new SimilarRelationQueueCreateToStatementEventListener($this->prophet->prophesize(LoggerInterface::class)->reveal());
+    //        $eventListener->onActionCypherElementToStatementEvent($event);
+    //    }
 
     public function testNodeStatement(): void
     {

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`
`6`	`6`	`xmlns="https://getpsalm.org/schema/config"`
`7`	`7`	`xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"`
	`8`	`+ findUnusedBaselineEntry="false"`
	`9`	`+ findUnusedCode="false"`
`8`	`10`	`>`
`9`	`11`	`<projectFiles>`
`10`	`12`	`<directory name="src"/>`