nchizhov / inok-dbf

src/Records.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
     $pos = 1;
     foreach ($this->columns as $column) {
       $sub_data = (in_array($column["type"], $this->notTrimTypes)) ? substr($data, $pos, $column["length"]) : trim(substr($data, $pos, $column["length"]));
-      switch($column["type"]) {
+      switch ($column["type"]) {
         case "F":
         case "N":
           $record[$column["name"]] = (is_numeric($sub_data)) ? (($column["decimal"]) ? (float) $sub_data : (int) $sub_data) : null;
@@ -71,7 +71,7 @@ 
           $record[$column["name"]] = empty($sub_data) ? null : $sub_data;
           break;
         case "L":
-          $record[$column["name"]] =  ($sub_data == "?" || empty($sub_data)) ? null : (in_array(strtolower($sub_data), $this->logicals));
+          $record[$column["name"]] = ($sub_data == "?" || empty($sub_data)) ? null : (in_array(strtolower($sub_data), $this->logicals));
           break;
         case "C":
           $record[$column["name"]] = $this->convertChar($sub_data);
@@ -79,7 +79,7 @@ 
         case "M":
         case "P":
         case "G":
-          $sub_data = (strlen($sub_data) == 4) ? unpack("L", $sub_data)[1] : (int)$sub_data;
+          $sub_data = (strlen($sub_data) == 4) ? unpack("L", $sub_data)[1] : (int) $sub_data;
           if (!$sub_data) {
             $record[$column["name"]] = "";
           } else {

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
       $this->headers = $data->getHeaders();
       $this->columns = $data->getColumns();
       $this->fp = $data->getData();
-    }
-    else {
+    } else {
       if (is_null($headers) || is_null($columns)) {
         throw new \Exception('Not correct data in Record class');
       }

src/Table.php

Spacing +18 added lines, -18 removed lines

@@ -45,23 +45,23 @@ 
 
   private $charsets = [
     0   => 866, //If charset not defined
-    1   => 437,    2   => 850,    3   => 1252,    4   => 10000,    8   => 865,
-    9   => 437,    10  => 850,    11  => 437,     13  => 437,      14  => 850,
-    15  => 437,    16  => 850,    17  => 437,     18  => 850,      19  => 932,
-    20  => 850,    21  => 850,    22  => 437,     23  => 850,      24  => 437,
-    25  => 437,    26  => 850,    27  => 437,     28  => 863,      29  => 850,
-    31  => 852,    34  => 852,    35  => 852,     36  => 860,      37  => 850,
-    38  => 866,    55  => 850,    64  => 852,     77  => 936,      78  => 949,
-    79  => 950,    80  => 874,    88  => 1252,    89  => 1252,     100 => 852,
-    101 => 866,    102 => 865,    103 => 861,     104 => 895,      105 => 866,
-    106 => 737,    107 => 857,    108 => 863,     120 => 950,      121 => 949,
-    122 => 936,    123 => 932,    124 => 874,     134 => 737,      135 => 852,
-    136 => 857,    150 => 10007,  151 => 10029,   152 => 10006,    200 => 1250,
-    201 => 1251,   202 => 1254,   203 => 1253,    204 => 1257
+    1   => 437, 2   => 850, 3   => 1252, 4   => 10000, 8   => 865,
+    9   => 437, 10  => 850, 11  => 437, 13  => 437, 14  => 850,
+    15  => 437, 16  => 850, 17  => 437, 18  => 850, 19  => 932,
+    20  => 850, 21  => 850, 22  => 437, 23  => 850, 24  => 437,
+    25  => 437, 26  => 850, 27  => 437, 28  => 863, 29  => 850,
+    31  => 852, 34  => 852, 35  => 852, 36  => 860, 37  => 850,
+    38  => 866, 55  => 850, 64  => 852, 77  => 936, 78  => 949,
+    79  => 950, 80  => 874, 88  => 1252, 89  => 1252, 100 => 852,
+    101 => 866, 102 => 865, 103 => 861, 104 => 895, 105 => 866,
+    106 => 737, 107 => 857, 108 => 863, 120 => 950, 121 => 949,
+    122 => 936, 123 => 932, 124 => 874, 134 => 737, 135 => 852,
+    136 => 857, 150 => 10007, 151 => 10029, 152 => 10006, 200 => 1250,
+    201 => 1251, 202 => 1254, 203 => 1253, 204 => 1257
   ];
   private $dbase7 = false, $v_foxpro = false;
 
-  public function __construct($dbPath, $charset = null){
+  public function __construct($dbPath, $charset = null) {
     $this->db = $dbPath;
     if (!is_null($charset)) {
       if (!is_numeric($charset)) {
@@ -233,16 +233,16 @@ 
 
   private function fileExists($fileName) {
 
-    if(file_exists($fileName)) {
+    if (file_exists($fileName)) {
       return $fileName;
     }
 
     // Handle case insensitive requests
     $directoryName = dirname($fileName);
-    $fileArray = glob($directoryName . '/*', GLOB_NOSORT);
+    $fileArray = glob($directoryName.'/*', GLOB_NOSORT);
     $fileNameLowerCase = strtolower($fileName);
-    foreach($fileArray as $file) {
-      if(strtolower($file) == $fileNameLowerCase) {
+    foreach ($fileArray as $file) {
+      if (strtolower($file) == $fileNameLowerCase) {
         return $file;
       }
     }

Braces +5 added lines, -10 removed lines

@@ -132,20 +132,17 @@ 
     if ($this->headers["checks"][0] != 0) {
       $this->error = true;
       $this->error_info = "Not correct DBF file by headers";
-    }
-    else {
+    } else {
       $this->headers["charset_name"] = "cp".$this->charsets[$this->headers["charset"]];
 
       if (in_array("dBASE 7", $this->versions[$this->headers["version"]])) {
         $this->dbase7 = true;
         $this->headers["columns"] = ($this->headers["header_length"] - 68) / 48;
-      }
-      elseif (in_array("Visual FoxPro", $this->versions[$this->headers["version"]])) {
+      } elseif (in_array("Visual FoxPro", $this->versions[$this->headers["version"]])) {
         $this->v_foxpro = true;
         $this->headers["memo"] = (in_array($this->headers["mdx_flag"], [2, 3, 6, 7]));
         $this->headers["columns"] = ($this->headers["header_length"] - 296) / 32;
-      }
-      else {
+      } else {
         $this->headers["columns"] = ($this->headers["header_length"] - 33) / 32;
       }
 
@@ -178,8 +175,7 @@ 
             "mdx_flag" => unpack("C", $data[37])[1],
             "auto_increment" => unpack("L", substr($data, 40, 4))[1]
           ];
-        }
-        else {
+        } else {
           $this->columns[$i] = [
             "name" => strtolower(trim(substr($data, 0, 11))),
             "type" => $data[11],
@@ -196,8 +192,7 @@ 
               $this->columns[$i]["auto_increment_next"] = unpack("L", substr($data, 19, 4))[1];
               $this->columns[$i]["auto_increment_step"] = unpack("C", $data[23])[1];
             }
-          }
-          else {
+          } else {
             $this->columns[$i]["mdx_flag"] = unpack("C", $data[31])[1];
           }
         }