Merge branch '5.x'

# Conflicts:
#	CHANGELOG.md
#	src/Entries/Entry.php

Author: jasonvarga

src/Entries/Entry.php

@@ -628,11 +628,19 @@ public function hasTime()
             return false;
         }
 
-        if ($this->blueprint()->field('date')->fieldtype()->timeEnabled()) {
-            return true;
+        $timeEnabled = (function () {
+            if ($this->blueprint()->field('date')->fieldtype()->timeEnabled()) {
+                return true;
+            }
+
+            return $this->date && ! $this->date->isStartOfDay();
+        })();
+
+        if ($this->origin && ! $this->origin()) {
+            Blink::forget("entry-{$this->id()}-blueprint");
         }
 
-        return $this->date && ! $this->date->isStartOfDay();
+        return $timeEnabled;
     }
 
     public function hasSeconds()

src/Fields/Field.php

@@ -442,7 +442,7 @@ public function toGql(): array
             $type = ['type' => $type];
         }
 
-        if ($this->isRequired() && ! $this->hasSometimesRule()) {
+        if ($this->isRequired() && ! $this->hasSometimesRule() && $this->config['type'] !== 'assets') {
             $type['type'] = GraphQL::nonNull($type['type']);
         }
 

src/Http/Controllers/CP/Forms/FormSubmissionsController.php

@@ -48,15 +48,17 @@ protected function indexQuery($form)
         $query = $form->querySubmissions();
 
         if ($search = request('search')) {
-            $query->where('date', 'like', '%'.$search.'%');
-
-            $form->blueprint()->fields()->all()
-                ->filter(function (Field $field): bool {
-                    return in_array($field->type(), ['text', 'textarea', 'integer']);
-                })
-                ->each(function (Field $field) use ($query, $search): void {
-                    $query->orWhere($field->handle(), 'like', '%'.$search.'%');
-                });
+            $query->where(function ($query) use ($form, $search) {
+                $query->where('date', 'like', '%'.$search.'%');
+
+                $form->blueprint()->fields()->all()
+                    ->filter(function (Field $field): bool {
+                        return in_array($field->type(), ['text', 'textarea', 'integer']);
+                    })
+                    ->each(function (Field $field) use ($query, $search): void {
+                        $query->orWhere($field->handle(), 'like', '%'.$search.'%');
+                    });
+            });
         }
 
         return $query;

src/Imaging/Attributes.php

@@ -41,7 +41,19 @@ public function from(FilesystemAdapter $source, string $path)
 
     private function imageAttributes(string $path)
     {
-        [$width, $height] = getimagesize($this->prefixPath($path));
+        $fullPath = $this->prefixPath($path);
+
+        if (! file_exists($fullPath)) {
+            return ['width' => 0, 'height' => 0];
+        }
+
+        $size = @getimagesize($fullPath);
+
+        if ($size === false) {
+            return ['width' => 0, 'height' => 0];
+        }
+
+        [$width, $height] = $size;
 
         return compact('width', 'height');
     }

src/Structures/CollectionStructure.php

@@ -72,9 +72,8 @@ public function validateTree(array $tree, string $locale): array
             throw new \Exception("Duplicate entry [{$entryId}] in [{$this->collection()->handle()}] collection's structure.");
         }
 
-        $thisCollectionsEntries = $this->collection()->queryEntries()
-            ->where('site', $locale)
-            ->pluck('id');
+        $thisCollectionsEntries = Blink::once('collection-structure-tree-entries::'.$this->handle().'::'.$locale, fn () => $this->collection()->queryEntries())
+            ->where('site', $locale)->pluck('id');
 
         $otherCollectionEntries = $entryIds->diff($thisCollectionsEntries);
 

src/Tags/Cache.php

@@ -14,7 +14,7 @@ class Cache extends Tags implements CachesOutput
     public function index()
     {
         if (! $this->isEnabled()) {
-            return [];
+            return $this->parse([]);
         }
 
         $store = LaraCache::store($this->params->get('store'));
@@ -64,7 +64,11 @@ private function isEnabled()
             return false;
         }
 
-        // Only GET requests. This disables the cache during live preview.
+        if (request()->isLivePreview()) {
+            return false;
+        }
+
+        // Only GET requests.
         return request()->method() === 'GET';
     }