Add more tests for data validation

Author: papac

src/Cache/Adapters/FilesystemAdapter.php

@@ -73,10 +73,8 @@ private function makeHashFilename(string $key, bool $make_group_directory = fals
 
         $group = Str::slice($hash, 0, 2);
 
-        if ($make_group_directory) {
-            if (!is_dir($this->directory . '/' . $group)) {
-                @mkdir($this->directory . '/' . $group);
-            }
+        if ($make_group_directory && !is_dir($this->directory . '/' . $group)) {
+            @mkdir($this->directory . '/' . $group);
         }
 
         return $this->directory . '/' . $group . '/' . $hash;
@@ -153,22 +151,15 @@ public function get(string $key, mixed $default = null): mixed
     {
         if (!$this->has($key)) {
             $this->with_meta = false;
-
-            if (is_callable($default)) {
-                return $default();
-            }
-
-            return $default;
+            return is_callable($default) ? $default() : $default;
         }
 
         $cache = unserialize(file_get_contents($this->makeHashFilename($key)));
 
         $expire_at = $cache['__bow_meta']['expire_at'];
 
-        if ($expire_at != '+') {
-            if (time() > $expire_at) {
-                return null;
-            }
+        if ($expire_at != '+' && time() > $expire_at) {
+            return null;
         }
 
         if (!$this->with_meta) {

src/Cache/Cache.php

@@ -9,7 +9,6 @@
 use Bow\Cache\Adapters\DatabaseAdapter;
 use Bow\Cache\Adapters\FilesystemAdapter;
 use Bow\Cache\Adapters\RedisAdapter;
-use ErrorException;
 use InvalidArgumentException;
 
 class Cache
@@ -86,12 +85,12 @@ public static function store(string $store): CacheAdapterInterface
      * Get the cache instance
      *
      * @return CacheAdapterInterface
-     * @throws ErrorException
+     * @throws CacheException
      */
     public static function getInstance(): CacheAdapterInterface
     {
         if (is_null(static::$instance)) {
-            throw new ErrorException("Unable to get cache instance before configuration");
+            throw new CacheException("Unable to get cache instance before configuration");
         }
 
         return static::$instance;
@@ -122,7 +121,7 @@ public static function addAdapters(array $adapters): void
     public static function __callStatic(string $name, array $arguments)
     {
         if (is_null(static::$instance)) {
-            throw new ErrorException(
+            throw new CacheException(
                 "Unable to get cache instance before configuration"
             );
         }

src/Cache/CacheException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Bow\Cache;
+
+class CacheException extends \Exception
+{
+}

src/Queue/Adapters/BeanstalkdAdapter.php

@@ -69,7 +69,7 @@ public function size(?string $queue = null): int
      */
     public function push(QueueJob $producer): void
     {
-        $queues = (array)cache("beanstalkd:queues");
+        $queues = (array) cache("beanstalkd:queues");
 
         if (!in_array($producer->getQueue(), $queues)) {
             $queues[] = $producer->getQueue();

src/Support/helpers.php

@@ -976,12 +976,12 @@ function app_storage(string $disk): DiskFilesystemService
      * Cache help
      *
      * @param  ?string $key
-     * @param  ?string  $value
+     * @param  mixed  $value
      * @param  ?int    $ttl
      * @return mixed
      * @throws ErrorException
      */
-    function cache(?string $key, ?string $value = null, ?int $ttl = null): mixed
+    function cache(?string $key, mixed $value = null, ?int $ttl = null): mixed
     {
         $instance = Cache::getInstance();
 

src/Validation/Rules/DatetimeRule.php

@@ -21,7 +21,7 @@ protected function compileDate(string $key, string $masque): void
             return;
         }
 
-        if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $this->inputs[$key])) {
+        if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $this->inputs[$key])) {
             return;
         }
 
@@ -50,12 +50,7 @@ protected function compileDateTime(string $key, string $masque): void
             return;
         }
 
-        if (
-            !preg_match(
-                '/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/i',
-                $this->inputs[$key]
-            )
-        ) {
+        if (preg_match('/^\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}$/i', $this->inputs[$key])) {
             return;
         }