add test config. update sys-utils namespace

Author: inhere

src/AbstractDataParser.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Inhere
+ * Date: 2018/4/30 0030
+ * Time: 12:47
+ */
+
+namespace Toolkit\DataParser;
+
+/**
+ * Class AbstractDataParser
+ * @package Toolkit\DataParser
+ * @author inhere <in.798@qq.com>
+ */
+abstract class AbstractDataParser implements DataParserInterface
+{
+    /**
+     * @var array
+     */
+    protected $encodeOpts;
+
+    /**
+     * @var array
+     */
+    protected $decodeOpts;
+
+    /**
+     * JsonParser constructor.
+     * @param array $encodeOpts
+     * @param array $decodeOpts
+     */
+    public function __construct(array $encodeOpts = [], array $decodeOpts = [])
+    {
+        $this->encodeOpts = $encodeOpts;
+        $this->decodeOpts = $decodeOpts;
+    }
+
+    /**
+     * @return array
+     */
+    public function getEncodeOpts(): array
+    {
+        return $this->encodeOpts;
+    }
+
+    /**
+     * @return array
+     */
+    public function getDecodeOpts(): array
+    {
+        return $this->decodeOpts;
+    }
+}

src/DataParserAwareTrait.php

@@ -11,18 +11,19 @@
 /**
  * Class DataParserAwareTrait
  * @package Toolkit\DataParser
+ * @author inhere <in.798@qq.com>
  */
 trait DataParserAwareTrait
 {
     /**
-     * @var ParserInterface
+     * @var DataParserInterface
      */
     private $parser;
 
     /**
-     * @return ParserInterface
+     * @return DataParserInterface
      */
-    public function getParser(): ParserInterface
+    public function getParser(): DataParserInterface
     {
         if (!$this->parser) {
             $this->parser = new PhpParser();
@@ -32,10 +33,13 @@ public function getParser(): ParserInterface
     }
 
     /**
-     * @param ParserInterface $parser
+     * @param DataParserInterface $parser
+     * @return DataParserAwareTrait
      */
-    public function setParser(ParserInterface $parser)
+    public function setParser(DataParserInterface $parser): self
     {
         $this->parser = $parser;
+
+        return $this;
     }
 }

src/ParserInterface.php renamed to src/DataParserInterface.php

@@ -11,8 +11,9 @@
 /**
  * Interface ParserInterface
  * @package Toolkit\DataParser
+ * @author inhere <in.798@qq.com>
  */
-interface ParserInterface
+interface DataParserInterface
 {
     /**
      * @param mixed $data

src/JsonParser.php

@@ -11,32 +11,18 @@
 /**
  * Class JsonParser
  * @package Toolkit\DataParser
+ * @author inhere <in.798@qq.com>
  */
-class JsonParser implements ParserInterface
+class JsonParser extends AbstractDataParser
 {
     /**
-     * @var bool
+     * class constructor.
+     * @param array $encodeOpts
+     * @param array $decodeOpts
      */
-    protected $assoc = true;
-
-    /**
-     * JsonParser constructor.
-     * @param null $assoc
-     */
-    public function __construct($assoc = null)
+    public function __construct(array $encodeOpts = [], array $decodeOpts = [])
     {
-        if ($assoc !== null) {
-            $this->setAssoc($assoc);
-        }
-    }
-
-    /**
-     * @param string $data
-     * @return mixed
-     */
-    public function decode(string $data)
-    {
-        return \json_decode($data, $this->assoc);
+        parent::__construct($encodeOpts, $decodeOpts ?: [true]);
     }
 
     /**
@@ -45,22 +31,15 @@ public function decode(string $data)
      */
     public function encode($data): string
     {
-        return \json_encode($data);
+        return \json_encode($data, ...$this->encodeOpts);
     }
 
     /**
-     * @return bool
-     */
-    public function isAssoc(): bool
-    {
-        return $this->assoc;
-    }
-
-    /**
-     * @param bool $assoc
+     * @param string $data
+     * @return mixed
      */
-    public function setAssoc($assoc)
+    public function decode(string $data)
     {
-        $this->assoc = (bool)$assoc;
+        return \json_decode($data, ...$this->decodeOpts);
     }
 }

src/MsgPackParser.php

@@ -11,8 +11,11 @@
 /**
  * Class MsgPackParser
  * @package Toolkit\DataParser
+ * @author inhere <in.798@qq.com>
+ * @link https://github.com/msgpack/msgpack-php php-ext
+ * @link https://github.com/rybakit/msgpack.php php
  */
-class MsgPackParser implements ParserInterface
+class MsgPackParser extends AbstractDataParser
 {
     /**
      * class constructor.
@@ -23,6 +26,8 @@ public function __construct()
         if (!\function_exists('msgpack_pack')) {
             throw new \RuntimeException("The php extension 'msgpack' is required!");
         }
+
+        parent::__construct();
     }
 
     /**

src/PhpParser.php

@@ -11,8 +11,9 @@
 /**
  * Class PhpParser
  * @package Toolkit\DataParser
+ * @author inhere <in.798@qq.com>
  */
-class PhpParser implements ParserInterface
+class PhpParser implements DataParserInterface
 {
     /**
      * @param mixed $data

src/SwooleParser.php

@@ -12,20 +12,24 @@
 
 /**
  * Class SwooleParser
+ * @package Toolkit\DataParser
  * @author inhere <in.798@qq.com>
  * @link https://wiki.swoole.com/wiki/page/p-serialize.html
  */
-class SwooleParser implements ParserInterface
+class SwooleParser extends AbstractDataParser
 {
     /**
      * class constructor.
+     * @param array $encodeOpts
      * @throws \RuntimeException
      */
-    public function __construct()
+    public function __construct(array $encodeOpts = [])
     {
         if (!\class_exists(Serialize::class, false)) {
             throw new \RuntimeException("The php extension 'swoole_serialize' is required!");
         }
+
+        parent::__construct($encodeOpts);
     }
 
     /**
@@ -34,7 +38,7 @@ public function __construct()
      */
     public function encode($data): string
     {
-        return (string)Serialize::pack($data);
+        return (string)Serialize::pack($data, ...$this->encodeOpts);
     }
 
     /**
@@ -43,6 +47,6 @@ public function encode($data): string
      */
     public function decode(string $data)
     {
-        return Serialize::unpack($data);
+        return Serialize::unpack($data, ...$this->decodeOpts);
     }
 }

test/JsonParserTest.php

@@ -6,12 +6,14 @@
  * Time: 19:25
  */
 
+namespace Toolkit\DataParserTest;
+
 use Toolkit\DataParser\JsonParser;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Class JsonParserTest
- * @covers JsonParser
+ * @covers \Toolkit\DataParser\JsonParser
  */
 class JsonParserTest extends TestCase
 {

test/PhpParserTest.php

@@ -6,12 +6,14 @@
  * Time: 19:25
  */
 
+namespace Toolkit\DataParserTest;
+
 use Toolkit\DataParser\PhpParser;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Class PhpParserTest
- * @covers PhpParser
+ * @covers \Toolkit\DataParser\PhpParser
  */
 class PhpParserTest extends TestCase
 {

test/SwooleParserTest.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Inhere
+ * Date: 2018/4/30 0030
+ * Time: 12:55
+ */
+
+namespace Toolkit\DataParserTest;
+
+use Toolkit\DataParser\SwooleParser;
+use PHPUnit\Framework\TestCase;
+use Swoole\Serialize;
+
+/**
+ * Class SwooleParserTest
+ * @covers \Toolkit\DataParser\SwooleParser
+ */
+class SwooleParserTest extends TestCase
+{
+    public function testEncode()
+    {
+        if (!\class_exists(Serialize::class, false)) {
+            return;
+        }
+
+        $data = [
+            'name' => 'value',
+        ];
+
+        $parser = new SwooleParser();
+        $ret = $parser->encode($data);
+
+        $this->assertInternalType('string', $ret);
+    }
+
+    public function testDecode()
+    {
+        if (!\class_exists(Serialize::class, false)) {
+            return;
+        }
+
+        $data = [
+            'name' => 'value',
+        ];
+
+        $parser = new SwooleParser();
+        $str = $parser->encode($data);
+        $ret = $parser->decode($str);
+
+        $this->assertInternalType('array', $ret);
+        $this->assertArrayHasKey('name', $ret);
+    }
+
+}
+

test/boot.php

@@ -13,8 +13,8 @@
     if (0 === strpos($class,'Toolkit\DataParser\Example\\')) {
         $path = str_replace('\\', '/', substr($class, strlen('Toolkit\DataParser\Example\\')));
         $file = dirname(__DIR__) . "/example/{$path}.php";
-    } elseif (0 === strpos($class,'Toolkit\DataParser\Test\\')) {
-        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\DataParser\Test\\')));
+    } elseif (0 === strpos($class,'Toolkit\DataParserTest\\')) {
+        $path = str_replace('\\', '/', substr($class, strlen('Toolkit\DataParserTest\\')));
         $file = __DIR__ . "/{$path}.php";
     } elseif (0 === strpos($class,'Toolkit\DataParser\\')) {
         $path = str_replace('\\', '/', substr($class, strlen('Toolkit\DataParser\\')));