PHP min version set to 7.1

Author: apphp

CHANGELOG

@@ -2,6 +2,7 @@ Version 0.4.x -
 ----------------------------
 - Enh: code refactoring in DataGridServiceProvider
 - Enh: HTML code extracted to view blade files
+- Enh: min PHP version is defined as PHP 7.1
 
 
 Version 0.3.1 - Dec 26, 2020

README.md

@@ -8,7 +8,7 @@ This package helps to create DataGrid (CRUD) pages for Laravel 6+ framework appl
 
 ## Requirements
 
-* PHP >=7.0
+* PHP >=7.1
 * Laravel 6+
 * Bootstrap 3+
 
@@ -65,17 +65,17 @@ Following filter field types are available
 
 Each filter field can include following attributes:
 
-| Attribute        | Description                                                                   |
-|------------------|-------------------------------------------------------------------------------|
-| `title`          | Specifies a title, that will be shown in the label of filter field         
-| `type`           | Specifies a type of the filter field (see above)         
-| `compareType`    | Specifies which type of comparison will be used: ex.: '=', '%like%', '!=' etc.         
-| `source`         | Specifies the source (array) to 'set' fields         
-| `validation`     | Specifies validation rules (array). Possible options: ['minLength'=>2, 'maxLength'=>10, 'min'=>2, 'max'=>100]           
-| `relation`       |          
-| `relationXref`   |          
-| `htmlOptions`    |          
-| `disabled`       |            
+| Attribute        | Type       | Description                                                                  
+|------------------|------------|-------------------------------------------------------------------
+| `title`          | String     | Specifies a title, that will be shown in the label of filter field         
+| `type`           | String     | Specifies a type of the filter field (see above)         
+| `compareType`    | String     | Specifies which type of comparison will be used: ex.: '=', '%like%', '!=' etc.         
+| `source`         | Array      | Specifies the source (array) to 'set' fields         
+| `validation`     | Array      | Specifies validation rules (array). Possible options: ['minLength'=>2, 'maxLength'=>10, 'min'=>2, 'max'=>100]           
+| `relation`       | String     | Specifies the relation between 2 models (One-to-One, One-to-Many), ex.: search in posts for users - relation="posts"          
+| `relationXref`   | String     | Specifies the relation between 2 models (Many-to-Many), ex.: search in roles for users - relation="roles"         
+| `htmlOptions`    | Array      | Specifies any possible HTML attribute for the field          
+| `disabled`       | Boolean    | Specifies whether the field is disabled or not (default - not)           
 
 
 ### 3. Handle filters and prepare SQL builder

composer.json

@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=7.1",
         "illuminate/support": "~5.0|^6.0",
         "jenssegers/agent": "^2.6"
     },

src/Apphp/DataGrid/DataGridServiceProvider.php

@@ -12,6 +12,11 @@ class DataGridServiceProvider extends ServiceProvider
      */
     private $dir = '';
 
+    /**
+     * DataGridServiceProvider constructor.
+     *
+     * @param $app
+     */
     public function __construct($app)
     {
         parent::__construct($app);
@@ -35,8 +40,6 @@ public function boot()
      */
     public function register()
     {
-        ///$this->app->bind();
-
         $this->app->singleton('filter', function () {
             return $this->app->make('Apphp\DataGrid\Filter');
         });

src/Apphp/DataGrid/Filter.php

@@ -79,7 +79,7 @@ class Filter
     /**
      * Filter constructor
      *
-     * @param  null  $query
+     * @param  Illuminate\Database\Query\Builder $query
      * @param  Request  $request
      * @param  null  $filters
      * @param  string  $submitRoute
@@ -91,11 +91,11 @@ class Filter
     public static function init(
         $query = null,
         Request $request,
-        $filters = null,
-        $submitRoute = '',
-        $cancelRoute = '',
-        $initMode = '',
-        $fieldsInRow = 4
+        array $filters = null,
+        string $submitRoute = '',
+        string $cancelRoute = '',
+        string $initMode = '',
+        int $fieldsInRow = 4
     ): Filter
     {
         self::$debug = true;
@@ -175,7 +175,7 @@ public static function setFilterFields($filterFields): void
      * Get filter fields
      * @return array
      */
-    public static function getFilterFields():array
+    public static function getFilterFields(): array
     {
         return self::$filterFields;
     }
@@ -194,7 +194,7 @@ public static function setSubmitRoute($route = ''): void
      * Get submit route
      * @return string
      */
-    public static function getSubmitRoute():string
+    public static function getSubmitRoute(): string
     {
         return self::$submitRoute;
     }
@@ -223,7 +223,7 @@ public static function setFieldsInRow(int $count = 4): void
      * Get cancel route
      * @return string
      */
-    public static function getCancelRoute():string
+    public static function getCancelRoute(): string
     {
         return self::$cancelRoute;
     }
@@ -233,7 +233,7 @@ public static function getCancelRoute():string
      * @param string $mode
      * @return void
      */
-    public static function setMode($mode):void
+    public static function setMode($mode): void
     {
         self::$mode = (strtolower($mode) === 'collapsed' ? 'collapsed' : 'opened');
     }
@@ -243,7 +243,7 @@ public static function setMode($mode):void
      * @param string $query
      * @return void
      */
-    public static function setQuery($query):void
+    public static function setQuery($query): void
     {
         self::$query = $query;
     }
@@ -424,7 +424,7 @@ public static function filter(): ?Filter
      * @param array $filter
      * @return void
      */
-    private static function prepareWhereClause($key, $value, $filter = []): void
+    private static function prepareWhereClause(string $key, $value, array $filter = []): void
     {
         $compareType = $filter['compareType'] ?? '=';
         $relation = $filter['relation'] ?? null;
@@ -460,7 +460,7 @@ private static function prepareWhereClause($key, $value, $filter = []): void
      * @param null|object $query
      * @return void
      */
-    private static function setWhereClause($key, $value, $compareType, $query = null): void
+    private static function setWhereClause(string $key, $value, string $compareType, array $query = null): void
     {
         $q = empty($query) ? self::$query : $query;
 
@@ -552,7 +552,7 @@ public static function renderFields()
 //            <div class="card-body py-1'.(self::$mode == 'opened' || $filterFields['act'] === 'search' ? '' : ' collapse').'">
 //                <form action="'.self::getSubmitRoute().'" method="GET">
 //                    <input type="hidden" name="act" value="search">'.PHP_EOL;
-                    
+
                     $count = 0;
                     $filterFieldsContent = '<div class="row mb-n2">'.PHP_EOL;
                     foreach ($filters as $key => $filter) {

src/Apphp/DataGrid/Pagination.php

@@ -41,16 +41,15 @@ class Pagination
     /**
      * Pagination constructor
      *
-     * @param  null  $query
-     *
+     * @param  Illuminate\Database\Query\Builder $query
      * @param  int  $pageSize
      * @param  string  $sort
      * @param  string  $direction
      * @param  string  $filterFields
      *
      * @return Pagination
      */
-    public static function init($query, $pageSize = 20, $sort = '', $direction = '', $filterFields = ''): Pagination
+    public static function init($query, int $pageSize = 20, string $sort = '', string $direction = '', string $filterFields = ''): Pagination
     {
         if ( ! empty($query)) {
             self::setQuery($query);
@@ -82,7 +81,7 @@ public static function init($query, $pageSize = 20, $sort = '', $direction = '',
      * @param  string  $query
      * @return void
      */
-    public static function setQuery($query): void
+    public static function setQuery(string $query): void
     {
         self::$query = $query;
     }