Format update

.travis.yml

@@ -3,7 +3,7 @@ language: php
 php:
   - 5.6
   - 7.0
-  - hhvm
+#  - hhvm
 #  - nightly
 
 before_script:

bob.php

@@ -5,12 +5,21 @@
 use BestServedCold\PhalueObjects\Format\Byte\Binary;
 use BestServedCold\PhalueObjects\Format\Byte\Decimal;
 
-var_dump(Binary::fromString('100 MB')->getValue());
-var_dump(Decimal::fromString('100 MB')->getValue());
-var_dump(Binary::fromFloat(123456)->toString());
-var_dump((string) Binary::fromFloat(1.208925819614629e24));
+//var_dump(Binary::fromString('100 MB')->getValue());
+//var_dump(Decimal::fromString('100 MB')->getValue());
+//var_dump(Binary::fromFloat(123456)->toString());
+//var_dump((string) Binary::fromFloat(1.208925819614629e24));
 
-use BestServedCold\PhalueObjects\Format\Csv;
+use BestServedCold\PhalueObjects\Format\String\Csv;
+use BestServedCold\PhalueObjects\Format\String\Yaml;
 
-var_dump(Csv::fromArray([['some', 'text'], ['in', 'a'],['multi-dimensional', 'array']])->getValue());
+var_dump(
+    Csv::fromArray(
+        [['some', 'text'], ['in', 'a'], ['multi-dimensional', 'array']]
+    )->toJson()
+);
 var_dump(Csv::fromArray(['test', 'a', 'thing'])->getValue());
+var_dump(Csv::fromString("this,is,some,CSV\nFor,you,to,see")->toArray());
+var_dump(Csv::fromVOYaml(
+    Yaml::fromString("[['some','yaml'],['with','multiple'],['aspects','jungle']]")
+)->toString());

src/Colour/Hsv.php

@@ -2,7 +2,11 @@
 
 use BestServedCold\PhalueObjects\ValueObject;
 
+/**
+ * Class Hsv
+ *
+ * @package BestServedCold\PhalueObjects\Colour
+ */
 class Hsv extends ValueObject
 {
-
-}
+}

src/Colour/Jpg.php

@@ -2,7 +2,11 @@
 
 use BestServedCold\PhalueObjects\ValueObject;
 
+/**
+ * Class Jpg
+ *
+ * @package BestServedCold\PhalueObjects\Colour
+ */
 class Jpg extends ValueObject
 {
-
-}
+}

src/Colour/Rgb.php

@@ -2,7 +2,11 @@
 
 use BestServedCold\PhalueObjects\ValueObject;
 
+/**
+ * Class Rgb
+ *
+ * @package BestServedCold\PhalueObjects\Colour
+ */
 class Rgb extends ValueObject
 {
-
-}
+}

src/Contract/VOFloatable.php

@@ -12,7 +12,8 @@
 interface VOFloatable extends Floatable
 {
     /**
-     * @return static
+     * @param  VOFloat $voFloat
+     * @return mixed
      */
     public static function fromVOFloat(VOFloat $voFloat);
 

src/DateTime/Time.php

@@ -50,8 +50,7 @@ public function __construct(Hour $hour, Minute $minute, Second $second)
         $this->second = $second;
         $this->timestamp = $hour->getSeconds()->add($minute->getSeconds())->add($second);
         $this->native = self::getNowDateTime()
-            ->setTime($hour->getValue(), $minute->getValue(), $minute->getValue()
-        );
+            ->setTime($hour->getValue(), $minute->getValue(), $minute->getValue());
 
         parent::__construct($hour, $minute, $second);
     }

src/DateTime/TimeZone.php

@@ -15,4 +15,6 @@
  * @since     0.0.1-alpha
  * @version   0.0.2-alpha
  */
-class TimeZone extends ValueObject {}
+class TimeZone extends ValueObject
+{
+}

src/DateTime/Unit/DayTrait.php

@@ -82,6 +82,7 @@ public function previousDay()
     }
 
     /**
+     * @param  integer $days
      * @return static
      */
     public function addDay($days)

src/DateTime/Unit/Hour.php

@@ -90,5 +90,4 @@ public function getMinimum()
     {
         return 0;
     }
-
 }

src/DateTime/Unit/Month.php

@@ -84,5 +84,4 @@ public function getMinimum()
     {
         return 1;
     }
-
 }

src/DateTime/Unit/Second.php

@@ -29,11 +29,17 @@ public function __construct($value)
         parent::__construct($value);
     }
 
+    /**
+     * @return static
+     */
     public static function now()
     {
         return new static(self::getNowDateTimeFormat('s'));
     }
 
+    /**
+     * @return string
+     */
     public function __toString()
     {
         return str_pad($this->getValue(), 2, '0', STR_PAD_LEFT);
@@ -76,5 +82,4 @@ public function getMinimum()
     {
         return 0;
     }
-
 }

src/Exception/InvalidTypeException.php

@@ -2,8 +2,7 @@
 
 namespace BestServedCold\PhalueObjects\Exception;
 
-use BestServedCold\PhalueObjects\Format\Csv;
-use BestServedCold\PhalueObjects\Mathematical\Integer;
+use BestServedCold\PhalueObjects\Format\String\Csv;
 
 /**
  * Class InvalidTypeException

src/File.php

@@ -1,8 +1,8 @@
 <?php namespace BestServedCold\PhalueObjects;
 
-use BestServedCold\PhalueObjects\Format\Json;
-use BestServedCold\PhalueObjects\Format\Xml;
-use BestServedCold\PhalueObjects\Format\Yaml;
+use BestServedCold\PhalueObjects\Format\String\Json;
+use BestServedCold\PhalueObjects\Format\String\Xml;
+use BestServedCold\PhalueObjects\Format\String\Yaml;
 
 /**
  * Class File

src/Format/Byte.php → src/Format/Float/Byte.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace BestServedCold\PhalueObjects\Format;
+namespace BestServedCold\PhalueObjects\Format\Float;
 
 use BestServedCold\PhalueObjects\Contract\VOStringable;
 use BestServedCold\PhalueObjects\VOArray\Find;
@@ -20,7 +20,7 @@ abstract class Byte extends VOFloat implements VOStringable
 {
     use VOStringTrait;
 
-    const UNITS = [
+    private static $units = [
         [ 'Byte' => 'Byte' ],
         [ 'KB'   => 'Kilobyte' ],
         [ 'MB'   => 'Megabyte' ],
@@ -77,7 +77,7 @@ public function toString()
     public function getUnit($power = null)
     {
         $power = $power ?: $this->getPower();
-        $unit  = self::UNITS[ (int) floor($this->base()) ];
+        $unit  = self::$units[ (int) floor($this->base()) ];
         return Word::fromString(reset($unit))->getPluralised($power);
     }
 
@@ -103,6 +103,6 @@ private function base()
      */
     private static function getUnitKeyList()
     {
-        return Map::fromVariadic(Value::toArrayWithPlural(true), self::UNITS)->getValue();
+        return Map::fromVariadic(Value::toArrayWithPlural(true), self::$units)->getValue();
     }
 }

src/Format/Byte/Binary.php → src/Format/Float/Byte/Binary.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace BestServedCold\PhalueObjects\Format\Byte;
+namespace BestServedCold\PhalueObjects\Format\Float\Byte;
 
-use BestServedCold\PhalueObjects\Format\Byte;
+use BestServedCold\PhalueObjects\Format\Float\Byte;
 
 /**
  * Class Binary

src/Format/Byte/Decimal.php → src/Format/Float/Byte/Decimal.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace BestServedCold\PhalueObjects\Format\Byte;
+namespace BestServedCold\PhalueObjects\Format\Float\Byte;
 
-use BestServedCold\PhalueObjects\Format\Byte;
+use BestServedCold\PhalueObjects\Format\Float\Byte;
 
 /**
  * Class Decimal

src/Format/README.md

@@ -11,7 +11,7 @@ BestServedCold\PhalueObjects\Format
 ![png](diagram.png)
 
 
-## Classes
+## Float classes
 
 ### Byte
 
@@ -38,11 +38,61 @@ string(16) "120.56 Kilobytes"
 string(11) "1 Yottabyte"
 ```
 
+## String classes
+
 ### Csv
 ```php
 BestServedCold\PhalueObjects\Format\Csv
 ```
 
+Usage:
+```php
+var_dump(
+    Csv::fromArray(
+        [['some', 'text'], ['in', 'a'], ['multi-dimensional', 'array']]
+    )->toJson()
+);
+var_dump(Csv::fromArray(['test', 'a', 'thing'])->getValue());
+var_dump(Csv::fromString("this,is,some,CSV\nFor,you,to,see")->toArray());
+var_dump(Csv::fromVOYaml(
+    Yaml::fromString("[['some','yaml'],['with','multiple'],['aspects','jungle']]")
+)->toString());
+```
+
+Outputs:
+```shell
+string(58) "[["some","text"],["in","a"],["multi-dimensional","array"]]"
+string(13) "test,a,thing
+"
+array(2) {
+  [0] =>
+  array(4) {
+    [0] =>
+    string(4) "this"
+    [1] =>
+    string(2) "is"
+    [2] =>
+    string(4) "some"
+    [3] =>
+    string(3) "CSV"
+  }
+  [1] =>
+  array(4) {
+    [0] =>
+    string(3) "For"
+    [1] =>
+    string(3) "you"
+    [2] =>
+    string(2) "to"
+    [3] =>
+    string(3) "see"
+  }
+}
+string(39) "some,yaml
+with,multiple
+aspects,jungle
+"
+```
 ### Json
 ```php
 BestServedcold\PhalueObjects\Format\Json