From f97c9e08f993f8bfbe1f2ef9a870e81fa481172b Mon Sep 17 00:00:00 2001
From: Thibaud Fabre <thibaud@aztech.io>
Date: Thu, 6 Nov 2014 10:42:02 +0100
Subject: [PATCH] Rename degraded feature classes with more consistent names

---
 ...verter.php => DegradedNumberConverter.php} |  2 +-
 src/{SmallIntUuid.php => DegradedUuid.php}    |  2 +-
 src/UuidFactory.php                           |  4 +--
 tests/DegradedNumberConverterTest.php         | 26 +++++++++++++++++++
 tests/UnsatisfiedNumberConverterTest.php      | 16 ------------
 tests/UuidTest.php                            |  6 ++---
 6 files changed, 33 insertions(+), 23 deletions(-)
 rename src/{UnsatisfiedNumberConverter.php => DegradedNumberConverter.php} (92%)
 rename src/{SmallIntUuid.php => DegradedUuid.php} (99%)
 create mode 100644 tests/DegradedNumberConverterTest.php
 delete mode 100644 tests/UnsatisfiedNumberConverterTest.php

diff --git a/src/UnsatisfiedNumberConverter.php b/src/DegradedNumberConverter.php
similarity index 92%
rename from src/UnsatisfiedNumberConverter.php
rename to src/DegradedNumberConverter.php
index cc933b3..7950cca 100644
--- a/src/UnsatisfiedNumberConverter.php
+++ b/src/DegradedNumberConverter.php
@@ -2,7 +2,7 @@
 
 namespace Rhumsaa\Uuid;
 
-class UnsatisfiedNumberConverter extends BigNumberConverter
+class DegradedNumberConverter extends BigNumberConverter
 {
     public function fromHex($hex)
     {
diff --git a/src/SmallIntUuid.php b/src/DegradedUuid.php
similarity index 99%
rename from src/SmallIntUuid.php
rename to src/DegradedUuid.php
index 17effc7..7f11acc 100644
--- a/src/SmallIntUuid.php
+++ b/src/DegradedUuid.php
@@ -2,7 +2,7 @@
 
 namespace Rhumsaa\Uuid;
 
-class SmallIntUuid extends Uuid
+class DegradedUuid extends Uuid
 {
 
     public function __construct(array $fields, BigNumberConverter $converter, Codec $codec)
diff --git a/src/UuidFactory.php b/src/UuidFactory.php
index f2dd6a5..e70d0b2 100644
--- a/src/UuidFactory.php
+++ b/src/UuidFactory.php
@@ -243,7 +243,7 @@ class UuidFactory
         $converter = new BigNumberConverter();
 
         if (! self::hasBigNumber()) {
-            $converter = new UnsatisfiedNumberConverter();
+            $converter = new DegradedNumberConverter();
         }
 
         return $converter;
@@ -384,7 +384,7 @@ class UuidFactory
         $codec = $codec ?: $this->codec;
 
         if (! self::is64BitSystem()) {
-            return new SmallIntUuid($fields, $this->getConverter(), $codec);
+            return new DegradedUuid($fields, $this->getConverter(), $codec);
         }
 
         return new Uuid($fields, $this->getConverter(), $codec);
diff --git a/tests/DegradedNumberConverterTest.php b/tests/DegradedNumberConverterTest.php
new file mode 100644
index 0000000..8f14ceb
--- /dev/null
+++ b/tests/DegradedNumberConverterTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Rhumsaa\Uuid;
+
+class DegradedNumberConverterTest extends TestCase
+{
+    /**
+     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     */
+    public function testConvertingFromHexThrowsException()
+    {
+        $converter = new DegradedNumberConverter();
+
+        $converter->fromHex('ffff');
+    }
+
+    /**
+     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
+     */
+    public function testConvertingToHexThrowsException()
+    {
+        $converter = new DegradedNumberConverter();
+
+        $converter->toHex(0);
+    }
+}
diff --git a/tests/UnsatisfiedNumberConverterTest.php b/tests/UnsatisfiedNumberConverterTest.php
deleted file mode 100644
index 32f8a52..0000000
--- a/tests/UnsatisfiedNumberConverterTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Rhumsaa\Uuid;
-
-class UnsatisfiedNumberConverterTest extends TestCase
-{
-    /**
-     * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
-     */
-    public function testConverterThrowsException()
-    {
-        $converter = new UnsatisfiedNumberConverter();
-
-        $converter->fromHex('ffff');
-    }
-}
diff --git a/tests/UuidTest.php b/tests/UuidTest.php
index f330690..7858abb 100644
--- a/tests/UuidTest.php
+++ b/tests/UuidTest.php
@@ -185,8 +185,8 @@ class UuidTest extends TestCase
 
         $uuid = Uuid::fromString('ff6f8cb0-c57d-11e1-9b21-0800200c9a66');
 
-        $this->assertInstanceOf('Rhumsaa\Uuid\SmallIntUuid', $uuid);
-        $this->assertInstanceOf('Rhumsaa\Uuid\UnsatisfiedNumberConverter', $uuid->getConverter());
+        $this->assertInstanceOf('Rhumsaa\Uuid\DegradedUuid', $uuid);
+        $this->assertInstanceOf('Rhumsaa\Uuid\DegradedNumberConverter', $uuid->getConverter());
 
         $date = $uuid->getDateTime();
     }
@@ -1675,7 +1675,7 @@ class UuidTest extends TestCase
 
     /**
      * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
-     * @expectedExceptionMessage Cannot call Rhumsaa\Uuid\UnsatisfiedNumberConverter::fromHex without support for large integers
+     * @expectedExceptionMessage Cannot call Rhumsaa\Uuid\DegradedNumberConverter::fromHex without support for large integers
      */
     public function testGetInteger()
     {