Refactor getFiltered for symfony 7.x

Author: Admin

config/laravel_crud_wizard.php

@@ -2,4 +2,6 @@
 
 return [
     'LIVE_MODE' => \env('LIVE_MODE'),
+    'REQUEST_GET_FILTERED_MACRO_SHOULD_THROW_ON_FAILURE' =>
+        \env('REQUEST_GET_FILTERED_MACRO_SHOULD_THROW_ON_FAILURE', false),
 ];

src/Providers/CrudProvider.php

@@ -73,7 +73,7 @@ function (...$arguments): Model {
         Request::macro(
             'getFiltered',
             /**
-             * @param string|int $filter can be 'alpha', 'alnum', 'digits', 'int', 'boolean' or an int flag
+             * @param string|int $filter can be 'alpha', 'alnum', 'digits' or an int flag
              * @see ParameterBag::filter(), \filter_var() for $filter and $options
              * @see ParameterBag::getAlpha()
              * @see ParameterBag::getAlnum()
@@ -89,16 +89,28 @@ function (
             ): mixed {
                 /** @var Request $this */
                 if (\is_int($filter)) {
-                    if ($this->attributes->has($key)) {
-                        return $this->attributes->filter($key, $default, $filter, $options);
-                    }
-
-                    if ($this->query->has($key)) {
-                        return $this->query->filter($key, $default, $filter, $options);
-                    }
-
-                    if ($this->request->has($key)) {
-                        return $this->request->filter($key, $default, $filter, $options);
+                    try {
+                        if ($this->attributes->has($key)) {
+                            return $this->attributes->filter($key, $default, $filter, $options);
+                        }
+
+                        if ($this->query->has($key)) {
+                            return $this->query->filter($key, $default, $filter, $options);
+                        }
+
+                        if ($this->request->has($key)) {
+                            return $this->request->filter($key, $default, $filter, $options);
+                        }
+                    } catch (\UnexpectedValueException $e) {
+                        if (\config('crud.REQUEST_GET_FILTERED_MACRO_SHOULD_THROW_ON_FAILURE', false)) {
+                            throw $e;
+                        }
+
+                        if (!\is_array($options) && $options) {
+                            $options = ['flags' => $options];
+                        }
+
+                        return ($options['flags'] ?? 0) & \FILTER_NULL_ON_FAILURE ? null : false;
                     }
 
                     return $default;
@@ -107,7 +119,7 @@ function (
                 if ($filter !== '') {
                     $filter = \ucfirst(\strtolower($filter));
 
-                    if (!\in_array($filter, ['Alpha', 'Alnum', 'Digits', 'Int', 'Boolean'], true)) {
+                    if (!\in_array($filter, ['Alpha', 'Alnum', 'Digits'], true)) {
                         $filter = '';
                     }
                 }
@@ -122,8 +134,10 @@ function (
                     if ($this->request->has($key)) {
                         return $this->request->{'get' . $filter}($key, $default);
                     }
+                } catch (\UnexpectedValueException) {
                 } catch (\Throwable $e) {
-                    Log::error($e->getMessage(), $e->getTrace());
+                    Log::error(__FILE__ . ':' . __LINE__ . ' Request::getFiltered macro error: ' .
+                        $e->getMessage() . ' for: ' . \json_encode(\func_get_args()), $e->getTrace());
                 }
 
                 return $default;