add types, remove unneeded depedency solutosoft/yii2-plugin

composer.json

@@ -31,8 +31,7 @@
   ],
   "require": {
     "php" : ">=8.0",
-    "yiisoft/yii2": "~2.0.0",
-    "solutosoft/yii2-plugin": "~1.0.0"
+    "yiisoft/yii2": "~2.0.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0 || ^11.0",

src/QueryBuilder.php

@@ -2,18 +2,20 @@
 
 namespace leandrogehlen\querybuilder;
 
+use yii\base\Widget;
+
 /**
  * QueryBuilder renders a jQuery QueryBuilder component.
  *
  * @see http://mistic100.github.io/jQuery-QueryBuilder/
  * @author Leandro Gehlen <[email protected]>
  */
-class QueryBuilder extends \soluto\plugin\Widget {
+class QueryBuilder extends Widget {
 
     /**
      * @inheridoc
      */
-    public $pluginName = 'queryBuilder';
+    public string $pluginName = 'queryBuilder';
 
     /**
      * @return string[]

src/QueryBuilderAsset.php

@@ -9,7 +9,8 @@
  *
  * @author Leandro Gehlen <[email protected]>
  */
-class QueryBuilderAsset extends AssetBundle {
+class QueryBuilderAsset extends AssetBundle
+{
 
     public $sourcePath = '@npm/jQuery-QueryBuilder/dist';
 
@@ -34,5 +35,4 @@ class QueryBuilderAsset extends AssetBundle {
         'yii\web\JqueryAsset'
     ];
 
-
 }

src/QueryBuilderForm.php

@@ -114,7 +114,7 @@ public function init() : void
             $this->options['id'] = $this->getId();
         }
 
-        echo $this->builder->run();
+        $this->builder->run();
         echo Html::beginForm($this->action, $this->method, $this->options);
         echo Html::hiddenInput($this->rulesParam);
     }

src/Translator.php

@@ -51,7 +51,7 @@ class Translator
      * @param array<mixed> $data Rules configuraion
      * @param ?string $paramPrefix prefix added to parameters, to be changed in case of multiple translator params being merged
      */
-    public function __construct(private array $data, ?string $paramPrefix = null)
+    public function __construct(private readonly array $data, ?string $paramPrefix = null)
     {
         $this->init();
         if($paramPrefix){
@@ -69,7 +69,7 @@ public function __construct(private array $data, ?string $paramPrefix = null)
      * @param array<string, mixed> $params query parameters
      * @return string encoded rule
      */
-    protected function encodeRule(string $field, string $type, array $params)
+    protected function encodeRule(string $field, string $type, array $params): string
     {
         $pattern = $this->_operators[$type];
         $keys = array_keys($params);
@@ -98,7 +98,7 @@ protected function encodeRule(string $field, string $type, array $params)
      * @param array<mixed> $data rules configuration
      * @return string the WHERE clause
      */
-    protected function buildWhere($data)
+    protected function buildWhere(array $data) : string
     {
         if (!isset($data['rules']) || !$data['rules']) {
             return '';
@@ -137,7 +137,7 @@ protected function buildWhere($data)
      * Returns query WHERE condition.
      * @return string
      */
-    public function where()
+    public function where() : string
     {
         return $this->_where;
     }
@@ -146,7 +146,7 @@ public function where()
      * Returns the parameters to be bound to the query.
      * @return array<string,mixed>
      */
-    public function params()
+    public function params() : array
     {
         return $this->_params;
     }