Merge branch 'release/4.1.0'

Author: WiktorPacer

CHANGELOG.md

@@ -1,4 +1,10 @@
 # Changelog
+## v.4.1.0
+    - compatibility with PHP version 8.x (updated composer.json file)
+    - DateCriteria now accept "column" parameter
+    - add new criteria
+        * FindWhereOrWhereCriteria
+        * FindWhereNotIn
 ## v.4.0.1
     - update ext-json version to "*" in composer.json file
 ## v.4.0.0

README.md

@@ -141,10 +141,12 @@ List of criteria, provider by default with this package:
 * DateCriteria - search records with given date range (by created_at field)
 * FindWhereCriteria
 * FindWhereInCriteria
+* FindWhereNotInCriteria
 * LimitCriteria
 * OrWhereCriteria
 * Select2Criteria - criteria useful when implementing Select2
 * OffsetCriteria
+* FindWhereOrWhereCriteria
 
 #### Caching
 ___
@@ -166,6 +168,8 @@ of choice. Trait will handle cache for methods:
 * paginate()
 * simplePaginate()
 
+You can user criteria with this functions, and results will be cached.
+
 Repository automatically flush cache, when method create(), updateOrCreate(), update(),
 delete() is call.
 
@@ -211,7 +215,7 @@ $this-exampleService->getRepository->skipCache()->findWhere(...)
 ```
 
 ##### Disable cache
-To quick disable cache i.ex for debugging, set REPOSITORY_CACHE variable for false in .env
+To quick disable cache i.ex for debugging, set REPOSITORY_CACHE variable to false in .env
 ```dotenv
 REPOSITORY_CACHE=false
 ```

composer.json

@@ -10,7 +10,7 @@
         "laravel"
     ],
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "ext-json": "*",
         "ext-libxml": "*",
         "ext-simplexml": "*",

src/Repositories/Criteria/DateCriteria.php

@@ -28,18 +28,28 @@ class DateCriteria extends CoreRepositoryCriteria
      */
     private $dateTo;
 
+    /**
+     * Column name to search.
+     *
+     * @var string
+     */
+    private $column;
+
     /**
      * DateCriteria constructor.
      *
      * @param null|string $dateFrom
      * @param null|string $dateTo
+     * @param string      $column
      */
     public function __construct(
         ?string $dateFrom,
-        ?string $dateTo
+        ?string $dateTo,
+        string $column = Model::CREATED_AT
     ) {
         $this->dateFrom = $dateFrom;
         $this->dateTo = $dateTo;
+        $this->column = $column;
     }
 
     /**
@@ -56,11 +66,11 @@ public function __construct(
     public function apply($entity)
     {
         if ($this->dateFrom !== null) {
-            $entity = $entity->where(Model::CREATED_AT, '>=', $this->dateFrom);
+            $entity = $entity->where($this->column, '>=', $this->dateFrom);
         }
 
         if ($this->dateTo !== null) {
-            $entity = $entity->where(Model::CREATED_AT, '<=', $this->dateTo);
+            $entity = $entity->where($this->column, '<=', $this->dateTo);
         }
 
         return $entity;

src/Repositories/Criteria/FindWhereNotInCriteria.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace PacerIT\LaravelRepository\Repositories\Criteria;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class FindWhereNotInCriteria.
+ *
+ * @author Wiktor Pacer <[email protected]>
+ *
+ * @since 09/12/2020
+ */
+class FindWhereNotInCriteria extends CoreRepositoryCriteria
+{
+    /**
+     * @var string
+     */
+    protected $column;
+
+    /**
+     * @var array
+     */
+    protected $notIn;
+
+    /**
+     * FindWhereNotInCriteria constructor.
+     *
+     * @param string $column
+     * @param array  $notIn
+     */
+    public function __construct(string $column, array $notIn)
+    {
+        $this->column = $column;
+        $this->notIn = $notIn;
+    }
+
+    /**
+     * Apply criteria on entity.
+     *
+     * @param Model|Builder $entity
+     *
+     * @return Model|Builder
+     *
+     * @author Wiktor Pacer <[email protected]>
+     *
+     * @since 2019-07-05
+     */
+    public function apply($entity)
+    {
+        return $entity->whereNotIn($this->column, $this->notIn);
+    }
+}

src/Repositories/Criteria/FindWhereOrWhereCriteria.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace PacerIT\LaravelRepository\Repositories\Criteria;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class FindWhereOrWhereCriteria.
+ *
+ * @author Wiktor Pacer <[email protected]>
+ *
+ * @since 09/12/2020
+ */
+class FindWhereOrWhereCriteria extends CoreRepositoryCriteria
+{
+    /**
+     * @var array
+     */
+    protected $where;
+
+    /**
+     * @var array
+     */
+    protected $orWhere;
+
+    /**
+     * FindWhereCriteria constructor.
+     *
+     * @param array $where
+     * @param array $orWhere
+     */
+    public function __construct(array $where, array $orWhere = [])
+    {
+        $this->where = $where;
+        $this->orWhere = $orWhere;
+    }
+
+    /**
+     * Apply criteria on entity.
+     *
+     * @param Model|Builder $entity
+     *
+     * @return Model|Builder
+     *
+     * @author Wiktor Pacer <[email protected]>
+     *
+     * @since 2019-07-05
+     */
+    public function apply($entity)
+    {
+        return $entity->where(function ($query) {
+            $query->where($this->where);
+
+            foreach ($this->orWhere as $where) {
+                $query->orWhere($where);
+            }
+        });
+    }
+}