Adds a toggle to allow shape files with no dbf (#41)

Adds a toggle to allow shape files with no dbf Fixes #36 Closes #38
phpmyadmin · Dec 8, 2024 · a21b619 · a21b619
1 parent 20cad01
commit a21b619
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/data/no-dbf.shp b/data/no-dbf.shp
diff --git a/data/no-dbf.shx b/data/no-dbf.shx
diff --git a/src/ShapeFile.php b/src/ShapeFile.php
@@ -87,6 +87,9 @@ class ShapeFile
     /** @var array */
     public $records = [];
 
+    /** @var bool */
+    private $allowNoDbf = false;
+
     /**
      * Checks whether dbase manipulations are supported.
      */
@@ -121,6 +124,11 @@ public function __construct(
         $this->fileLength = 50;
     }
 
+    public function setAllowNoDbf(bool $allowNoDbf): void
+    {
+        $this->allowNoDbf = $allowNoDbf;
+    }
+
     /**
      * Loads shapefile and dbase (if supported).
      *
@@ -326,8 +334,16 @@ public function getIndexFromDBFData(string $field, $value): int
      */
     private function loadDBFHeader(): array
     {
-        $DBFFile = fopen($this->getFilename('.dbf'), 'r');
+        if (! self::supportsDbase()) {
+            return [];
+        }
 
+        $dbfName = $this->getFilename('.dbf');
+        if (! file_exists($dbfName)) {
+            return [];
+        }
+
+        $DBFFile = fopen($dbfName, 'r');
         $result = [];
         $i = 1;
         $inHeader = true;
@@ -405,9 +421,7 @@ private function loadHeaders(): bool
         $this->boundingBox['mmin'] = Util::loadData('d', $this->readSHP(8));
         $this->boundingBox['mmax'] = Util::loadData('d', $this->readSHP(8));
 
-        if (self::supportsDbase()) {
-            $this->dbfHeader = $this->loadDBFHeader();
-        }
+        $this->dbfHeader = $this->loadDBFHeader();
 
         return true;
     }
@@ -620,6 +634,10 @@ private function openDBFFile(): bool
 
         $dbfName = $this->getFilename('.dbf');
         if (! is_readable($dbfName)) {
+            if ($this->allowNoDbf) {
+                return true;
+            }
+
             $this->setError(sprintf('It wasn\'t possible to find the DBase file "%s"', $dbfName));
 
             return false;

diff --git a/tests/ShapeFileTest.php b/tests/ShapeFileTest.php
@@ -548,4 +548,15 @@ public function testSearch(): void
             $shp->getIndexFromDBFData('CNTRY_NAME', 'Czech Republic')
         );
     }
+
+    public function testAllowsNoDbf(): void
+    {
+        if (! ShapeFile::supportsDbase()) {
+            self::markTestSkipped();
+        }
+
+        $shp = new ShapeFile(0);
+        $shp->setAllowNoDbf(true);
+        self::assertTrue($shp->loadFromFile('data/no-dbf.*'));
+    }
 }