Release v1.04.1

* Updated release notes. * Minor bug fix, booleans not being parsed correctly. * Removed rendundant code.
costs-to-expect · Oct 7, 2018 · 43d9fb3 · 43d9fb3
1 parent 2a8f162
commit 43d9fb3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ Full changelog for the costs to expect REST API.
 * Added App\Http\Parameters\Get class to validate GET parameters, moved code from base controller.
 * Added App\Http\Parameters\Route\Validate and child classes to validator route parameters.
 * Updated controllers to use new App\Http\Parameters\* classes.
+* Minor bug fix, booleans not being checked correctly.
 
 ## 2019-09-25 - v1.04.0
 

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -31,7 +31,6 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,

diff --git a/app/Http/Parameters/Get.php b/app/Http/Parameters/Get.php
@@ -4,7 +4,6 @@
 
 use App\Models\Category;
 use App\Models\SubCategory;
-use Illuminate\Http\Request;
 
 /**
  * Fetch any GET parameters attached to the end of the URI and validate
@@ -32,7 +31,17 @@ private static function fetch(array $parameter_names = [])
             if (array_key_exists($parameter, $request_parameters) === true &&
                 $request_parameters[$parameter] !== null &&
                 $request_parameters[$parameter] !== 'nill') {
-                self::$parameters[$parameter] = $request_parameters[$parameter];
+
+                switch ($parameter) {
+                    case 'include_resources';
+                    case 'include_sub_categories';
+                        self::$parameters[$parameter] = filter_var($request_parameters[$parameter], FILTER_VALIDATE_BOOLEAN);
+                        break;
+
+                    default:
+                        self::$parameters[$parameter] = $request_parameters[$parameter];
+                        break;
+                }
             }
         }
     }
@@ -55,16 +64,9 @@ private static function validate()
                     break;
 
                 case 'include_sub_categories':
-                    if (array_key_exists($key, self::$parameters) === true) {
-                        if (boolval(self::$parameters['include_sub_categories']) === false) {
-                            unset(self::$parameters[$key]);
-                        }
-                    }
-                    break;
-
                 case 'include_resources':
                     if (array_key_exists($key, self::$parameters) === true) {
-                        if (boolval(self::$parameters['include_resources']) === false) {
+                        if (filter_var(self::$parameters[$key], FILTER_VALIDATE_BOOLEAN) === false) {
                             unset(self::$parameters[$key]);
                         }
                     }

diff --git a/app/Transformers/Category.php b/app/Transformers/Category.php
@@ -44,7 +44,8 @@ public function toArray(): array
 
         if (
             isset($this->parameters['include_sub_categories']) &&
-            $this->parameters['include_sub_categories'] === true) {
+            $this->parameters['include_sub_categories'] === true
+        ) {
             $subCategoriesCollection = $this->category->sub_categories;
 
             $subCategoriesCollection->map(

diff --git a/config/api/version.php b/config/api/version.php
@@ -1,9 +1,9 @@
 <?php
 
 return [
-    'version'=> '1.04.0',
+    'version'=> '1.04.1',
     'prefix' => 'v1',
-    'release_date' => '2018-09-25',
+    'release_date' => '2018-10-08',
     'changelog' => 'https://github.com/costs-to-expect/api/blob/master/CHANGELOG.md',
     'readme' => 'https://github.com/costs-to-expect/api/blob/master/README.md'
 ];