v0.2, better csv to json conversion, removed support for php 7.0

ozdemirburak · Oct 31, 2018 · add96ef · add96ef
1 parent 6e31ee2
commit add96ef
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 7.0
   - 7.1
   - 7.2
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,5 +2,15 @@
 
 All Notable changes to `json-csv` will be documented in this file.
 
+## 0.2.0
+- Remove support for PHP 7.0
+- Better CSV to JSON conversion method.
+
+## 0.1.1
+- Fix error with assoc. arrays (splat operator).
+
+## 0.1.0
+- Fix property error in JSON to CSV conversion.
+
 ## 0.0.1
 - Initial release with basic conversion methods.
diff --git a/composer.json b/composer.json
@@ -12,11 +12,11 @@
         }
     ],
     "require": {
-        "php" : "~7.0",
+        "php" : "~7.1",
         "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit" : "~5.0|~6.0"
+        "phpunit/phpunit" : "~6.0|~7.0"
     },
     "autoload": {
         "psr-4": { "OzdemirBurak\\JsonCsv\\": "src" }

diff --git a/src/File/Csv.php b/src/File/Csv.php
@@ -30,40 +30,58 @@ public function convert(): string
         $splitKeys = array_map(function ($key) {
             return explode($this->conversion['join'], $key);
         }, $keys);
+        return json_encode(array_map(function ($line) use ($splitKeys) {
+            return $this->getJsonObject($line, $splitKeys);
+        }, $data), $this->conversion['options']);
+    }
 
-        $jsonObjects = array_map(function ($line) use ($splitKeys) {
-            $values = $this->parseCsv($line);
-            $jsonObject = [];
-            for ($valueIndex = 0, $count = count($values); $valueIndex < $count; $valueIndex++) {
-                if ($values[$valueIndex] == "") {
-                    continue;
-                }
-                $this->setJsonValue($splitKeys[$valueIndex], 0, $jsonObject, $values[$valueIndex]);
+    /**
+     * @param       $line
+     * @param       $splitKeys
+     * @param array $jsonObject
+     *
+     * @return array
+     */
+    private function getJsonObject($line, $splitKeys, array $jsonObject = []): array
+    {
+        $values = $this->parseCsv($line);
+        for ($valueIndex = 0, $count = \count($values); $valueIndex < $count; $valueIndex++) {
+            if ($values[$valueIndex] === '') {
+                continue;
             }
-            return $jsonObject;
-        }, $data);
-
-        return json_encode($jsonObjects, $this->conversion['options']);
+            $this->setJsonValue($splitKeys[$valueIndex], 0, $jsonObject, $values[$valueIndex]);
+        }
+        return $jsonObject;
     }
 
-    private function setJsonValue($splitKey, $splitKeyIndex, &$jsonObject, $value)
+    /**
+     * @param $splitKey
+     * @param $splitKeyIndex
+     * @param $jsonObject
+     * @param $value
+     */
+    private function setJsonValue($splitKey, $splitKeyIndex, &$jsonObject, $value): void
     {
         $keyPart = $splitKey[$splitKeyIndex];
-
-        if (count($splitKey) > $splitKeyIndex+1) {
+        if (\count($splitKey) > $splitKeyIndex + 1) {
             if (!array_key_exists($keyPart, $jsonObject)) {
                 $jsonObject[$keyPart] = [];
             }
             $this->setJsonValue($splitKey, $splitKeyIndex+1, $jsonObject[$keyPart], $value);
         } else {
-            if ($this->conversion['numbers'] == 'numbers' && is_numeric($value)) {
+            if (is_numeric($value) && $this->conversion['numbers'] === 'numbers') {
                 $value = 0 + $value;
             }
             $jsonObject[$keyPart] = $value;
         }
     }
 
-    private function parseCsv($line)
+    /**
+     * @param $line
+     *
+     * @return array
+     */
+    private function parseCsv($line): array
     {
         return str_getcsv(
             $line,
@@ -73,7 +91,10 @@ private function parseCsv($line)
         );
     }
 
-    private function parseData()
+    /**
+     * @return array
+     */
+    private function parseData(): array
     {
         $data = explode("\n", $this->data);
         if (end($data) === '') {

diff --git a/tests/JsonReverseTest.php b/tests/JsonReverseTest.php
@@ -16,18 +16,13 @@ class JsonReverseTest extends TestCase
     private function checkReverseConversion($file, $join = '_')
     {
         $pathCsvOut = $this->path($file . '.out', 'csv');
-
         $jsonConverter = $this->initJson($file);
         $jsonConverter->setConversionKey('join', $join);
         $jsonConverter->convertAndSave($pathCsvOut);
-
-        $pathJsonOut = $this->path($file . '.out', 'json');
-
         $csvConverter = $this->initCsv($file . '.out');
         $csvConverter->setConversionKey('join', $join);
         $csvConverter->setConversionKey('numbers', 'numbers');
-        $csvConverter->convertAndSave($pathJsonOut);
-
+        $csvConverter->convertAndSave($pathJsonOut = $this->path($file . '.out', 'json'));
         try {
             $this->assertJsonFileEqualsJsonFile($this->path($file, 'json'), $pathJsonOut);
         } finally {
@@ -63,14 +58,12 @@ public function testProperties()
     }
 
     /**
-     * @group json-conversion-test
+     * @TODO resolve issues which cause this test to fail
+     * @group json-conversion-failing-test
      */
-/**
- * @TODO resolve issues which cause this test to fail
- *
     public function testStats()
     {
+        $this->markTestSkipped();
         $this->checkReverseConversion('stats');
     }
- */
 }