Updated to 1.1.7 version

Author: josantonius

.gitattributes

@@ -8,4 +8,5 @@ phpmd.xml export-ignore
 .travis.yml export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
-.gitignore export-ignore
+.gitignore export-ignore
+.php_cs.dist export-ignore

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.1.7 - 2018-01-04
+
+* JSON last error handling was implemented in a new class and replace collections with switch case: `JsonLastError`.
+
+* Tests were implemented for `JsonLastError` class.
+
 ## 1.1.6 - 2017-11-08
 
 * Implemented `PHP Mess Detector` to detect inconsistencies in code styles.

README-ES.md

@@ -79,6 +79,22 @@ Json::fileToArray($file);
 
 **# Return** (array|false)
 
+### - Comprobar si hay errores:
+
+```php
+JsonLastError::check();
+```
+
+**# Return** (array|null) → Null si no hay errores o array con código de estado y mensaje de error.
+
+### - Obtener recopilación de posibles errores:
+
+```php
+JsonLastError::getCollection();
+```
+
+**# Return** (array) → Recopilación de posibles errores.
+
 ## Cómo empezar
 
 Para utilizar esta biblioteca con **Composer**:
@@ -127,6 +143,22 @@ $array = Json::fileToArray($pathfile);
 
 ```
 
+### - Comprobar si hay errores:
+
+```php
+$lastError = JsonLastError::check();
+
+if (!is_null($lastError)) {
+    var_dump($lastError);
+}
+```
+
+### - Obtener recopilación de posibles errores:
+
+```php
+$jsonLastErrorCollection = JsonLastError::getCollection();
+```
+
 ## Tests 
 
 Para ejecutar las [pruebas](tests) necesitarás [Composer](http://getcomposer.org/download/) y seguir los siguientes pasos:
@@ -189,7 +221,7 @@ Este proyecto está licenciado bajo **licencia MIT**. Consulta el archivo [LICEN
 
 ## Copyright
 
-2016 - 2017 Josantonius, [josantonius.com](https://josantonius.com/)
+2016 - 2018 Josantonius, [josantonius.com](https://josantonius.com/)
 
 Si te ha resultado útil, házmelo saber :wink:
 

README.md

@@ -79,6 +79,22 @@ Json::fileToArray($file);
 
 **# Return** (array|false)
 
+### - Check for errors:
+
+```php
+JsonLastError::check();
+```
+
+**# Return** (array|null) → Null if there are no errors or array with state  code and error message.
+
+### - Get collection of JSON errors:
+
+```php
+JsonLastError::getCollection();
+```
+
+**# Return** (array) → Collection of JSON errors.
+
 ## Quick Start
 
 To use this library with **Composer**:
@@ -127,6 +143,22 @@ $array = Json::fileToArray($pathfile);
 
 ```
 
+### - Check for errors:
+
+```php
+$lastError = JsonLastError::check();
+
+if (!is_null($lastError)) {
+    var_dump($lastError);
+}
+```
+
+### - Get collection of JSON errors:
+
+```php
+$jsonLastErrorCollection = JsonLastError::getCollection();
+```
+
 ## Tests 
 
 To run [tests](tests) you just need [composer](http://getcomposer.org/download/) and to execute the following:
@@ -189,7 +221,7 @@ This project is licensed under **MIT license**. See the [LICENSE](LICENSE) file
 
 ## Copyright
 
-2016 - 2017 Josantonius, [josantonius.com](https://josantonius.com/)
+2016 - 2018 Josantonius, [josantonius.com](https://josantonius.com/)
 
 If you find it useful, let me know :wink:
 

src/Exception/JsonException.php

@@ -3,7 +3,7 @@
  * PHP simple library for managing Json files.
  *
  * @author    Josantonius <hello@josantonius.com>
- * @copyright 2016 - 2017 (c) Josantonius - PHP-Json
+ * @copyright 2016 - 2018 (c) Josantonius - PHP-Json
  * @license   https://opensource.org/licenses/MIT - The MIT License (MIT)
  * @link      https://github.com/Josantonius/PHP-Json
  * @since     1.0.0
@@ -15,17 +15,13 @@
  *
  * You can use an exception and error handler with this library.
  *
- * @since 1.0.0
- *
  * @link https://github.com/Josantonius/PHP-ErrorHandler
  */
 class JsonException extends \Exception
 {
     /**
      * Exception handler.
      *
-     * @since 1.0.0
-     *
      * @param string $msg    → message error (Optional)
      * @param int    $status → HTTP response status code (Optional)
      */

src/Json.php

@@ -3,51 +3,44 @@
  * PHP simple library for managing Json files.
  *
  * @author    Josantonius <hello@josantonius.com>
- * @copyright 2016 - 2017 (c) Josantonius - PHP-Json
+ * @copyright 2016 - 2018 (c) Josantonius - PHP-Json
  * @license   https://opensource.org/licenses/MIT - The MIT License (MIT)
  * @link      https://github.com/Josantonius/PHP-Json
  * @since     1.0.0
  */
 namespace Josantonius\Json;
 
 use Josantonius\Json\Exception\JsonException;
-use Josantonius\Json\Exception\JsonLastErrorException;
 
 /**
  * Json handler.
- *
- * @since 1.0.0
  */
 class Json
 {
     /**
      * Creating JSON file from array.
      *
-     * @since 1.0.0
-     *
      * @param array  $array → array to be converted to JSON
      * @param string $file  → path to the file
      *
-     * @return bool → true if the file is created without errors
+     * @return boolean → true if the file is created without errors
      */
     public static function arrayToFile($array, $file)
     {
         self::createDirectory($file);
 
-        $json = json_encode($array, JSON_PRETTY_PRINT);
+        $lastError = JsonLastError::check();
 
-        $json = self::jsonLastError() ? json_encode($json, 128) : $json;
+        $json = json_encode($lastError ? $lastError : $array, JSON_PRETTY_PRINT);
 
         self::saveFile($file, $json);
 
-        return ! isset($json['error-code']);
+        return is_null($lastError);
     }
 
     /**
      * Save to array the JSON file content.
      *
-     * @since 1.0.0
-     *
      * @param string $file → path or external url to JSON file
      *
      * @return array|false
@@ -58,11 +51,11 @@ public static function fileToArray($file)
             self::arrayToFile([], $file);
         }
 
-        $jsonString = @file_get_contents($file);
-        $array = json_decode($jsonString, true);
-        $error = self::jsonLastError();
+        $json = @file_get_contents($file);
+        $array = json_decode($json, true);
+        $lastError = JsonLastError::check();
 
-        return $array === null || isset($error['error-code']) ? false : $array;
+        return $array === null || !is_null($lastError) ? false : $array;
     }
 
     /**
@@ -104,83 +97,4 @@ private static function saveFile($file, $json)
             throw new JsonException($message . ' ' . $file);
         }
     }
-
-    /**
-     * The JSON last error collections.
-     *
-     * @since 1.1.3
-     *
-     * @return array
-     */
-    private static function jsonLastErrorCollections()
-    {
-        $collections = [
-            JSON_ERROR_NONE => null,
-            JSON_ERROR_DEPTH => [
-                'message' => 'Maximum stack depth exceeded',
-                'error-code' => 1,
-            ],
-            JSON_ERROR_STATE_MISMATCH => [
-                'message' => 'Underflow or the modes mismatch',
-                'error-code' => 2,
-            ],
-            JSON_ERROR_CTRL_CHAR => [
-                'message' => 'Unexpected control char found',
-                'error-code' => 3,
-            ],
-            JSON_ERROR_SYNTAX => [
-                'message' => 'Syntax error, malformed JSON',
-                'error-code' => 4,
-            ],
-            JSON_ERROR_UTF8 => [
-                'message' => 'Malformed UTF-8 characters',
-                'error-code' => 5,
-            ],
-            JSON_ERROR_RECURSION => [
-                'message' => 'Recursion error in value to be encoded',
-                'error-code' => 6,
-            ],
-            JSON_ERROR_INF_OR_NAN => [
-                'message' => 'Error NAN/INF in value to be encoded',
-                'error-code' => 7,
-            ],
-            JSON_ERROR_UNSUPPORTED_TYPE => [
-                'message' => 'Type value given cannot be encoded',
-                'error-code' => 8,
-            ],
-            'default' => [
-                'message' => 'Unknown error',
-                'error-code' => 999,
-            ],
-        ];
-
-        if (version_compare(PHP_VERSION, '7.0.0', '>='))
-        {
-            $collections[JSON_ERROR_INVALID_PROPERTY_NAME] = [
-                'message' => 'Name value given cannot be encoded',
-                'error-code' => 9,
-            ];
-            $collections[JSON_ERROR_UTF16] = [
-                'message' => 'Malformed UTF-16 characters',
-                'error-code' => 10,
-            ];
-        }
-
-        return $collections;
-    }
-
-    /**
-     * Check for errors.
-     *
-     * @since 1.1.3
-     *
-     * @return array|null
-     */
-    private static function jsonLastError()
-    {
-        $collections = self::jsonLastErrorCollections();
-        $jsonLastError = json_last_error();
-
-        return isset($jsonLastError) ? $collections[$jsonLastError] : $collections['default'];
-    }
 }