remove deprecated currentParams from Translator

.github/workflows/php.yml

@@ -33,11 +33,12 @@ jobs:
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress
 
+      - name: Check outdated packages
+        run: composer outdated
+
       - name: Run tests
         run: vendor/bin/phpunit
 
       - name: Run static code analysis
         run:  vendor/bin/phpstan --xdebug analyse
         if: always()
-
-

composer.json

@@ -40,7 +40,8 @@
   },
   "autoload": {
     "psr-4": {
-      "leandrogehlen\\querybuilder\\": "src"
+      "leandrogehlen\\querybuilder\\": "src",
+      "leandrogehlen\\querybuilder\\tests\\": "tests"
     }
   },
   "extra": {

src/Translator.php

@@ -18,7 +18,7 @@
  *     $rules = Yii::$app->request->post('rules');
  *
  *     if ($rules) {
- *         $translator = new Translator(Json::decode($rules),['currentParams'=>$query->params]);
+ *         $translator = new Translator(Json::decode($rules));
  *         $query->andWhere($translator->where())
  *               ->addParams($translator->params());
  *     }
@@ -44,11 +44,7 @@ class Translator extends BaseObject
     /** @var array<string, mixed> */
     private array $_operators;
 
-    /**
-     * @var array<string, mixed> The params from yii\db\Query object that are already set so we don't overwrite them
-     * @deprecated
-     */
-    private array $currentParams = [];
+
 
     /**
      * Constructors.
@@ -57,10 +53,6 @@ class Translator extends BaseObject
      */
     public function __construct($data, $config = [])
     {
-        if(isset($config['currentParams'])){
-            $this->setCurrentParams($config['currentParams']);
-
-        }
         parent::__construct($config);
         $this->_where = $this->buildWhere($data);
     }
@@ -180,7 +172,7 @@ public function where()
      */
     public function params()
     {
-        return array_merge($this->currentParams, $this->_params);
+        return $this->_params;
     }
 
     /**
@@ -193,14 +185,4 @@ private function getNewParamName(){
         return $security->generateRandomString(20);
     }
 
-    /**
-     *
-     * @param array<string, mixed> $currentParams
-     * @deprecated
-     */
-    public function setCurrentParams($currentParams) : void {
-        $this->currentParams = $currentParams;
-    }
-
-
 } 

tests/TestCase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace leandrogehlen\querybuilder\tests\unit;
+namespace leandrogehlen\querybuilder\tests;
 
 use yii\base\NotSupportedException;
 use Yii;
@@ -10,23 +10,6 @@
  */
 class TestCase extends  \PHPUnit\Framework\TestCase
 {
-    /**
-     * This method is called before the first test of this test class is run.
-     * Attempts to load vendor autoloader.
-     * @throws \yii\base\NotSupportedException
-     */
-    public static function setUpBeforeClass() : void
-    {
-        $vendorDir = __DIR__ . '/../vendor';
-        $vendorAutoload = $vendorDir . '/autoload.php';
-        if (file_exists($vendorAutoload)) {
-            require_once($vendorAutoload);
-        } else {
-            throw new NotSupportedException("Vendor autoload file '{$vendorAutoload}' is missing.");
-        }
-        require_once($vendorDir . '/yiisoft/yii2/Yii.php');
-        Yii::setAlias('@vendor', $vendorDir);
-    }
 
     /**
      * Populates Yii::$app with a new application

tests/TranslatorTest.php

@@ -1,10 +1,9 @@
 <?php
 
 
-namespace leandrogehlen\querybuilder\tests\unit;
+namespace leandrogehlen\querybuilder\tests;
 
 use leandrogehlen\querybuilder\Translator;
-use PascalDeVink\ShortUuid\ShortUuid;
 
 class TranslatorTest extends TestCase
 {
@@ -124,6 +123,9 @@ public function testRules($rule, $expected)
     public function testHasParamValues($rule, $expected) {
         $translator = new Translator($rule);
         $params = $translator->params();
+        if(empty($expected[1])) {
+            $this->assertEquals([], $params);
+        }
         foreach ($expected[1] as $key => $value) {
             $values = array_values($params);
             $this->assertTrue(in_array($value,$values));