Helper refactor (#6)

* Modified dependencies, added strict modes, refactored to helpers, minor cosmetic changes

* Apply fixes from StyleCI (#5)

Author: Norgul

composer.json

@@ -8,8 +8,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.4",
-        "illuminate/support": "^8.0",
-        "illuminate/database": "^8.0"
+        "laravel/framework": "^8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.0",

src/Config/asseco-json-query-builder.php renamed to config/asseco-json-query-builder.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Config;
 
 use Doctrine\DBAL\DBALException;
@@ -25,12 +27,12 @@ public function __construct(Model $model)
 
     public function hasConfig(): bool
     {
-        return array_key_exists(get_class($this->model), Config::get('asseco-json-query-builder.model_options'));
+        return array_key_exists(get_class($this->model), config('asseco-json-query-builder.model_options'));
     }
 
     protected function getConfig(): array
     {
-        return Config::get('asseco-json-query-builder.model_options.' . get_class($this->model));
+        return config('asseco-json-query-builder.model_options.' . get_class($this->model));
     }
 
     public function getReturns()

src/Config/ModelConfig.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Config;
 
 use Voice\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;

src/Config/OperatorsConfig.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Config;
 
 class RequestParametersConfig extends SearchConfig

src/Config/RequestParametersConfig.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Config;
 
 use Illuminate\Support\Facades\Config;
@@ -16,7 +18,7 @@ abstract class SearchConfig
      */
     public function __construct()
     {
-        $this->config = Config::get('asseco-json-query-builder');
+        $this->config = config('asseco-json-query-builder');
         $this->register();
     }
 

src/Config/SearchConfig.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Config;
 
 use Voice\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;

src/Config/TypesConfig.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Exceptions;
 
 use Exception;

src/Exceptions/JsonQueryBuilderException.php

@@ -16,10 +16,6 @@ class JsonQuery
     protected ModelConfig $modelConfig;
     protected array       $registeredParameters;
 
-    /*
-     * TODO: implement date from-to etc.
-     */
-
     /**
      * JsonQuery constructor.
      * @param Builder $builder

src/JsonQuery.php

@@ -11,14 +11,14 @@ class JsonQueryServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__ . '/Config/asseco-json-query-builder.php', 'asseco-json-query-builder');
+        $this->mergeConfigFrom(__DIR__ . '/../config/asseco-json-query-builder.php', 'asseco-json-query-builder');
     }
 
     /**
      * Bootstrap the application services.
      */
     public function boot()
     {
-        $this->publishes([__DIR__ . '/Config/asseco-json-query-builder.php' => config_path('asseco-json-query-builder.php')]);
+        $this->publishes([__DIR__ . '/../config/asseco-json-query-builder.php' => config_path('asseco-json-query-builder.php')]);
     }
 }

src/JsonQueryServiceProvider.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 use Illuminate\Database\Eloquent\Builder;

src/RequestParameters/AbstractParameter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 use Illuminate\Support\Facades\DB;
@@ -25,7 +27,6 @@ public function areArgumentsValid(): void
 
     public function appendQuery(): void
     {
-        // TODO: check this for other DB drivers
         $this->builder->select(DB::raw('count(*) as count'));
     }
 }

src/RequestParameters/CountParameter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 use Voice\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;

src/RequestParameters/LimitParameter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters\Models;
 
 use Illuminate\Support\Facades\Config;

src/RequestParameters/Models/Search.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 use Voice\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;

src/RequestParameters/OffsetParameter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 class OrderByParameter extends AbstractParameter

src/RequestParameters/OrderByParameter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 use Illuminate\Support\Str;

src/RequestParameters/RelationsParameter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 class ReturnsParameter extends AbstractParameter

src/RequestParameters/ReturnsParameter.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 use Illuminate\Database\Eloquent\Builder;

src/RequestParameters/SearchParameter.php

@@ -1,12 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;
 use Voice\JsonQueryBuilder\CategorizedValues;
 use Voice\JsonQueryBuilder\Config\OperatorsConfig;
 use Voice\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;
-use Voice\JsonQueryBuilder\Exceptions\SearchException;
 use Voice\JsonQueryBuilder\RequestParameters\Models\Search;
 
 abstract class AbstractCallback
@@ -58,7 +59,7 @@ public static function getCallbackOperator(): string
      * @param Builder $builder
      * @param string $column
      * @param CategorizedValues $values
-     * @throws SearchException|JsonQueryBuilderException
+     * @throws JsonQueryBuilderException
      */
     abstract public function execute(Builder $builder, string $column, CategorizedValues $values): void;
 

src/SearchCallbacks/AbstractCallback.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;

src/SearchCallbacks/Between.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;

src/SearchCallbacks/Equals.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;

src/SearchCallbacks/GreaterThan.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;

src/SearchCallbacks/GreaterThanOrEqual.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;

src/SearchCallbacks/LessThan.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;

src/SearchCallbacks/LessThanOrEqual.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;

src/SearchCallbacks/NotBetween.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;

src/SearchCallbacks/NotEquals.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Traits;
 
 trait RemovesEmptyValues

src/Traits/RemovesEmptyValues.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Types;
 
 abstract class AbstractType

src/Types/AbstractType.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Types;
 
 use Voice\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;

src/Types/BooleanType.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Types;
 
 class GenericType extends AbstractType