Merge pull request #2 from tenitski/string-class-rename

Rename String class due to 'String' being a reserved word in PHP7

.travis.yml

@@ -3,6 +3,9 @@ language: php
 php:
   - 5.5
   - 5.4
+  - 5.6
+  - 7
+  - hhvm
 
 install:
   - composer install

src/Formats/String.php → src/Formats/PlainString.php

@@ -5,7 +5,7 @@
 /**
  * The traditional UUID string format
  */
-class String implements Format
+class PlainString implements Format
 {
     const FORMAT = '/[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}/i';
 

src/Formats/ReorderedString.php

@@ -8,7 +8,7 @@
  * To retain the 4,2,2,2,6 byte separators, we have to split the node field when
  * we move it, and combine the time_mid and time_low fields.
  */
-class ReorderedString extends String
+class ReorderedString extends PlainString
 {
     /**
      * @inheritDoc

src/Uuid.php

@@ -4,7 +4,7 @@
 
 use InvalidArgumentException;
 use MysqlUuid\Formats\Format;
-use MysqlUuid\Formats\String;
+use MysqlUuid\Formats\PlainString;
 
 /**
  * MySQL UUID format utilities
@@ -39,7 +39,7 @@ public function __construct($value, Format $format = null)
         if ($format) {
             $this->format = $format;
         } else {
-            $this->format = new String();
+            $this->format = new PlainString();
         }
     }
 

test/MysqlUuid/ConvertTest.php

@@ -6,7 +6,7 @@
 use MysqlUuid\Formats\Format;
 use MysqlUuid\Formats\Hex;
 use MysqlUuid\Formats\ReorderedString;
-use MysqlUuid\Formats\String;
+use MysqlUuid\Formats\PlainString;
 use MysqlUuid\Test\BaseTest;
 
 class ConvertTest extends BaseTest
@@ -62,8 +62,8 @@ public function testConvert()
     protected function getFormat($format)
     {
         switch ($format) {
-            case 'string':
-                return new String();
+            case 'plain':
+                return new PlainString();
             case 'reordered':
                 return new ReorderedString();
             case 'binary':
@@ -77,23 +77,23 @@ protected function conversions()
     {
         return [
             [
-                'from'  => 'string',
+                'from'  => 'plain',
                 'to'    => 'reordered',
                 'cases' => [
                     'b8e2adff-0331-11e4-9583-080027f3add4' => '080027f3-add4-11e4-9583-0331b8e2adff',
                     'b8fc7a3e-0331-11e4-9583-080027f3add4' => '080027f3-add4-11e4-9583-0331b8fc7a3e'
                 ],
             ],
             [
-                'from'  => 'string',
+                'from'  => 'plain',
                 'to'    => 'hex',
                 'cases' => [
                     'b8e2adff-0331-11e4-9583-080027f3add4' => 'b8e2adff033111e49583080027f3add4',
                     'b8fc7a3e-0331-11e4-9583-080027f3add4' => 'b8fc7a3e033111e49583080027f3add4'
                 ],
             ],
             [
-                'from'  => 'string',
+                'from'  => 'plain',
                 'to'    => 'binary',
                 'cases' => [
                     'b8e2adff-0331-11e4-9583-080027f3add4' => "\x08\x00\x27\xf3\xad\xd4\x95\x83\x11\xe4\x03\x31\xb8\xe2\xad\xff",

test/MysqlUuid/Formats/StringTest.php → test/MysqlUuid/Formats/PlainStringTest.php

@@ -2,14 +2,14 @@
 
 namespace MysqlUuid\Formats;
 
-class StringTest extends FormatTest
+class PlainStringTest extends FormatTest
 {
     /**
      * @return Format
      */
     protected function getSut()
     {
-        return new String();
+        return new PlainString();
     }
 
     protected function good()

test/MysqlUuid/UuidTest.php

@@ -2,7 +2,7 @@
 
 namespace MysqlUuid;
 
-use MysqlUuid\Formats\String;
+use MysqlUuid\Formats\PlainString;
 use MysqlUuid\Test\BaseTest;
 
 class UuidTest extends BaseTest
@@ -30,7 +30,7 @@ public function testBadFormat()
             ->will($this->returnValue(null));
 
         $uuid = new Uuid('b8fc7a3e-0331-11e4-9583-080027f3add4', $format);
-        $uuid->toFormat(new String());
+        $uuid->toFormat(new PlainString());
     }
 
     public function testFieldCrud()
@@ -42,6 +42,6 @@ public function testFieldCrud()
 
         $uuid->setField('clock_seq', 'ffff');
 
-        $this->assertEquals($uuid->toFormat(new String()), 'b8fc7a3e-0331-11e4-ffff-080027f3add4');
+        $this->assertEquals($uuid->toFormat(new PlainString()), 'b8fc7a3e-0331-11e4-ffff-080027f3add4');
     }
 }