updated spatial index validation step

Author: ArnabChatterjee20k

src/Database/Validator/Index.php

@@ -338,26 +338,40 @@ public function getType(): string
     */
     public function checkSpatialIndex(Document $index): bool
     {
+        $type = $index->getAttribute('type');
+        if ($type !== Database::INDEX_SPATIAL) {
+            return true;
+        }
+
+        if (!$this->spatialIndexSupport) {
+            $this->message = 'Spatial indexes are not supported';
+            return false;
+        }
+
         $attributes = $index->getAttribute('attributes', []);
-        $orders = $index->getAttribute('orders', []);
+        $orders     = $index->getAttribute('orders', []);
+
         foreach ($attributes as $attributeName) {
-            $attribute = $this->attributes[\strtolower($attributeName)] ?? new Document();
-            $attributeType = $attribute->getAttribute('type');
-            $required = $attribute->getAttribute('required');
-            if (in_array($attributeType, Database::SPATIAL_TYPES) && !$this->spatialIndexSupport) {
-                $this->message = "Spatial index is not supported";
+            $attribute     = $this->attributes[\strtolower($attributeName)] ?? new Document();
+            $attributeType = $attribute->getAttribute('type', '');
+
+            if (!\in_array($attributeType, Database::SPATIAL_TYPES, true)) {
+                $this->message = 'Spatial index can only be created on spatial attributes (point, linestring, polygon). Attribute "' . $attributeName . '" is of type "' . $attributeType . '"';
                 return false;
             }
-            if (in_array($attributeType, Database::SPATIAL_TYPES) && !$required && !$this->spatialIndexNullSupport) {
+
+            $required = (bool) $attribute->getAttribute('required', false);
+            if (!$required && !$this->spatialIndexNullSupport) {
                 $this->message = 'Spatial indexes do not allow null values. Mark the attribute "' . $attributeName . '" as required or create the index on a column with no null values.';
                 return false;
             }
-            if (in_array($attributeType, Database::SPATIAL_TYPES) && !empty($orders) && !$this->spatialIndexOrderSupport) {
-                $this->message = 'Spatial indexes with explicit orders are not supported. Remove the orders to create this index.';
-                return false;
-            }
+        }
 
+        if (!empty($orders) && !$this->spatialIndexOrderSupport) {
+            $this->message = 'Spatial indexes with explicit orders are not supported. Remove the orders to create this index.';
+            return false;
         }
+
         return true;
     }
 }