Helper refactor (#6)

Norgul · web-flow · commit 2080eb100a17 · 2020-11-27T09:37:01.000+01:00
* Modified dependencies, added strict modes, refactored to helpers, minor cosmetic changes * Apply fixes from StyleCI (#5)
diff --git a/composer.json b/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",
diff --git a/config/asseco-json-query-builder.php b/config/asseco-json-query-builder.php
diff --git a/src/Config/ModelConfig.php b/src/Config/ModelConfig.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()
diff --git a/src/Config/OperatorsConfig.php b/src/Config/OperatorsConfig.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Config;
 
 use Voice\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;
diff --git a/src/Config/RequestParametersConfig.php b/src/Config/RequestParametersConfig.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Config;
 
 class RequestParametersConfig extends SearchConfig
diff --git a/src/Config/SearchConfig.php b/src/Config/SearchConfig.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();
     }
 
diff --git a/src/Config/TypesConfig.php b/src/Config/TypesConfig.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Config;
 
 use Voice\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;
diff --git a/src/Exceptions/JsonQueryBuilderException.php b/src/Exceptions/JsonQueryBuilderException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Exceptions;
 
 use Exception;
diff --git a/src/JsonQuery.php b/src/JsonQuery.php
@@ -16,10 +16,6 @@ class JsonQuery
     protected ModelConfig $modelConfig;
     protected array       $registeredParameters;
 
-    /*
-     * TODO: implement date from-to etc.
-     */
-
     /**
      * JsonQuery constructor.
      * @param Builder $builder
diff --git a/src/JsonQueryServiceProvider.php b/src/JsonQueryServiceProvider.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')]);
     }
 }
diff --git a/src/RequestParameters/AbstractParameter.php b/src/RequestParameters/AbstractParameter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 use Illuminate\Database\Eloquent\Builder;
diff --git a/src/RequestParameters/CountParameter.php b/src/RequestParameters/CountParameter.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'));
     }
 }
diff --git a/src/RequestParameters/LimitParameter.php b/src/RequestParameters/LimitParameter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 use Voice\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;
diff --git a/src/RequestParameters/Models/Search.php b/src/RequestParameters/Models/Search.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters\Models;
 
 use Illuminate\Support\Facades\Config;
diff --git a/src/RequestParameters/OffsetParameter.php b/src/RequestParameters/OffsetParameter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 use Voice\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;
diff --git a/src/RequestParameters/OrderByParameter.php b/src/RequestParameters/OrderByParameter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 class OrderByParameter extends AbstractParameter
diff --git a/src/RequestParameters/RelationsParameter.php b/src/RequestParameters/RelationsParameter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 use Illuminate\Support\Str;
diff --git a/src/RequestParameters/ReturnsParameter.php b/src/RequestParameters/ReturnsParameter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 class ReturnsParameter extends AbstractParameter
diff --git a/src/RequestParameters/SearchParameter.php b/src/RequestParameters/SearchParameter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\RequestParameters;
 
 use Illuminate\Database\Eloquent\Builder;
diff --git a/src/SearchCallbacks/AbstractCallback.php b/src/SearchCallbacks/AbstractCallback.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;
 
diff --git a/src/SearchCallbacks/Between.php b/src/SearchCallbacks/Between.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;
diff --git a/src/SearchCallbacks/Equals.php b/src/SearchCallbacks/Equals.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;
diff --git a/src/SearchCallbacks/GreaterThan.php b/src/SearchCallbacks/GreaterThan.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;
diff --git a/src/SearchCallbacks/GreaterThanOrEqual.php b/src/SearchCallbacks/GreaterThanOrEqual.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;
diff --git a/src/SearchCallbacks/LessThan.php b/src/SearchCallbacks/LessThan.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;
diff --git a/src/SearchCallbacks/LessThanOrEqual.php b/src/SearchCallbacks/LessThanOrEqual.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;
diff --git a/src/SearchCallbacks/NotBetween.php b/src/SearchCallbacks/NotBetween.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;
diff --git a/src/SearchCallbacks/NotEquals.php b/src/SearchCallbacks/NotEquals.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\SearchCallbacks;
 
 use Illuminate\Database\Eloquent\Builder;
diff --git a/src/Traits/RemovesEmptyValues.php b/src/Traits/RemovesEmptyValues.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Traits;
 
 trait RemovesEmptyValues
diff --git a/src/Types/AbstractType.php b/src/Types/AbstractType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Types;
 
 abstract class AbstractType
diff --git a/src/Types/BooleanType.php b/src/Types/BooleanType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Types;
 
 use Voice\JsonQueryBuilder\Exceptions\JsonQueryBuilderException;
diff --git a/src/Types/GenericType.php b/src/Types/GenericType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Voice\JsonQueryBuilder\Types;
 
 class GenericType extends AbstractType

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+declare(strict_types=1);`
	`4`	`+`
`3`	`5`	`namespace Voice\JsonQueryBuilder\Config;`
`4`	`6`
`5`	`7`	`use Doctrine\DBAL\DBALException;`
`@@ -25,12 +27,12 @@ public function __construct(Model $model)`
`25`	`27`
`26`	`28`	`public function hasConfig(): bool`
`27`	`29`	`{`
`28`		`- return array_key_exists(get_class($this->model), Config::get('asseco-json-query-builder.model_options'));`
	`30`	`+ return array_key_exists(get_class($this->model), config('asseco-json-query-builder.model_options'));`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`protected function getConfig(): array`
`32`	`34`	`{`
`33`		`- return Config::get('asseco-json-query-builder.model_options.' . get_class($this->model));`
	`35`	`+ return config('asseco-json-query-builder.model_options.' . get_class($this->model));`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`public function getReturns()`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@ class JsonQueryServiceProvider extends ServiceProvider`
`11`	`11`	`*/`
`12`	`12`	`public function register()`
`13`	`13`	`{`
`14`		`- $this->mergeConfigFrom(__DIR__ . '/Config/asseco-json-query-builder.php', 'asseco-json-query-builder');`
	`14`	`+ $this->mergeConfigFrom(__DIR__ . '/../config/asseco-json-query-builder.php', 'asseco-json-query-builder');`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* Bootstrap the application services.`
`19`	`19`	`*/`
`20`	`20`	`public function boot()`
`21`	`21`	`{`
`22`		`- $this->publishes([__DIR__ . '/Config/asseco-json-query-builder.php' => config_path('asseco-json-query-builder.php')]);`
	`22`	`+ $this->publishes([__DIR__ . '/../config/asseco-json-query-builder.php' => config_path('asseco-json-query-builder.php')]);`
`23`	`23`	`}`
`24`	`24`	`}`