Fix Get DateTime Value From Visual FoxPro

nchizhov · Mar 15, 2020 · 96122f8 · 96122f8
1 parent 514dab8
commit 96122f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
   "homepage": "http://blog.kgd.in",
   "type": "library",
   "license": "MIT",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "authors": [
     {
       "name": "Chizhov Nikolay",

diff --git a/src/Records.php b/src/Records.php
@@ -16,6 +16,7 @@ class Records {
   private $v_fox = false;
   private $nullFlagColumns = [];
   private $logicals = ['t', 'y', 'д'];
+  private $notTrimTypes = ["M", "P", "G", "I", "Y", "T", "0"];
 
   public function __construct($data, $encode = "utf-8", $headers = null, $columns = null) {
     if ($data instanceof Table) {
@@ -50,7 +51,7 @@ public function nextRecord() {
     $record["deleted"] = (unpack("C", $data[0])[1] == 42);
     $pos = 1;
     foreach ($this->columns as $column) {
-      $sub_data = (in_array($column["type"], ["M", "P", "G", "I", "Y", "0"])) ? substr($data, $pos, $column["length"]) : trim(substr($data, $pos, $column["length"]));
+      $sub_data = (in_array($column["type"], $this->notTrimTypes)) ? substr($data, $pos, $column["length"]) : trim(substr($data, $pos, $column["length"]));
       switch($column["type"]) {
         case "F":
         case "N":
@@ -64,7 +65,7 @@ public function nextRecord() {
           $record[$column["name"]] = unpack("l", $sub_data)[1];
           break;
         case "T":
-          $record[$column["name"]] = (empty($sub_data)) ? null : $this->getDateTime($sub_data);
+          $record[$column["name"]] = $this->getDateTime($sub_data);
           break;
         case "D":
           $record[$column["name"]] = empty($sub_data) ? null : $sub_data;
@@ -118,6 +119,9 @@ private function convertChar($data) {
   }
 
   private function getDateTime($data) {
+    if (empty(trim($data))) {
+      return null;
+    }
     $dateData = unpack("L", substr($data, 0, 4))[1];
     $timeData = unpack("L", substr($data, 4, 4))[1];
     return gmdate("YmdHis", jdtounix($dateData) + intval($timeData / 1000));