Merge branch 'release/1.3.7'

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.3.7
+## 10/28/2023
+
+1. [](#improved)
+   * PHP 8.4 fixes - Implicitly nullable parameter declarations deprecate
+
 # v1.3.6
 ## 10/11/2023
 

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Flex Objects
 slug: flex-objects
 type: plugin
-version: 1.3.6
+version: 1.3.7
 description: Flex Objects plugin allows you to manage Flex Objects in Grav Admin.
 icon: list-alt
 author:

classes/Admin/AdminController.php

@@ -1472,7 +1472,7 @@ public function isFormSubmit(): bool
      * @param FlexObjectInterface|null $object
      * @return FlexFormInterface
      */
-    public function getForm(FlexObjectInterface $object = null): FlexFormInterface
+    public function getForm(?FlexObjectInterface $object = null): FlexFormInterface
     {
         $object = $object ?? $this->getObject();
         if (!$object) {
@@ -1508,7 +1508,7 @@ public function getForm(FlexObjectInterface $object = null): FlexFormInterface
      * @param FlexDirectoryInterface|null $directory
      * @return FlexFormInterface
      */
-    public function getDirectoryForm(FlexDirectoryInterface $directory = null): FlexFormInterface
+    public function getDirectoryForm(?FlexDirectoryInterface $directory = null): FlexFormInterface
     {
         $directory = $directory ?? $this->getDirectory();
         if (!$directory) {
@@ -1541,7 +1541,7 @@ public function getDirectoryForm(FlexDirectoryInterface $directory = null): Flex
      * @param string|null $key
      * @return FlexObjectInterface|null
      */
-    public function getObject(string $key = null): ?FlexObjectInterface
+    public function getObject(?string $key = null): ?FlexObjectInterface
     {
         if (null === $this->object) {
             $key = $key ?? $this->id;
@@ -1588,7 +1588,7 @@ public function getObject(string $key = null): ?FlexObjectInterface
      * @param string|null $type
      * @return FlexDirectoryInterface|null
      */
-    public function getDirectory(string $type = null): ?FlexDirectoryInterface
+    public function getDirectory(?string $type = null): ?FlexDirectoryInterface
     {
         $type = $type ?? $this->target;
 

classes/Controllers/AbstractController.php

@@ -153,7 +153,7 @@ public function getRequest(): ServerRequestInterface
      * @param mixed $default
      * @return mixed
      */
-    public function getPost(string $name = null, $default = null)
+    public function getPost(?string $name = null, $default = null)
     {
         $body = $this->request->getParsedBody();
 
@@ -176,7 +176,7 @@ public function isFormSubmit(): bool
      * @param string|null $type
      * @return FlexForm
      */
-    public function getForm(string $type = null): FlexFormInterface
+    public function getForm(?string $type = null): FlexFormInterface
     {
         $object = $this->getObject();
         if (!$object) {

classes/Controllers/ObjectController.php

@@ -470,7 +470,7 @@ public function actionDisplayPreview(): ResponseInterface
      * @return void
      * @throws RuntimeException
      */
-    public function checkAuthorization(string $action, string $scope = null): void
+    public function checkAuthorization(string $action, ?string $scope = null): void
     {
         $object = $this->getObject();
 

classes/Flex.php

@@ -110,7 +110,7 @@ public function hasDirectory(string $type): bool
      * @param bool $keepMissing
      * @return array<FlexDirectoryInterface|null>
      */
-    public function getDirectories(array $types = null, bool $keepMissing = false): array
+    public function getDirectories(?array $types = null, bool $keepMissing = false): array
     {
         return $this->flex->getDirectories($types, $keepMissing);
     }
@@ -147,7 +147,7 @@ public function getDirectory(string $type): ?FlexDirectory
      * @param string|null $keyField
      * @return FlexCollectionInterface|null
      */
-    public function getCollection(string $type, array $keys = null, string $keyField = null): ?FlexCollectionInterface
+    public function getCollection(string $type, ?array $keys = null, ?string $keyField = null): ?FlexCollectionInterface
     {
         return $this->flex->getCollection($type, $keys, $keyField);
     }
@@ -185,7 +185,7 @@ public function getObjects(array $keys, array $options = []): array
      * @param string|null $keyField
      * @return FlexObjectInterface|null
      */
-    public function getObject(string $key, string $type = null, string $keyField = null): ?FlexObjectInterface
+    public function getObject(string $key, ?string $type = null, ?string $keyField = null): ?FlexObjectInterface
     {
         return $this->flex->getObject($key, $type, $keyField);
     }