Skip to content

Commit

Permalink
Merge branch '3.x'
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
  • Loading branch information
ramsey committed Aug 5, 2018
2 parents 357616b + 5d5eab9 commit 962b14c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions composer.json
Expand Up @@ -11,6 +11,7 @@
"license": "MIT",
"require": {
"php": "^7.2",
"ext-json": "*",
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
Expand Down
10 changes: 7 additions & 3 deletions src/UuidInterface.php
Expand Up @@ -14,14 +14,18 @@

namespace Ramsey\Uuid;

use DateTime;
use JsonSerializable;
use Ramsey\Uuid\Converter\NumberConverterInterface;
use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
use Ramsey\Uuid\Exception\UnsupportedOperationException;
use Serializable;

/**
* UuidInterface defines common functionality for all universally unique
* identifiers (UUIDs)
*/
interface UuidInterface extends \JsonSerializable, \Serializable
interface UuidInterface extends JsonSerializable, Serializable
{
/**
* Compares this UUID to the specified UUID.
Expand Down Expand Up @@ -121,9 +125,9 @@ public function getClockSequenceHex();
* has version type 1. If this UUID is not a time-based UUID then
* this method throws `UnsupportedOperationException`.
*
* @return \DateTime A PHP DateTime representation of the date
* @return DateTime A PHP DateTime representation of the date
* @throws UnsupportedOperationException If this UUID is not a version 1 UUID
* @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called in a 32-bit system and
* @throws UnsatisfiedDependencyException if called in a 32-bit system and
* `Moontoast\Math\BigNumber` is not present
*/
public function getDateTime();
Expand Down

0 comments on commit 962b14c

Please sign in to comment.