Merge branch '5.0RC'5.0

6 files changed, 22 insertions, 19 deletions

diff --git a/vendor/ramsey/uuid/src/Codec/CodecInterface.php b/vendor/ramsey/uuid/src/Codec/CodecInterface.php
index 6ea20544f..c6c54c78a 100644
--- a/vendor/ramsey/uuid/src/Codec/CodecInterface.php
+++ b/vendor/ramsey/uuid/src/Codec/CodecInterface.php
@@ -14,6 +14,8 @@
 
 namespace Ramsey\Uuid\Codec;
 
+use InvalidArgumentException;
+use Ramsey\Uuid\Exception\InvalidUuidStringException;
 use Ramsey\Uuid\UuidInterface;
 
 /**
@@ -42,7 +44,7 @@ interface CodecInterface
      *
      * @param string $encodedUuid
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws InvalidUuidStringException
      */
     public function decode($encodedUuid);
 
@@ -51,8 +53,8 @@ interface CodecInterface
      *
      * @param string $bytes
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
-     * @throws \InvalidArgumentException if string has not 16 characters
+     * @throws InvalidUuidStringException
+     * @throws InvalidArgumentException if string has not 16 characters
      */
     public function decodeBytes($bytes);
 }
diff --git a/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php b/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php
index 864980b30..367548070 100644
--- a/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php
+++ b/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php
@@ -14,6 +14,7 @@
 
 namespace Ramsey\Uuid\Codec;
 
+use Ramsey\Uuid\Exception\InvalidUuidStringException;
 use Ramsey\Uuid\UuidInterface;
 
 /**
@@ -60,7 +61,7 @@ class GuidStringCodec extends StringCodec
      *
      * @param string $encodedUuid
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws InvalidUuidStringException
      */
     public function decode($encodedUuid)
     {
@@ -76,7 +77,7 @@ class GuidStringCodec extends StringCodec
      *
      * @param string $bytes
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws InvalidUuidStringException
      */
     public function decodeBytes($bytes)
     {
diff --git a/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php b/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php
index 3257759c9..de91aab8d 100644
--- a/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php
+++ b/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php
@@ -50,7 +50,7 @@ class OrderedTimeCodec extends StringCodec
      *
      * @param string $bytes
      * @return UuidInterface
-     * @throws \InvalidArgumentException if string has not 16 characters
+     * @throws InvalidArgumentException if string has not 16 characters
      */
     public function decodeBytes($bytes)
     {
diff --git a/vendor/ramsey/uuid/src/Codec/StringCodec.php b/vendor/ramsey/uuid/src/Codec/StringCodec.php
index 7f352065c..f1bc0249a 100644
--- a/vendor/ramsey/uuid/src/Codec/StringCodec.php
+++ b/vendor/ramsey/uuid/src/Codec/StringCodec.php
@@ -74,7 +74,7 @@ class StringCodec implements CodecInterface
      *
      * @param string $encodedUuid
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws InvalidUuidStringException
      */
     public function decode($encodedUuid)
     {
@@ -89,7 +89,7 @@ class StringCodec implements CodecInterface
      *
      * @param string $bytes
      * @return UuidInterface
-     * @throws \InvalidArgumentException if string has not 16 characters
+     * @throws InvalidArgumentException if string has not 16 characters
      */
     public function decodeBytes($bytes)
     {
@@ -117,28 +117,28 @@ class StringCodec implements CodecInterface
      *
      * @param string $encodedUuid
      * @return array
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws InvalidUuidStringException
      */
     protected function extractComponents($encodedUuid)
     {
-        $nameParsed = str_replace(array(
+        $nameParsed = str_replace([
             'urn:',
             'uuid:',
             '{',
             '}',
             '-'
-        ), '', $encodedUuid);
+        ], '', $encodedUuid);
 
         // We have stripped out the dashes and are breaking up the string using
         // substr(). In this way, we can accept a full hex value that doesn't
         // contain dashes.
-        $components = array(
+        $components = [
             substr($nameParsed, 0, 8),
             substr($nameParsed, 8, 4),
             substr($nameParsed, 12, 4),
             substr($nameParsed, 16, 4),
             substr($nameParsed, 20)
-        );
+        ];
 
         $nameParsed = implode('-', $components);
 
@@ -158,13 +158,13 @@ class StringCodec implements CodecInterface
      */
     protected function getFields(array $components)
     {
-        return array(
+        return [
             'time_low' => str_pad($components[0], 8, '0', STR_PAD_LEFT),
             'time_mid' => str_pad($components[1], 4, '0', STR_PAD_LEFT),
             'time_hi_and_version' => str_pad($components[2], 4, '0', STR_PAD_LEFT),
             'clock_seq_hi_and_reserved' => str_pad(substr($components[3], 0, 2), 2, '0', STR_PAD_LEFT),
             'clock_seq_low' => str_pad(substr($components[3], 2), 2, '0', STR_PAD_LEFT),
             'node' => str_pad($components[4], 12, '0', STR_PAD_LEFT)
-        );
+        ];
     }
 }
diff --git a/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php b/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php
index 2c4ded89e..9d13af70c 100644
--- a/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php
+++ b/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php
@@ -13,10 +13,11 @@
  */
 namespace Ramsey\Uuid\Codec;
 
+use Ramsey\Uuid\Exception\InvalidUuidStringException;
 use Ramsey\Uuid\UuidInterface;
 
 /**
- * TimestampLastCombCodec encodes and decodes COMB UUIDs which have the timestamp as the first 48 bits.
+ * TimestampFirstCombCodec encodes and decodes COMB UUIDs which have the timestamp as the first 48 bits.
  * To be used with MySQL, PostgreSQL, Oracle.
  */
 class TimestampFirstCombCodec extends StringCodec
@@ -60,7 +61,7 @@ class TimestampFirstCombCodec extends StringCodec
      * @param string $encodedUuid
      *
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws InvalidUuidStringException
      */
     public function decode($encodedUuid)
     {
@@ -77,7 +78,7 @@ class TimestampFirstCombCodec extends StringCodec
      * @param string $bytes
      *
      * @return UuidInterface
-     * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException
+     * @throws InvalidUuidStringException
      */
     public function decodeBytes($bytes)
     {
diff --git a/vendor/ramsey/uuid/src/Codec/TimestampLastCombCodec.php b/vendor/ramsey/uuid/src/Codec/TimestampLastCombCodec.php
index 0cdd009a4..240f613e2 100644
--- a/vendor/ramsey/uuid/src/Codec/TimestampLastCombCodec.php
+++ b/vendor/ramsey/uuid/src/Codec/TimestampLastCombCodec.php
@@ -19,5 +19,4 @@ namespace Ramsey\Uuid\Codec;
  */
 class TimestampLastCombCodec extends StringCodec
 {
-
 }