Merge pull request #31 from yepwoo/dev

Dev

README.md

@@ -6,6 +6,12 @@
 ![Codacy grade](https://img.shields.io/codacy/grade/c8ff813591bf46ee9711e57188149288)
 [![Total Downloads](https://img.shields.io/packagist/dt/yepwoo/laragine.svg)](https://packagist.org/packages/yepwoo/laragine)
 
+| **Supported Laravel Versions** |
+|-------------|
+| 8.x         |
+| 9.x         |
+| 10.x        |
+
 We developed Laragine to make the software development using Laravel faster and cleaner, so you can get things done faster, not only that, Laragine is not about quantity only, it's all about quantity and quality.
 
 #### Quick short video:

docs/error-handling.md

@@ -29,7 +29,7 @@ class Handler extends ExceptionHandler
 }
 ```
 
-Now, we need to use this helper function `client_validation_response` (it accepts 2 arguments, the first is the rules array and the second (optional) is the start error code) in the validation file (`lang\en\validation.php` in Laravel `9.x` or `resources\lang\en\validation.php` Laravel `8.x`) by assigning the array to a variable and then return the helper function, here is the full code snippet:
+Now, we need to use this helper function `client_validation_response` (it accepts 2 arguments, the first is the rules array and the second (optional) is the start error code) in the validation file (`lang\en\validation.php` in Laravel `9.x` and `10.x` (in `10.x` you need to run this command first: `php artisan lang:publish`) or `resources\lang\en\validation.php` Laravel `8.x`) by assigning the array to a variable and then return the helper function, here is the full code snippet:
 
 ```php
 $array = [

docs/introduction.md

@@ -32,7 +32,7 @@ It's also very important to understand the following terms:
 
 ### Notes
 
-* Laragine currently is working on **Laravel 8.x and 9.x**
+* Laragine currently is working on **Laravel 8.x, 9.x and 10.x**
 
 * Laragine directory will be in the root directory under `Core` directory
 

docs/middlewares.md

@@ -6,10 +6,10 @@ Useful middlewares to help you protect the system and for better security:
 
 to check if the client side includes a valid `api-key` header in any API request.
 
-to use it, first add `API_KEY=your_api_key_here` in `.env` file, second in the **Kernel** (`app\Http\Kernel.php`) add it in `$routeMiddleware` as below:
+to use it, first add `API_KEY=your_api_key_here` in `.env` file, second in the **Kernel** (`app\Http\Kernel.php`) add it in `$routeMiddleware` or `middlewareAliases` if it's Laravel `10.x` as below:
 
 ```php
-protected $routeMiddleware = [
+protected $middlewareAliases = [
 
     ...
 

src/Core/Base/TestCase.stub → src/Core/Base/ApiTestCase.stub

@@ -2,12 +2,12 @@
 
 namespace Core\Base\Tests;
 
-use Tests\TestCase as BaseTestCase;
+use Tests\TestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use App\Models\User;
 // use Tymon\JWTAuth\Facades\JWTAuth;
 
-class TestCase extends BaseTestCase
+class ApiTestCase extends TestCase
 {
     use RefreshDatabase;
 
@@ -18,6 +18,13 @@ class TestCase extends BaseTestCase
      */
     protected $base_url;
 
+    /**
+     * the current model
+     *
+     * @var array
+     */
+    protected $model;
+
     /**
      * the data that will be sent in the request (create/update)
      *
@@ -125,11 +132,11 @@ class TestCase extends BaseTestCase
     /**
      * create new entry
      *
-     * @return Model
+     * @return \Illuminate\Database\Eloquent\Model
      */
     protected function getNewEntry()
     {
-        return Model::factory()->create();
+        return $this->model::factory()->create();
     }
 
     /**

src/Core/Base/SendResponse.stub

@@ -51,7 +51,7 @@ trait SendResponse
         }
 
         if (env('APP_DEBUG') == true) {
-            $errors  = $e->errors();
+            $errors  = $e->getTrace();
             $message = $e->getMessage();
         }
 

src/Core/Base/WebControllerTest.stub

@@ -2,10 +2,10 @@
 
 namespace Core\Base\Tests\Unit;
 
-use Core\Base\Tests\TestCase;
+use Core\Base\Tests\WebTestCase;
 use Core\Base\Controllers\Web\Controller;
 
-class WebControllerTest extends TestCase
+class WebControllerTest extends WebTestCase
 {
     /**
      * the web controller
@@ -26,7 +26,7 @@ class WebControllerTest extends TestCase
 
         $this->controller = $this->getMockBuilder(Controller::class)
                                  ->disableOriginalConstructor()
-                                 ->setMethods(['getExplodedNamespace'])
+                                 ->onlyMethods(['getExplodedNamespace'])
                                  ->getMock();
 
         $this->controller->expects($this->any())

src/Core/Base/WebTestCase.stub

@@ -0,0 +1,10 @@
+<?php
+
+namespace Core\Base\Tests;
+
+use Tests\TestCase;
+
+class WebTestCase extends TestCase
+{
+
+}

src/Core/Module/UnitTest.stub

@@ -2,10 +2,10 @@
 
 namespace Core\#MODULE_NAME#\Tests\Feature;
 
-use Core\Base\Tests\TestCase;
+use Core\Base\Tests\ApiTestCase;
 use Core\#MODULE_NAME#\Models\#UNIT_NAME# as Model;
 
-class #UNIT_NAME#Test extends TestCase
+class #UNIT_NAME#Test extends ApiTestCase
 {
     /**
      * setting up
@@ -18,7 +18,8 @@ class #UNIT_NAME#Test extends TestCase
         parent::setUp();
 
         $this->base_url     = $this->getApiBaseUrl() . '#UNIT_NAME_PLURAL_LOWER_CASE#/';
-        $this->data         = Model::factory()->make()->toArray();
+        $this->model        = new Model();
+        $this->data         = $this->model::factory()->make()->toArray();
         $this->json         = $this->getJsonStructure();
         $this->json['data'] = ['id'];
 

src/config.php

@@ -32,7 +32,8 @@
         'api.php'                    => 'routes/api.php',
         'web.php'                    => 'routes/web.php',
         'WebControllerTest.stub'     => 'Tests/Unit/WebControllerTest.php',
-        'TestCase.stub'              => 'Tests/TestCase.php',
+        'ApiTestCase.stub'           => 'Tests/ApiTestCase.php',
+        'WebTestCase.stub'           => 'Tests/WebTestCase.php',
         'Uuid.stub'                  => 'Traits/Model/Uuid.php',
         'SendResponse.stub'          => 'Traits/Response/SendResponse.php',
         'File.stub'                  => 'Traits/ServiceProvider/File.php',