Remove "modern" PHP syntax

flat3 · Aug 7, 2024 · f64d6de · f64d6de
1 parent c7fd254
commit f64d6de
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/src/Attributes/LodataProperty.php b/src/Attributes/LodataProperty.php
@@ -41,7 +41,7 @@ public function __construct(
         $alternativeKey = false,
         $searchable = false,
         $filterable = true,
-        ?bool $immutable = false,
+        ?bool $immutable = false
     ) {
         $this->name = $name;
         $this->description = $description;
@@ -182,7 +182,7 @@ public function addProperty(EntitySet $entitySet): Property
         if ($this->hasScale()) {
             $property->setScale($this->getScale());
         }
-        
+
         $property->setAlternativeKey($this->isAlternativeKey());
         $property->setFilterable($this->isFilterable());
         $property->setSearchable($this->isSearchable());

diff --git a/src/PrimitiveType.php b/src/PrimitiveType.php
@@ -100,9 +100,8 @@ public function getOpenAPISchema(): array
         return $this->instance()->getOpenAPISchema();
     }
 
-    #[\Override]
     public function allowsValue($value): bool
     {
         return $this->instance()->allows($value);
     }
-}
+}
diff --git a/src/Property.php b/src/Property.php
@@ -370,10 +370,11 @@ public function isSearchable(): bool
      */
     public function assertAllowsValue($value)
     {
-        if ($this->isNullable() && $value === null) {
-            return;
-        }
         if ($value === null) {
+            if ($this->isNullable()) {
+                return;
+            }
+
             throw new BadRequestException(
                 'property_not_nullable',
                 sprintf("The property '%s' cannot be set to null", $this->getName())
@@ -389,8 +390,8 @@ public function assertAllowsValue($value)
 
         if (!$this->type->allowsValue($value)) {
             throw new BadRequestException(
-                'property_not_valid_for_type',
-                sprintf("Property value '%s' is not valid for the type", $this->getName()),
+                'property_value_invalid',
+                sprintf("The value property '%s' is not valid", $this->getName()),
             );
         }
     }

diff --git a/src/Type.php b/src/Type.php
@@ -229,8 +229,8 @@ public function is(string $class): bool
     {
         return is_a($this->factory, $class, true);
     }
-    
-    public function allowsValue(mixed $value): bool
+
+    public function allowsValue($value): bool
     {
         return true;
     }

diff --git a/src/Type/Guid.php b/src/Type/Guid.php
@@ -82,7 +82,6 @@ public function getOpenAPISchema(?Property $property = null): array
         ]);
     }
 
-    #[\Override]
     public function allows($value): bool
     {
         return Lexer::patternCheck(Lexer::guid, (string) $value);