From 1c01dec0c4f71e682c540c36e0d00453a4dcd3f3 Mon Sep 17 00:00:00 2001 From: Ben Ramsey Date: Tue, 4 Aug 2015 11:20:55 -0400 Subject: [PATCH 1/5] Remove warning message from README for the ramsey/uuid repository --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 00702fc..d5b3e56 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # Rhumsaa\Uuid for PHP -_**WARNING: This package is no longer maintained. Use [ramsey/uuid](https://github.com/ramsey/uuid) instead.**_ - ----- - [![Build Status](https://travis-ci.org/ramsey/uuid.png?branch=master)](https://travis-ci.org/ramsey/uuid) [![Coverage Status](https://coveralls.io/repos/ramsey/uuid/badge.png)](https://coveralls.io/r/ramsey/uuid) [![Latest Stable Version](https://poser.pugx.org/rhumsaa/uuid/v/stable.png)](https://packagist.org/packages/rhumsaa/uuid) From 2f6ba8da745c7ecb8b5225aaa0a2af7024251b67 Mon Sep 17 00:00:00 2001 From: Aztech Date: Fri, 14 Aug 2015 23:15:31 +0200 Subject: [PATCH 2/5] Fix exception message assertion --- src/Uuid.php | 3 +-- tests/UuidTest.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Uuid.php b/src/Uuid.php index 312b5dc..3b7066e 100644 --- a/src/Uuid.php +++ b/src/Uuid.php @@ -1112,8 +1112,7 @@ final class Uuid throw new Exception\UnsatisfiedDependencyException( 'When calling ' . __METHOD__ . ' on a 32-bit system, ' - . 'Moontoast\Math\BigNumber must be present in order ' - . 'to generate version 1 UUIDs' + . 'Moontoast\Math\BigNumber must be present' ); } diff --git a/tests/UuidTest.php b/tests/UuidTest.php index 8be8b26..d61886a 100644 --- a/tests/UuidTest.php +++ b/tests/UuidTest.php @@ -1830,7 +1830,7 @@ class UuidTest extends TestCase /** * @covers Rhumsaa\Uuid\Uuid::getInteger * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException - * @expectedExceptionMessage Cannot call Rhumsaa\Uuid\Uuid::getInteger without support for large integers + * @expectedExceptionMessage When calling Rhumsaa\Uuid\Uuid::calculateUuidTime on a 32-bit system, Moontoast\Math\BigNumber must be present */ public function testGetInteger() { From 0a04997f0779c5af8bcdf5c1d9516c4aff327795 Mon Sep 17 00:00:00 2001 From: Aztech Date: Fri, 14 Aug 2015 23:26:59 +0200 Subject: [PATCH 3/5] Remove message assertion -- cannot pass in both 32 and 64 bits envs --- tests/UuidTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/UuidTest.php b/tests/UuidTest.php index d61886a..538d428 100644 --- a/tests/UuidTest.php +++ b/tests/UuidTest.php @@ -1830,7 +1830,6 @@ class UuidTest extends TestCase /** * @covers Rhumsaa\Uuid\Uuid::getInteger * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException - * @expectedExceptionMessage When calling Rhumsaa\Uuid\Uuid::calculateUuidTime on a 32-bit system, Moontoast\Math\BigNumber must be present */ public function testGetInteger() { From 6c608cf1e939cdb0eaba95dc17a3f0b917bb3d04 Mon Sep 17 00:00:00 2001 From: Frederik Bosch Date: Mon, 31 Aug 2015 11:09:34 +0200 Subject: [PATCH 4/5] Update composer.json Just did a `composer show -i` and saw a big warning NO LONGER MAINTAINED on the ramsay/uuid package. This confused me because I was sure I switched months ago. I found out that there are still references to the old package inside the composer.json. --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index a02198d..6128c03 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,9 @@ { - "name": "rhumsaa/uuid", - "description": "NO LONGER MAINTAINED. Use ramsey/uuid instead. A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", + "name": "ramsey/uuid", + "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", "type": "library", "keywords": ["uuid", "identifier", "guid"], - "homepage": "https://github.com/ramsey/rhumsaa-uuid", + "homepage": "https://github.com/ramsey/uuid", "license": "MIT", "authors": [ { @@ -16,8 +16,8 @@ } ], "support": { - "issues": "https://github.com/ramsey/rhumsaa-uuid/issues", - "source": "https://github.com/ramsey/rhumsaa-uuid" + "issues": "https://github.com/ramsey/uuid/issues", + "source": "https://github.com/ramsey/uuid" }, "require": { "php": ">=5.3.3" From 767a5b5f70cd990c04ef21d8374794d1a02fa9e8 Mon Sep 17 00:00:00 2001 From: Ben Ramsey Date: Mon, 31 Aug 2015 08:34:50 -0500 Subject: [PATCH 5/5] Bump version for 2.8.3 release --- CHANGELOG.md | 7 +++++++ src/Uuid.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d686aeb..73ece79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Rhumsaa\Uuid Changelog +## 2.8.3 + +_Released: 2015-08-31_ + + * Fix exception message in `Uuid::calculateUuidTime()`. + * Update composer.json to reflect new repository and package name. + ## 2.8.2 _Released: 2015-07-23_ diff --git a/src/Uuid.php b/src/Uuid.php index 3b7066e..1a5d806 100644 --- a/src/Uuid.php +++ b/src/Uuid.php @@ -93,7 +93,7 @@ final class Uuid /** * Version of the Rhumsaa\Uuid package */ - const VERSION = '2.8.x-dev'; + const VERSION = '2.8.3'; /** * For testing, 64-bit system override; if true, treat the system as 32-bit