removed small semantic mistakes

michbeck · Mar 12, 2021 · 2c52635 · 2c52635
1 parent bc66b6c
commit 2c52635
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 24 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/src/Propel/Runtime/ActiveQuery/BaseModelCriteria.php b/src/Propel/Runtime/ActiveQuery/BaseModelCriteria.php
@@ -65,8 +65,7 @@ class BaseModelCriteria extends Criteria implements IteratorAggregate
      */
     public function __construct($dbName = null, $modelName = null, $modelAlias = null)
     {
-        $this->setDbName($dbName);
-        $this->originalDbName = $dbName;
+        parent::__construct($dbName);
         $this->setModelName($modelName);
         $this->modelAlias = $modelAlias;
     }

diff --git a/src/Propel/Runtime/ActiveQuery/Criteria.php b/src/Propel/Runtime/ActiveQuery/Criteria.php
@@ -277,6 +277,18 @@ class Criteria
      */
     public $replacedColumns = [];
 
+    /**
+     * temporary property used in replaceNames
+     *
+     * @var string|null
+     */
+    protected $currentAlias;
+
+    /**
+     * @var bool
+     */
+    protected $foundMatch = false;
+
     /**
      * Creates a new instance with the default capacity which corresponds to
      * the specified database.

diff --git a/src/Propel/Runtime/ActiveQuery/ModelCriteria.php b/src/Propel/Runtime/ActiveQuery/ModelCriteria.php
@@ -92,18 +92,6 @@ class ModelCriteria extends BaseModelCriteria
      */
     protected $select;
 
-    /**
-     * temporary property used in replaceNames
-     *
-     * @var string|null
-     */
-    protected $currentAlias;
-
-    /**
-     * @var bool
-     */
-    protected $foundMatch = false;
-
     /**
      * Used to memorize whether we added self-select columns before.
      *