update support php8

.php_cs

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 Thomas Klein, All rights reserved.
+ * Copyright © Thomas Klein, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 $finder = PhpCsFixer\Finder::create()

.phpunit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
- * Copyright © 2018 Thomas Klein, All rights reserved.
+ * Copyright © Thomas Klein, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 -->

composer.json

@@ -25,16 +25,16 @@
     },
     "prefer-stable": true,
     "require": {
-        "php": "^7.1||^8.0"
+        "php": "^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0",
-        "phpmd/phpmd": "^2.6",
-        "sebastian/phpcpd": "^2.0",
-        "squizlabs/php_codesniffer": "^3.2",
-        "friendsofphp/php-cs-fixer": "^2.10",
-        "pdepend/pdepend": "^2.5",
-        "phpstan/phpstan": "@stable"
+        "phpunit/phpunit": "^9.5",
+        "phpmd/phpmd": "*",
+        "sebastian/phpcpd": "*",
+        "squizlabs/php_codesniffer": "*",
+        "friendsofphp/php-cs-fixer": "*",
+        "pdepend/pdepend": "*",
+        "phpstan/phpstan": "*"
     },
     "autoload": {
         "psr-4": {

examples/index.php

@@ -1,15 +1,21 @@
-<?php
+<?php declare(strict_types=1);
 /**
- * Copyright © 2018 Thomas Klein, All rights reserved.
+ * Copyright © Thomas Klein, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
-require_once __DIR__.'/../autoloader.php';
+require_once dirname(__DIR__) . '/vendor/autoload.php';
+
+use LogicTree\LogicTreeFacade;
+use LogicTree\Node\Combine;
+use LogicTree\Node\Condition;
+use LogicTree\Operator\OperatorInterface;
+use LogicTree\Operator\OperatorPool;
 
 /**
  * Class CustomOperator
  */
-class CustomOperator implements \LogicTree\Operator\OperatorInterface
+class CustomOperator implements OperatorInterface
 {
     public const CODE = 'custom_op';
 
@@ -22,25 +28,19 @@ public function execute(...$expressions): bool
     }
 }
 
-//$operatorPool = new \LogicTree\Operator\OperatorPool();
-//$operatorPool->addOperator(\LogicTree\Operator\OperatorPool::TYPE_COMPARATOR, 'custom_operator', new CustomOperator());
-
-//$conditionManager = new \LogicTree\Service\ConditionManager($operatorPool);
-//$logicTreeFacade = new \LogicTree\LogicTreeFacade($conditionManager);
-
 /**
  * USE CASES
  */
-$logicTreeFacade = new \LogicTree\LogicTreeFacade();
+$logicTreeFacade = new LogicTreeFacade();
 
 $dataSource = $logicTreeFacade->createDataSource(['value_1' => 'toto', 'value_2' => 5]);
 
-$expr1 = new \LogicTree\Node\Condition('value_1', 'eq', 'toto');
-$expr2 = new \LogicTree\Node\Condition('value_2', 'custom_op', 10);
-$logicTree = new \LogicTree\Node\Combine('and', false, [$expr1, $expr2]);
+$expr1 = new Condition('value_1', 'eq', 'toto');
+$expr2 = new Condition('value_2', 'custom_op', 10);
+$logicTree = new Combine('and', false, [$expr1, $expr2]);
 
 // Add new operator
-$logicTreeFacade->addOperator(\LogicTree\Operator\OperatorPool::TYPE_COMPARATOR, 'custom_op', new CustomOperator());
+$logicTreeFacade->addOperator(OperatorPool::TYPE_COMPARATOR, 'custom_op', new CustomOperator());
 
 // Execute combine conditions
 var_dump($logicTreeFacade->executeCombineConditions($logicTree, $dataSource));

src/DataSource.php

@@ -7,19 +7,16 @@
 
 namespace LogicTree;
 
+use ArrayAccess;
+use InvalidArgumentException;
+use function is_array;
+
 /**
  * @api
  */
 class DataSource
 {
-    /**
-     * Associative data array by key pair value
-     *
-     * @var array
-     */
-    private $data;
-
-    public function __construct(iterable $data = [])
+    public function __construct(private iterable $data = [])
     {
         $this->setData($data);
     }
@@ -31,6 +28,10 @@ public function getData(): array
 
     public function setData(iterable $data): DataSource
     {
+        if (!is_array($data) && !($data instanceof ArrayAccess)) {
+            throw new InvalidArgumentException('Data must be an array or implements ArrayAccess.');
+        }
+
         $this->data = [];
 
         foreach ($data as $key => $value) {

src/LogicTreeFacade.php

@@ -14,19 +14,13 @@
 
 class LogicTreeFacade
 {
-    /**
-     * @var ConditionManager
-     */
-    private $conditionManager;
+    private ConditionManager $conditionManager;
 
-    /**
-     * @var OperatorPool
-     */
-    private $operatorPool;
+    private OperatorPool $operatorPool;
 
-    public function __construct(?ConditionManager $conditionManager = null)
+    public function __construct(?ConditionManager $conditionManager = null, ?OperatorPool $operatorPool = null)
     {
-        $this->operatorPool = new OperatorPool();
+        $this->operatorPool = $operatorPool ?? new OperatorPool();
         $this->conditionManager = $conditionManager ?? new ConditionManager($this->operatorPool);
     }
 

src/Node/AbstractNode.php

@@ -1,18 +1,14 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Thomas Klein, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
-declare(strict_types=1);
 
 namespace LogicTree\Node;
 
 abstract class AbstractNode implements NodeInterface
 {
-    /**
-     * @var null|CombineInterface
-     */
-    private $parent;
+    private ?CombineInterface $parent = null;
 
     public function getParent(): ?CombineInterface
     {

src/Node/Combine.php

@@ -1,9 +1,8 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Thomas Klein, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
-declare(strict_types=1);
 
 namespace LogicTree\Node;
 
@@ -12,33 +11,23 @@
 
 final class Combine extends AbstractNode implements CombineInterface
 {
-    /**
-     * @var string
-     */
-    private $operator;
-
-    /**
-     * @var bool
-     */
-    private $isInvert;
-
     /**
      * @var NodeInterface[]
      */
-    private $nodes;
+    private array $nodes;
 
     /**
      * @param string $operator
      * @param bool $isInvert [optional] Is false by default.
      * @param NodeInterface[] $children [optional] Is empty by default.
      */
     public function __construct(
-        string $operator,
-        bool $isInvert = null,
-        array $children = []
+        private string $operator,
+        private bool $isInvert = false,
+        private array $children = []
     ) {
         $this->setOperator($operator);
-        $this->setIsInvert($isInvert ?? false);
+        $this->setIsInvert($isInvert);
         $this->setChildren($children);
     }
 

src/Node/CombineInterface.php

@@ -1,8 +1,7 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Thomas Klein, All right reserved.
  */
-declare(strict_types=1);
 
 namespace LogicTree\Node;
 

src/Node/Condition.php

@@ -1,9 +1,8 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Thomas Klein, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
-declare(strict_types=1);
 
 namespace LogicTree\Node;
 

src/Node/ConditionInterface.php

@@ -1,9 +1,8 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Thomas Klein, All right reserved.
  * See LICENSE bundled with this library for license details.
  */
-declare(strict_types=1);
 
 namespace LogicTree\Node;
 

src/Node/NodeInterface.php

@@ -1,8 +1,7 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Thomas Klein, All right reserved.
  */
-declare(strict_types=1);
 
 namespace LogicTree\Node;
 

src/Operator/Comparator/AbstractCompareOne.php

@@ -1,9 +1,8 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Thomas Klein, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
-declare(strict_types=1);
 
 namespace LogicTree\Operator\Comparator;
 
@@ -13,7 +12,7 @@
 
 abstract class AbstractCompareOne implements OperatorInterface
 {
-    public function execute(...$expressions): bool
+    public function execute(mixed ...$expressions): bool
     {
         $count = count($expressions);
 
@@ -30,5 +29,5 @@ public function execute(...$expressions): bool
      * @param mixed $expression
      * @return bool
      */
-    abstract public function executeComparison($expression): bool;
+    abstract public function executeComparison(mixed $expression): bool;
 }

src/Operator/Comparator/AbstractCompareTwo.php

@@ -1,9 +1,8 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Thomas Klein, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
-declare(strict_types=1);
 
 namespace LogicTree\Operator\Comparator;
 
@@ -13,7 +12,7 @@
 
 abstract class AbstractCompareTwo implements OperatorInterface
 {
-    public function execute(...$expressions): bool
+    public function execute(mixed ...$expressions): bool
     {
         $count = count($expressions);
 
@@ -31,5 +30,5 @@ public function execute(...$expressions): bool
      * @param mixed $expr2
      * @return bool
      */
-    abstract public function executeComparison($expr1, $expr2): bool;
+    abstract public function executeComparison(mixed $expr1, mixed $expr2): bool;
 }

src/Operator/Comparator/EmptyOperator.php

@@ -1,9 +1,8 @@
-<?php
+<?php declare(strict_types=1);
 /**
  * Copyright © Thomas Klein, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
-declare(strict_types=1);
 
 namespace LogicTree\Operator\Comparator;
 
@@ -15,7 +14,7 @@ final class EmptyOperator extends AbstractCompareOne
 {
     public const CODE = 'empty';
 
-    public function executeComparison($expression): bool
+    public function executeComparison(mixed $expression): bool
     {
         return empty($expression);
     }