Share code for creating of database

- use same code for both code paths
- properly handle return values

Signed-off-by: Michal Čihař <[email protected]>

Author: nijel

src/ShapeFile.php

@@ -356,8 +356,8 @@ private function _saveRecords() {
         if (file_exists($dbf_name)) {
             unlink($dbf_name);
         }
-        if (!($this->DBFFile = @dbase_create($dbf_name, $this->DBFHeader))) {
-            $this->setError(sprintf('It wasn\'t possible to create the DBase file "%s"', $dbf_name));
+        $this->DBFFile = $this->_createDBFFile();
+        if ($this->DBFFile === false) {
             return false;
         }
 
@@ -417,6 +417,23 @@ private function _closeSHXFile() {
         }
     }
 
+    /**
+     * Creates DBF file
+     *
+     * @return int|false
+     */
+    private function _createDBFFile()
+    {
+        $dbf_name = $this->_getFilename('.dbf');
+        $result = @dbase_create($dbf_name, $this->DBFHeader);
+        if ($result === false ) {
+            $this->setError(sprintf('It wasn\'t possible to create the DBase file "%s"', $dbf_name));
+            return false;
+        }
+        return $result;
+
+    }
+
     /**
      * Loads DBF file if supported
      *
@@ -429,8 +446,7 @@ private function _openDBFFile($toWrite = false) {
         $dbf_name = $this->_getFilename('.dbf');
         $checkFunction = $toWrite ? 'is_writable' : 'is_readable';
         if (($toWrite) && (!file_exists($dbf_name))) {
-            if (!@dbase_create($dbf_name, $this->DBFHeader)) {
-                $this->setError(sprintf('It wasn\'t possible to create the DBase file "%s"', $dbf_name));
+            if ($this->_createDBFFile() === false) {
                 return false;
             }
         }