fix merge

Author: mvorisek

src/Model/Scope.php

@@ -89,7 +89,7 @@ public function addCondition($field, $operator = null, $value = null)
         return $this;
     }
 
-    protected function setSystem($system = true)
+    protected function setSystem(bool $system = true)
     {
         foreach ($this->elements as $nestedCondition) {
             $nestedCondition->setSystem($system && $this->isAnd());

src/Model/Scope/AbstractScope.php

@@ -34,14 +34,17 @@ protected function init(): void
         $this->_init();
 
         // always set system flag if condition added to another condition
-        $this->setSystem($this->owner instanceof RootScope);
+        $this->setSystem($owner instanceof RootScope);
 
         $this->onChangeModel();
     }
 
     abstract protected function onChangeModel(): void;
 
-    abstract protected function setSystem($system = true);
+    /**
+     * @return $this
+     */
+    abstract protected function setSystem(bool $system = true);
 
     /**
      * Get the model this condition is associated with.

src/Model/Scope/Condition.php

@@ -151,7 +151,7 @@ public function __construct($key, $operator = null, $value = null)
         }
     }
 
-    protected function setSystem($system = true)
+    protected function setSystem(bool $system = true)
     {
         $this->system = $system;