Merge pull request #77 from gam6itko/master

php7.1; tests; travis

Author: gam6itko

.gitattributes

@@ -0,0 +1,4 @@
+.*                  export-ignore
+/examples           export-ignore
+/tests              export-ignore
+phpunit.xml.dist    export-ignore

.gitignore

@@ -1,3 +1,4 @@
+/.idea
 /vendor
 /.php_cs.cache
 /composer.lock

.php_cs

@@ -0,0 +1,15 @@
+<?php
+
+$rules = [
+    '@PSR2' => true,
+];
+
+$finder = PhpCsFixer\Finder::create()
+    ->in('src')
+    ->in('tests');
+
+return PhpCsFixer\Config::create()
+    ->setFinder($finder)
+    ->setRiskyAllowed(true)
+    ->setRules($rules)
+    ->setUsingCache(true);

.travis.yml

@@ -0,0 +1,11 @@
+language: php
+php:
+    - '7.1'
+    - '7.2'
+    - '7.3'
+    - '7.4snapshot'
+directories:
+    - $HOME/.composer/cache/files
+script:
+    - composer install
+    - vendor/bin/phpunit --configuration phpunit.xml.dist

README.md

@@ -13,8 +13,6 @@ $ composer require hisamu/php-xbase
 Sample usage
 -----
 ``` php
-<?php
-
 use XBase\Table;
 
 $table = new Table(dirname(__FILE__).'/test.dbf');
@@ -38,8 +36,6 @@ Performance
 You can pass an array of the columns that you need to the constructor, then if your table has columns that you don't use they will not be loaded. This way the parser can run a lot faster.
 
 ``` php
-<?php
-
 use XBase\Table;
 
 $table = new Table(dirname(__FILE__).'/test.dbf', array('my_column', 'another_column'));
@@ -65,8 +61,6 @@ Writing Data
 To open a table for writing, you have to use a `WritableTable` object, as on this example:
 
 ``` php
-<?php
-
 use XBase\WritableTable;
 
 $table = new WritableTable(dirname(__FILE__).'/test.dbf');
@@ -82,6 +76,23 @@ for ($i = 0; $i < 10; $i++) {
 $table->close();
 ```
 
+Delete record
+-----
+
+``` php
+use XBase\WritableTable;
+
+$table = new WritableTable('file.dbf');
+$table->openWrite();
+while ($record = $table->nextRecord()) {
+    if ($record->getBoolean('delete_this_row')){
+        $table->deleteRecord(); //mark record deleted
+    }    
+}
+$table->pack(); //save
+$table->close();
+```
+
 Troubleshooting
 -----
 

composer.json

@@ -2,7 +2,7 @@
     "name": "hisamu/php-xbase",
     "type": "library",
     "description": "A simple parser for *.dbf, *.fpt files using PHP",
-    "keywords": ["dbase", "foxpro"],
+    "keywords": ["dbase", "dbf","foxpro"],
     "homepage": "https://github.com/luads/php-xbase",
     "license": "MIT",
     "authors" : [
@@ -16,11 +16,24 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=7.1"
     },
     "autoload": {
-        "psr-0": {
-            "XBase": "src/"
+        "psr-4": {
+            "XBase\\": "src/XBase"
+        }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^7.0"
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "XBase\\Tests\\": "tests/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.1.x-dev"
         }
     }
 }

phpunit.xml.dist

@@ -0,0 +1,7 @@
+<phpunit bootstrap="vendor/autoload.php">
+    <testsuites>
+        <testsuite name="php-xbase">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

src/XBase/Column.php

@@ -8,7 +8,7 @@ class Column
     public $name;
     /** @var string */
     public $rawname;
-    /** @var  */
+    /** @var string */
     public $type;
     /** @var int */
     public $length;

src/XBase/Record.php

@@ -46,15 +46,15 @@ class Record
      * Record constructor.
      *
      * @param Table $table
-     * @param $recordIndex
-     * @param bool $rawData
+     * @param       $recordIndex
+     * @param bool  $rawData
      */
     public function __construct(Table $table, $recordIndex, $rawData = false)
     {
         $this->table = $table;
         $this->memoFile = $table->memoFile;
         $this->recordIndex = $recordIndex;
-        $this->choppedData = array();
+        $this->choppedData = [];
 
         if ($rawData && strlen($rawData) > 0) {
             $this->inserted = false;
@@ -131,8 +131,14 @@ public function getRecordIndex()
         return $this->recordIndex;
     }
 
+    public function setRecordIndex($index)
+    {
+        $this->recordIndex = $index;
+    }
+
     /**
      * @param string $columnName
+     *
      * @return mixed
      */
     public function getString($columnName)
@@ -345,7 +351,7 @@ public function getNum($columnName)
     {
         $s = $this->forceGetString($columnName);
 
-        if (!$s) {
+        if (!is_string($s)) {
             return false;
         }
 
@@ -364,7 +370,7 @@ public function getNum($columnName)
 
     /**
      * @param string $columnName
-     * @param $length
+     * @param        $length
      *
      * @return bool|float|int
      */
@@ -426,7 +432,7 @@ public function setStringByIndex($columnIndex, $value)
 
     /**
      * @param Column $columnObj
-     * @param $value
+     * @param        $value
      */
     public function setString($columnObj, $value)
     {
@@ -443,7 +449,7 @@ public function setString($columnObj, $value)
 
     /**
      * @param Column $columnObj
-     * @param $value
+     * @param        $value
      */
     public function forceSetString($columnObj, $value)
     {
@@ -456,7 +462,7 @@ public function forceSetString($columnObj, $value)
 
     /**
      * @param string $columnName
-     * @param $value
+     * @param        $value
      *
      * @return bool
      */
@@ -467,7 +473,7 @@ public function setObjectByName($columnName, $value)
 
     /**
      * @param int $columnIndex
-     * @param $value
+     * @param     $value
      *
      * @return bool
      */
@@ -478,7 +484,7 @@ public function setObjectByIndex($columnIndex, $value)
 
     /**
      * @param Column $columnObj
-     * @param $value
+     * @param        $value
      *
      * @return bool
      */
@@ -511,19 +517,23 @@ public function setObject($columnObj, $value)
                 return false;
         }
 
-        trigger_error('cannot handle datatype' . $columnObj->getType(), E_USER_ERROR);
+        trigger_error('cannot handle datatype'.$columnObj->getType(), E_USER_ERROR);
     }
 
     /**
      * @param Column $columnObj
-     * @param $value
+     * @param        $value
      *
      * @return bool
      */
     public function setDate($columnObj, $value)
     {
         if ($columnObj->getType() != self::DBFFIELD_TYPE_DATE) {
-            trigger_error($columnObj->getName() . ' is not a Date column', E_USER_ERROR);
+            trigger_error($columnObj->getName().' is not a Date column', E_USER_ERROR);
+        }
+
+        if ($value instanceof \DateTimeInterface) {
+            $value = $value->format('U');
         }
 
         if (strlen($value) == 0) {
@@ -536,14 +546,14 @@ public function setDate($columnObj, $value)
 
     /**
      * @param Column $columnObj
-     * @param $value
+     * @param        $value
      *
      * @return bool
      */
     public function setDateTime($columnObj, $value)
     {
         if ($columnObj->getType() != self::DBFFIELD_TYPE_DATETIME) {
-            trigger_error($columnObj->getName() . ' is not a DateTime column', E_USER_ERROR);
+            trigger_error($columnObj->getName().' is not a DateTime column', E_USER_ERROR);
         }
 
         if (strlen($value) == 0) {
@@ -555,19 +565,19 @@ public function setDateTime($columnObj, $value)
         $d = $this->zerodate + (mktime(0, 0, 0, $a['mon'], $a['mday'], $a['year']) / 86400);
         $d = pack('i', $d);
         $t = pack('i', mktime($a['hours'], $a['minutes'], $a['seconds'], 0, 0, 0));
-        $this->choppedData[$columnObj->getColIndex()] = $d . $t;
+        $this->choppedData[$columnObj->getColIndex()] = $d.$t;
     }
 
     /**
      * @param Column $columnObj
-     * @param $value
+     * @param        $value
      *
      * @return bool
      */
     public function setBoolean($columnObj, $value)
     {
         if ($columnObj->getType() != self::DBFFIELD_TYPE_LOGICAL) {
-            trigger_error($columnObj->getName() . ' is not a DateTime column', E_USER_ERROR);
+            trigger_error($columnObj->getName().' is not a DateTime column', E_USER_ERROR);
         }
 
         switch (strtoupper($value)) {
@@ -590,27 +600,27 @@ public function setBoolean($columnObj, $value)
 
     /**
      * @param Column $columnObj
-     * @param $value
+     * @param        $value
      */
     public function setMemo($columnObj, $value)
     {
         if ($columnObj->getType() != self::DBFFIELD_TYPE_MEMO) {
-            trigger_error($columnObj->getName() . ' is not a Memo column', E_USER_ERROR);
+            trigger_error($columnObj->getName().' is not a Memo column', E_USER_ERROR);
         }
 
         $this->forceSetString($columnObj, $value);
     }
 
     /**
      * @param Column $columnObj
-     * @param $value
+     * @param        $value
      *
      * @return bool
      */
     public function setFloat($columnObj, $value)
     {
         if ($columnObj->getType() != self::DBFFIELD_TYPE_FLOATING) {
-            trigger_error($columnObj->getName() . ' is not a Float column', E_USER_ERROR);
+            trigger_error($columnObj->getName().' is not a Float column', E_USER_ERROR);
         }
 
         if (strlen($value) == 0) {
@@ -624,14 +634,14 @@ public function setFloat($columnObj, $value)
 
     /**
      * @param Column $columnObj
-     * @param $value
+     * @param        $value
      *
      * @return bool
      */
     public function setInt($columnObj, $value)
     {
         if ($columnObj->getType() != self::DBFFIELD_TYPE_NUMERIC) {
-            trigger_error($columnObj->getName() . ' is not a Number column', E_USER_ERROR);
+            trigger_error($columnObj->getName().' is not a Number column', E_USER_ERROR);
         }
 
         if (strlen($value) == 0) {
@@ -648,7 +658,7 @@ public function setInt($columnObj, $value)
      */
     public function serializeRawData()
     {
-        return ($this->deleted ? '*' : ' ') . implode('', $this->choppedData);
+        return ($this->deleted ? '*' : ' ').implode('', $this->choppedData);
     }
 
     /**
@@ -658,7 +668,7 @@ public function serializeRawData()
      */
     public function getData()
     {
-        $fields = array();
+        $fields = [];
 
         foreach ($this->getColumns() as $column) {
             $fields[$column->name] = $this->getObject($column);
@@ -674,7 +684,7 @@ public function getData()
      */
     public function getChoppedData()
     {
-        $fields = array();
+        $fields = [];
 
         foreach ($this->choppedData as $columnName => $columnValue) {
             $fields[$columnName] = $this->forceGetString($columnName);