diff options
Diffstat (limited to 'vendor/ramsey')
41 files changed, 908 insertions, 590 deletions
diff --git a/vendor/ramsey/uuid/CHANGELOG.md b/vendor/ramsey/uuid/CHANGELOG.md index 3965fff27..878e7925e 100644 --- a/vendor/ramsey/uuid/CHANGELOG.md +++ b/vendor/ramsey/uuid/CHANGELOG.md @@ -1,376 +1,633 @@ # ramsey/uuid Changelog -## 3.8.0 +All notable changes to this project will be documented in this file. -_Released: 2018-07-19_ +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - * Add support for determining MAC address on FreeBSD systems ([#212](https://github.com/ramsey/uuid/pull/212)) - * Add a polyfill for PHP ctype functions to support systems where the ctype functions are not part of the PHP build ([#223](https://github.com/ramsey/uuid/pull/223)) - * Improve validation to disallow UUIDs with a trailing newline character ([#225](https://github.com/ramsey/uuid/pull/225)) - * Add annotations for thrown exceptions for improved IDE hinting ([#232](https://github.com/ramsey/uuid/pull/232)) - * Improve documentation, testing, and project metadata (i.e. `.gitattributes`, etc.) -## 3.7.3 +## [Unreleased] -_Released: 2018-01-19_ +### Added - * In rare cases, when using `glob()` to find `/sys/class/net/*/address` files on Linux, `glob()` encountered errors, returning `false` instead of an empty array, causing `array_map()` to emit warnings since its second parameter was not an array; this release gracefully handles cases where `glob()` returns `false` [#203](https://github.com/ramsey/uuid/issues/203) - * Fixed an off-by-one error in `DefaultTimeGenerator` and switching to `random_int()` from `mt_rand()` for better random numbers [#206](https://github.com/ramsey/uuid/pull/206) +### Changed -## 3.7.2 +### Deprecated -_Released: 2018-01-13_ +### Removed - * On Linux, first check sysfs to determine node identifier; this provides a reliable way to identify the node on Docker images, etc. [#185](https://github.com/ramsey/uuid/pull/185) +### Fixed -## 3.7.1 +### Security -_Released: 2017-09-22_ - * Use `random_bytes()` when generating random nodes - * Set the multicast bit for random nodes, according to RFC 4122, §4.5, [#170](https://github.com/ramsey/uuid/pull/170), [#171](https://github.com/ramsey/uuid/pull/171), [#182](https://github.com/ramsey/uuid/pull/182) +## [3.9.1] - 2019-12-01 -## 3.7.0 +### Fixed -_Released: 2017-08-04_ +* Fix `RandomNodeProvider` behavior on 32-bit systems. The `RandomNodeProvider` + was converting a 6-byte string to a a decimal number, which is a 48-bit, + unsigned integer. This caused problems on 32-bit systems and has now been + resolved. - * Add UUID version constants [#173](https://github.com/ramsey/uuid/issues/173), [#177](https://github.com/ramsey/uuid/pull/177) + +## [3.9.0] - 2019-11-30 + +### Added + +* Add function API as convenience. The functions are available in the + `Ramsey\Uuid` namespace. + * `v1(int|string|null $node = null, int|null $clockSeq = null): string` + * `v3(string|UuidInterface $ns, string $name): string` + * `v4(): string` + * `v5(string|UuidInterface $ns, string $name): string` + +### Changed + +* Use paragonie/random-lib instead of ircmaxell/random-lib. This is a + non-breaking change. +* Use a high-strength generator by default, when using `RandomLibAdapter`. This + is a non-breaking change. + +### Deprecated + +These will be removed in version ramsey/uuid version 4.0.0: + +* `MtRandGenerator`, `OpenSslGenerator`, and `SodiumRandomGenerator` are + deprecated in favor of using the default `RandomBytesGenerator`. + +### Fixed + +* Set `ext-json` as a required dependency in `composer.json`. +* Use `PHP_OS` instead of `php_uname()` when determining the system OS, for + cases when `php_uname()` is disabled for security reasons. + + +## [3.8.0] - 2018-07-19 + +### Added + +* Support discovery of MAC addresses on FreeBSD systems +* Use a polyfill to provide PHP ctype functions when running on systems where the + ctype functions are not part of the PHP build +* Disallow a trailing newline character when validating UUIDs +* Annotate thrown exceptions for improved IDE hinting + + +## [3.7.3] - 2018-01-19 + +### Fixed + +* Gracefully handle cases where `glob()` returns false when searching + `/sys/class/net/*/address` files on Linux +* Fix off-by-one error in `DefaultTimeGenerator` + +### Security + +* Switch to `random_int()` from `mt_rand()` for better random numbers + + +## [3.7.2] - 2018-01-13 + +### Fixed + +* Check sysfs on Linux to determine the node identifier; this provides a + reliable way to identify the node on Docker images, etc. + + +## [3.7.1] - 2017-09-22 + +### Fixed + +* Set the multicast bit for random nodes, according to RFC 4122, §4.5 + +### Security + +* Use `random_bytes()` when generating random nodes + + +## [3.7.0] - 2017-08-04 + +### Added + +* Add the following UUID version constants: * `Uuid::UUID_TYPE_TIME` * `Uuid::UUID_TYPE_IDENTIFIER` * `Uuid::UUID_TYPE_HASH_MD5` * `Uuid::UUID_TYPE_RANDOM` * `Uuid::UUID_TYPE_HASH_SHA1` -## 3.6.1 -_Released: 2017-03-26_ +## [3.6.1] - 2017-03-26 + +### Fixed + +* Optimize UUID string decoding by using `str_pad()` instead of `sprintf()` + + +## [3.6.0] - 2017-03-18 + +### Added + +* Add `InvalidUuidStringException`, which is thrown when attempting to decode an + invalid string UUID; this does not introduce any BC issues, since the new + exception inherits from the previously used `InvalidArgumentException` + +### Fixed + +* Improve memory usage when generating large quantities of UUIDs (use `str_pad()` + and `dechex()` instead of `sprintf()`) + + +## [3.5.2] - 2016-11-22 + +### Fixed + +* Improve test coverage + + +## [3.5.1] - 2016-10-02 + +### Fixed + +* Fix issue where the same UUIDs were not being treated as equal when using + mixed cases + + +## [3.5.0] - 2016-08-02 + +### Added + +* Add `OrderedTimeCodec` to store UUID in an optimized way for InnoDB + +### Fixed + +* Fix invalid node generation in `RandomNodeProvider` +* Avoid multiple unnecessary system calls by caching failed attempt to retrieve + system node + + +## [3.4.1] - 2016-04-23 + +### Fixed + +* Fix test that violated a PHP CodeSniffer rule, breaking the build + + +## [3.4.0] - 2016-04-23 + +### Added + +* Add `TimestampFirstCombCodec` and `TimestampLastCombCodec` codecs to provide + the ability to generate [COMB sequential UUIDs] with the timestamp encoded as + either the first 48 bits or the last 48 bits +* Improve logic of `CombGenerator` for COMB sequential UUIDs + + +## [3.3.0] - 2016-03-22 + +### Security + +* Drop the use of OpenSSL as a fallback and use [paragonie/random_compat] to + support `RandomBytesGenerator` in versions of PHP earlier than 7.0; + this addresses and fixes the [collision issue] + + +## [3.2.0] - 2016-02-17 + +### Added + +* Add `SodiumRandomGenerator` to allow use of the [PECL libsodium extension] as + a random bytes generator when creating UUIDs + + +## [3.1.0] - 2015-12-17 + +### Added + +* Implement the PHP `Serializable` interface to provide the ability to + serialize/unserialize UUID objects + + +## [3.0.1] - 2015-10-21 + +### Added + +* Adopt the [Contributor Code of Conduct] for this project + + +## [3.0.0] - 2015-09-28 + +The 3.0.0 release represents a significant step for the ramsey/uuid library. +While the simple and familiar API used in previous versions remains intact, this +release provides greater flexibility to integrators, including the ability to +inject your own number generators, UUID codecs, node and time providers, and +more. + +*Please note: The changelog for 3.0.0 includes all notes from the alpha and beta +versions leading up to this release.* + +### Added + +* Add a number of generators that may be used to override the library defaults + for generating random bytes (version 4) or time-based (version 1) UUIDs + * `CombGenerator` to allow generation of sequential UUIDs + * `OpenSslGenerator` to generate random bytes on systems where + `openssql_random_pseudo_bytes()` is present + * `MtRandGenerator` to provide a fallback in the event other random generators + are not present + * `RandomLibAdapter` to allow use of [ircmaxell/random-lib] + * `RandomBytesGenerator` for use with PHP 7; ramsey/uuid will default to use + this generator when running on PHP 7 + * Refactor time-based (version 1) UUIDs into a `TimeGeneratorInterface` to + allow for other sources to generate version 1 UUIDs in this library + * `PeclUuidTimeGenerator` and `PeclUuidRandomGenerator` for creating version + 1 or version 4 UUIDs using the pecl-uuid extension +* Add a `setTimeGenerator` method on `UuidFactory` to override the default time + generator +* Add option to enable `PeclUuidTimeGenerator` via `FeatureSet` +* Support GUID generation by configuring a `FeatureSet` to use GUIDs +* Allow UUIDs to be serialized as JSON through `JsonSerializable` + +### Changed + +* Change root namespace from "Rhumsaa" to "Ramsey;" in most cases, simply + making this change in your applications is the only upgrade path you will + need—everything else should work as expected +* No longer consider `Uuid` class as `final`; everything is now based around + interfaces and factories, allowing you to use this package as a base to + implement other kinds of UUIDs with different dependencies +* Return an object of type `DegradedUuid` on 32-bit systems to indicate that + certain features are not available +* Default `RandomLibAdapter` to a medium-strength generator with + [ircmaxell/random-lib]; this is configurable, so other generator strengths may + be used + +### Removed + +* Remove `PeclUuidFactory` in favor of using pecl-uuid with generators +* Remove `timeConverter` and `timeProvider` properties, setters, and getters in + both `FeatureSet` and `UuidFactory` as those are now exclusively used by the + default `TimeGenerator` +* Move UUID [Doctrine field type] to [ramsey/uuid-doctrine] +* Move `uuid` console application to [ramsey/uuid-console] +* Remove `Uuid::VERSION` package version constant + +### Fixed + +* Improve GUID support to ensure that: + * On little endian (LE) architectures, the byte order of the first three + fields is LE + * On big endian (BE) architectures, it is the same as a GUID + * String representation is always the same +* Fix exception message for `DegradedNumberConverter::fromHex()` + + +## [3.0.0-beta1] - 2015-08-31 + +### Fixed + +* Improve GUID support to ensure that: + * On little endian (LE) architectures, the byte order of the first three + fields is LE + * On big endian (BE) architectures, it is the same as a GUID + * String representation is always the same +* Fix exception message for `DegradedNumberConverter::fromHex()` + + +## [3.0.0-alpha3] - 2015-07-28 + +### Added - * Optimize UUID string decoding [#164](https://github.com/ramsey/uuid/pull/164) +* Enable use of custom `TimeGenerator` implementations +* Add a `setTimeGenerator` method on `UuidFactory` to override the default time + generator +* Add option to enable `PeclUuidTimeGenerator` via `FeatureSet` -## 3.6.0 +### Removed -_Released: 2017-03-18_ +* Remove `timeConverter` and `timeProvider` properties, setters, and getters in + both `FeatureSet` and `UuidFactory` as those are now exclusively used by the + default `TimeGenerator` - * Add `InvalidUuidStringException`, thrown when attempting to decode an invalid string UUID; this does not introduce any BC issues, since the new exception inherits from the previously used `InvalidArgumentException` [#162](https://github.com/ramsey/uuid/pull/162) - * Improve memory usage when generating large quantities of UUIDs (use `str_pad()` and `dechex()` instead of `sprintf()`) [#160](https://github.com/ramsey/uuid/pull/160) - * Minor test and documentation updates -## 3.5.2 +## [3.0.0-alpha2] - 2015-07-28 -_Released: 2016-11-22_ +### Added - * Improved test coverage. +* Refactor time-based (version 1) UUIDs into a `TimeGeneratorInterface` to allow + for other sources to generate version 1 UUIDs in this library +* Add `PeclUuidTimeGenerator` and `PeclUuidRandomGenerator` for creating version + 1 or version 4 UUIDs using the pecl-uuid extension +* Add `RandomBytesGenerator` for use with PHP 7. ramsey/uuid will default to use + this generator when running on PHP 7 -## 3.5.1 +### Changed -_Released: 2016-10-02_ +* Default `RandomLibAdapter` to a medium-strength generator with + [ircmaxell/random-lib]; this is configurable, so other generator strengths may + be used - * Fixed issue where same UUIDs were not treated as equal with mixed case ([#131](https://github.com/ramsey/uuid/issues/131), [#137](https://github.com/ramsey/uuid/pull/137)). - * Test cleanup. +### Removed -## 3.5.0 +* Remove `PeclUuidFactory` in favor of using pecl-uuid with generators -_Released: 2016-08-02_ - * Add `OrderedTimeCodec` to store UUID in an optimized way for InnoDB ([#117](https://github.com/ramsey/uuid/issues/117), [#118](https://github.com/ramsey/uuid/pull/118)). - * Fixed `RandomNodeProvider` to prevent invalid node generation ([#129](https://github.com/ramsey/uuid/pull/129)). - * Cache failed attempt to retrieve system node to avoid multiple system calls ([#107](https://github.com/ramsey/uuid/issues/107), [#121](https://github.com/ramsey/uuid/pull/121)). - * Various test improvements. +## [3.0.0-alpha1] - 2015-07-16 -## 3.4.1 +### Added -_Released: 2016-04-23_ +* Allow dependency injection through `UuidFactory` and/or extending `FeatureSet` + to override any package defaults +* Add a number of generators that may be used to override the library defaults: + * `CombGenerator` to allow generation of sequential UUIDs + * `OpenSslGenerator` to generate random bytes on systems where + `openssql_random_pseudo_bytes()` is present + * `MtRandGenerator` to provide a fallback in the event other random generators + are not present + * `RandomLibAdapter` to allow use of [ircmaxell/random-lib] +* Support GUID generation by configuring a `FeatureSet` to use GUIDs +* Allow UUIDs to be serialized as JSON through `JsonSerializable` - * Fixed test that violated a PHP CodeSniffer rule, breaking the build. +### Changed -## 3.4.0 +* Change root namespace from "Rhumsaa" to "Ramsey;" in most cases, simply + making this change in your applications is the only upgrade path you will + need—everything else should work as expected +* No longer consider `Uuid` class as `final`; everything is now based around + interfaces and factories, allowing you to use this package as a base to + implement other kinds of UUIDs with different dependencies +* Return an object of type `DegradedUuid` on 32-bit systems to indicate that + certain features are not available -_Released: 2016-04-23_ +### Removed - * Add `TimestampFirstCombCodec` and `TimestampLastCombCodec` codecs. - * Improve logic of `CombGenerator` for COMB sequential UUIDs. - * Significantly improved test coverage. +* Move UUID [Doctrine field type] to [ramsey/uuid-doctrine] +* Move `uuid` console application to [ramsey/uuid-console] +* Remove `Uuid::VERSION` package version constant -## 3.3.0 -_Released: 2016-03-22_ +## [2.9.0] - 2016-03-22 - * Drop the use of OpenSSL as a fallback and use [paragonie/random_compat][] to support RandomBytesGenerator in versions of PHP earlier than 7.0. This addresses and fixes the [collision issue][]. - * Improved test coverage. - * Update code to conduct to version 1.4 of the Contributor Covenant. +### Security -## 3.2.0 +* Drop the use of OpenSSL as a fallback and use [paragonie/random_compat] to + support `RandomBytesGenerator` in versions of PHP earlier than 7.0; + this addresses and fixes the [collision issue] -_Released: 2016-02-17_ - * Add random generator option for use for the PECL libsodium extension. - * Updates to test infrastructure. +## [2.8.4] - 2015-12-17 -## 3.1.0 +### Added -_Released: 2015-12-17_ +* Add support for symfony/console v3 in the `uuid` CLI application - * Uuid objects now may be properly serialized/unserialized. - * Update build environments for testing on Travis CI. -## 3.0.1 +## [2.8.3] - 2015-08-31 -_Released: 2015-10-21_ +### Fixed - * Add project [Contributor Code of Conduct](https://github.com/ramsey/uuid/blob/master/CONDUCT.md) - * Modify Travis CI builds to run tests on multiple CPU architectures - * Clean up code, tests, and documentation +* Fix exception message in `Uuid::calculateUuidTime()` -## 3.0.0 -_Released: 2015-09-28_ +## [2.8.2] - 2015-07-23 -The 3.0.0 release represents a significant step for the ramsey/uuid library. While the simple and familiar API used in previous versions remains intact, this release provides greater flexibility to integrators, including the ability to inject your own number generators, UUID codecs, node and time providers, and more. +### Fixed - * BREAK: The root namespace for this package has changed from "Rhumsaa" to "Ramsey." In most cases, simply making this change in your applications is the only upgrade path you will need. Everything else should work as expected. - * BREAK: The UUID [Doctrine field type](http://doctrine-dbal.readthedocs.org/en/latest/reference/types.html) has been moved to [ramsey/uuid-doctrine](https://github.com/ramsey/uuid-doctrine). - * BREAK: The `uuid` console application has been moved to [ramsey/uuid-console](https://github.com/ramsey/uuid-console). - * BREAK: The `Uuid::VERSION` package version constant has been removed. - * See also the release notes for [3.0.0-alpha1][300-alpha1], [3.0.0-alpha2][300-alpha2], [3.0.0-alpha3][300-alpha3], and [3.0.0-beta1][300-beta1]. +* Ensure the release tag makes it into the rhumsaa/uuid package -[300-alpha1]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-alpha1 -[300-alpha2]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-alpha2 -[300-alpha3]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-alpha3 -[300-beta1]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-beta1 -## 3.0.0-beta1 +## [2.8.1] - 2015-06-16 -_Released: 2015-08-31_ +### Fixed - * Improve GUID support to ensure that: - * On little endian (LE) architectures, the byte order of the first three fields is LE. - * On big endian (BE) architectures, it is the same as a GUID. - * String representation is always the same. - * Fix exception message for `DegradedNumberConverter::fromHex()`. - * Add Scrutinizer configuration to run code-quality builds through Scrutinizer. - * Auto-fix Scrutinizer issues. - * Fix support URLs in composer.json to point to the correct GitHub repository. +* Use `passthru()` and output buffering in `getIfconfig()` +* Cache the system node in a static variable so that we process it only once per + runtime -## 3.0.0-alpha3 -_Released: 2015-07-28_ +## [2.8.0] - 2014-11-09 - * Time generator improvements: - * Enabled use of custom TimeGenerator implementations. - * BREAK: Removed now unnecessary `timeConverter` and `timeProvider` properties, setters, and getters in both `FeatureSet` and `UuidFactory` as those are now exclusively used by the default `TimeGenerator`. - * Added a `setTimeGenerator` method on `UuidFactory` to override the default time generator. - * Add option to enable `PeclUuidTimeGenerator` via `FeatureSet`. +### Added -## 3.0.0-alpha2 +* Add static `fromInteger()` method to create UUIDs from string integer or + `Moontoast\Math\BigNumber` -_Released: 2015-07-28_ +### Fixed - * BREAK: Removed `PeclUuidFactory` in favor of using pecl-uuid with generators. - * NEW: Refactored time-based (version 1) UUIDs into a `TimeGeneratorInterface` to allow for other sources to generate version 1 UUIDs in this library. - * NEW: Added `PeclUuidTimeGenerator` and `PeclUuidRandomGenerator` for creating version 1 or version 4 UUIDs using the pecl-uuid extension. - * NEW: Add `RandomBytesGenerator` for use with PHP 7. ramsey/uuid will default to use this generator when running on PHP 7. - * `RandomLibAdapter` now defaults to a medium-strength generator with [ircmaxell/random-lib](https://github.com/ircmaxell/RandomLib). This is configurable, so other generator strengths may be used. - * Migrated to the Travis CI container-based infrastructure for builds. - * Documentation updates and corrections. +* Improve Doctrine conversion to Uuid or string for the ramsey/uuid [Doctrine + field type] -## 3.0.0-alpha1 -_Released: 2015-07-16_ +## [2.7.4] - 2014-10-29 - * BREAK: The root namespace for this package has changed from "Rhumsaa" to "Ramsey." In most cases, simply making this change in your applications is the only upgrade path you will need. Everything else should work as expected. - * BREAK: The UUID [Doctrine field type](http://doctrine-dbal.readthedocs.org/en/latest/reference/types.html) has been moved to [ramsey/uuid-doctrine](https://github.com/ramsey/uuid-doctrine). - * BREAK: The `uuid` console application has been moved to [ramsey/uuid-console](https://github.com/ramsey/uuid-console). - * BREAK: The `Uuid::VERSION` package version constant has been removed. - * NEW: The `Uuid` class is no longer marked as `final`. Everything is now based around interfaces and factories, allowing you to use this package as a base to implement other kinds of UUIDs with different dependencies. - * NEW: Through setting dependencies on `UuidFactory` and/or extending `FeatureSet`, you may override any package defaults, injecting your own dependencies. - * NEW: For random number generation, in addition to `OpenSslGenerator` (used if `openssl_random_pseudo_bytes()` is present) and the fallback `MtRandGenerator`, you may use the bundled `CombGenerator` for sequential UUIDs or the `RandomLibAdapter` if using [ircmaxell/random-lib](https://github.com/ircmaxell/RandomLib). - * NEW: In addition to the default UUID generation, this library also supports GUID generation by configuring a `FeatureSet` to use GUIDs. - * NEW: While the interface to create UUIDs hasn't changed, if using this package on a 32-bit system, you will now receive an object of type `DegradedUuid` (which extends `Uuid`, which implements `UuidInterface`). - * NEW: All UUIDs are now [JsonSerializable](http://php.net/JsonSerializable). +### Fixed -## 2.9.0 +* Change loop in `generateBytes()` from `foreach` to `for` -_Released: 2016-03-22_ - * Drop support for OpenSSL in favor of [paragonie/random_compat][]. This addresses and fixes the [collision issue][]. +## [2.7.3] - 2014-08-27 -## 2.8.4 +### Fixed -_Released: 2015-12-17_ +* Fix upper range for `mt_rand` used in version 4 UUIDs - * Add support for symfony/console v3. - * Update build matrix to run Travis CI tests on PHP 7 & with lowest package versions. -## 2.8.3 +## [2.7.2] - 2014-07-28 -_Released: 2015-08-31_ +### Changed - * Fix exception message in `Uuid::calculateUuidTime()`. - * Update composer.json to reflect new repository and package name. +* Upgrade to PSR-4 autoloading -## 2.8.2 -_Released: 2015-07-23_ +## [2.7.1] - 2014-02-19 - * Ensure the release tag makes it into the rhumsaa/uuid package. - * Minor documentation changes. +### Fixed -## 2.8.1 +* Move moontoast/math and symfony/console to require-dev +* Support symfony/console 2.3 (LTS version) -_Released: 2015-06-16_ - * Use `passthru()` and output buffering in `getIfconfig()`. - * Cache the system node in a static variable so that we process it only once per runtime. - * Set ramsey/uuid as a replacement for rhumsaa/uuid in composer.json. - * Documentation updates and corrections. +## [2.7.0] - 2014-01-31 -## 2.8.0 +### Added -_Released: 2014-11-09_ +* Add `Uuid::VALID_PATTERN` constant containing a UUID validation regex pattern - * Added static `fromInteger()` method to create UUIDs from string integer or `\Moontoast\Math\BigNumber`. - * Friendlier Doctrine conversion to Uuid or string. - * Documentation fixes. -## 2.7.4 +## [2.6.1] - 2014-01-27 -_Released: 2014-10-29_ +### Fixed - * Changed loop in `generateBytes()` from `foreach` to `for`; see #33 - * Use `toString()` in README examples to avoid confusion - * Exclude build/development tools from releases using .gitattributes - * Set timezone properly for tests +* Fix bug where `uuid` console application could not find the Composer + autoloader when installed in another project -## 2.7.3 -_Released: 2014-08-27_ +## [2.6.0] - 2014-01-17 - * Fixed upper range for `mt_rand` used in version 4 UUIDs +### Added -## 2.7.2 +* Introduce `uuid` console application for generating and decoding UUIDs from + CLI (run `./bin/uuid` for details) +* Add `Uuid::getInteger()` to retrieve a `Moontoast\Math\BigNumber` + representation of the 128-bit integer representing the UUID +* Add `Uuid::getHex()` to retrieve the hexadecimal representation of the UUID +* Use `netstat` on Linux to capture the node for a version 1 UUID +* Require moontoast/math as part of the regular package requirements -_Released: 2014-07-28_ - * Upgraded to PSR-4 autoloading - * Testing upgrades: - * Testing against PHP 5.6 - * Testing with PHPUnit 4 - * Using Coveralls.io to generate code coverage reports - * Documentation fixes +## [2.5.0] - 2013-10-30 -## 2.7.1 +### Added -_Released: 2014-02-19_ +* Use `openssl_random_pseudo_bytes()`, if available, to generate random bytes - * Moved moontoast/math and symfony/console to require-dev; fixes #20 - * Now supporting symfony/console for 2.3 (LTS version); fixes #21 - * Updated tests to run even when dev packages are not installed (skips tests if requirements are not met) -## 2.7.0 +## [2.4.0] - 2013-07-29 -_Released: 2014-01-31_ +### Added - * Moved UUID validation regex pattern into constant for external use (`Uuid::VALID_PATTERN`) +* Return `null` from `Uuid::getVersion()` if the UUID isn't an RFC 4122 variant +* Support string UUIDs without dashes passed to `Uuid::fromString()` -## 2.6.1 -_Released: 2014-01-27_ +## [2.3.0] - 2013-07-16 - * Fixed bug where `uuid` console application could not find the Composer autoloader when installed in another project +### Added -## 2.6.0 +* Support creation of UUIDs from bytes with `Uuid::fromBytes()` -_Released: 2014-01-17_ - * Introduced `uuid` console application for generating and decoding UUIDs from CLI (run `./bin/uuid` for details) - * Added `Uuid::getInteger()` to retrieve a Moontoast\Math\BigNumber representation of the 128-bit integer representing the UUID - * Added `Uuid::getHex()` to retrieve the hexadecimal representation of the UUID - * Now using netstat on Linux to capture the node for a version 1 UUID - * Now requiring Moontoast\Math as part of the regular package requirements, not just the dev requirements +## [2.2.0] - 2013-07-04 -## 2.5.0 +### Added -_Released: 2013-10-30_ +* Add `Doctrine\UuidType::requiresSQLCommentHint()` method - * Using `openssl_random_pseudo_bytes()`, if available, to generate random bytes, by merging in PR #15 from @dfreudenberger - * Fixed test for Rhumsaa\Uuid\Doctrine\UuidType, by merging in PR #17 from @dfreudenberger - * Documentation fixes -## 2.4.0 +## [2.1.2] - 2013-07-03 -_Released: 2013-07-29_ +### Fixed - * `Uuid::getVersion()` now returns null if the UUID isn't an RFC 4122 variant - * `Uuid::fromString()` now supports a 128-bit integer formatted as a hexadecimal string (UUID without dashes) - * Tests have been greatly enhanced, borrowing from the Python UUID library +* Fix cases where the system node was coming back with uppercase hexadecimal + digits; this ensures that case in the node is converted to lowercase -## 2.3.0 -_Released: 2013-07-16_ +## [2.1.1] - 2013-04-29 - * Added `Uuid::fromBytes()` by merging in PR #14 from @asm89 +### Fixed -## 2.2.0 +* Fix bug in `Uuid::isValid()` where the NIL UUID was not reported as valid -_Released: 2013-07-04_ - * Added `Doctrine\UuidType::requiresSQLCommentHint()` method by merging in PR #13 from @zerrvox - * Removed `"minimum-stability": "dev"` from composer.json +## [2.1.0] - 2013-04-15 -## 2.1.2 +### Added -_Released: 2013-07-03_ +* Allow checking the validity of a UUID through the `Uuid::isValid()` method - * @ericthelin found cases where the system node was coming back with uppercase hexadecimal digits; this ensures that case in the node is converted to lowercase -## 2.1.1 +## [2.0.0] - 2013-02-11 -_Released: 2013-04-29_ +### Added - * Fixed NIL bug in `Uuid::isValid()` method, reported by @ocubom in PR #11 +* Support UUID generation on 32-bit platforms -## 2.1.0 +### Changed -_Released: 2013-04-15_ +* Mark `Uuid` class `final` +* Require moontoast/math on 64-bit platforms for + `Uuid::getLeastSignificantBits()` and `Uuid::getMostSignificantBits()`; the + integers returned by these methods are *unsigned* 64-bit integers and + unsupported even on 64-bit builds of PHP +* Move `UnsupportedOperationException` to the `Exception` subnamespace - * Added static `Uuid::isValid()` method for checking whether a string is a valid UUID -## 2.0.0 +## [1.1.2] - 2012-11-29 -_Released: 2013-02-11_ +### Fixed - * Break: `Uuid` class is now marked as "final" - * Break: `Uuid::getLeastSignificantBits()` no longer returns an integer on 64-bit platforms; it requires `moontoast/math` - * Break: `Uuid::getMostSignificantBits()` no longer returns an integer on 64-bit platforms; it requires `moontoast/math` - * Break: Moved `UnsupportedOperationException` to the `Exception` subnamespace - * Added support for 32-bit platforms - * Added generated API documentation to the repository +* Relax [Doctrine field type] conversion rules for UUIDs -## 1.1.2 -_Released: 2012-11-29_ +## [1.1.1] - 2012-08-27 - * Relaxed Doctrine type conversion rules +### Fixed -## 1.1.1 +* Remove `final` keyword from `Uuid` class -_Released: 2012-08-27_ - * Removed `final` keyword from `Uuid` class +## [1.1.0] - 2012-08-06 -## 1.1.0 +### Added -_Released: 2012-08-06_ +* Support ramsey/uuid UUIDs as a Doctrine Database Abstraction Layer (DBAL) + field mapping type - * Added `Doctrine\UuidType` as a field mapping type for the Doctrine Database Abstraction Layer (DBAL) - * Improved tests and code coverage -## 1.0.0 +## [1.0.0] - 2012-07-19 -_Released: 2012-07-19_ +### Added - * Initial release +* Support generation of version 1, 3, 4, and 5 UUIDs +[comb sequential uuids]: http://www.informit.com/articles/article.aspx?p=25862&seqNum=7 [paragonie/random_compat]: https://github.com/paragonie/random_compat [collision issue]: https://github.com/ramsey/uuid/issues/80 +[contributor code of conduct]: https://github.com/ramsey/uuid/blob/master/.github/CODE_OF_CONDUCT.md +[pecl libsodium extension]: http://pecl.php.net/package/libsodium +[ircmaxell/random-lib]: https://github.com/ircmaxell/RandomLib +[doctrine field type]: http://doctrine-dbal.readthedocs.org/en/latest/reference/types.html +[ramsey/uuid-doctrine]: https://github.com/ramsey/uuid-doctrine +[ramsey/uuid-console]: https://github.com/ramsey/uuid-console + +[unreleased]: https://github.com/ramsey/uuid/compare/3.9.1...HEAD +[3.9.1]: https://github.com/ramsey/uuid/compare/3.9.0...3.9.1 +[3.9.0]: https://github.com/ramsey/uuid/compare/3.8.0...3.9.0 +[3.8.0]: https://github.com/ramsey/uuid/compare/3.7.3...3.8.0 +[3.7.3]: https://github.com/ramsey/uuid/compare/3.7.2...3.7.3 +[3.7.2]: https://github.com/ramsey/uuid/compare/3.7.1...3.7.2 +[3.7.1]: https://github.com/ramsey/uuid/compare/3.7.0...3.7.1 +[3.7.0]: https://github.com/ramsey/uuid/compare/3.6.1...3.7.0 +[3.6.1]: https://github.com/ramsey/uuid/compare/3.6.0...3.6.1 +[3.6.0]: https://github.com/ramsey/uuid/compare/3.5.2...3.6.0 +[3.5.2]: https://github.com/ramsey/uuid/compare/3.5.1...3.5.2 +[3.5.1]: https://github.com/ramsey/uuid/compare/3.5.0...3.5.1 +[3.5.0]: https://github.com/ramsey/uuid/compare/3.4.1...3.5.0 +[3.4.1]: https://github.com/ramsey/uuid/compare/3.4.0...3.4.1 +[3.4.0]: https://github.com/ramsey/uuid/compare/3.3.0...3.4.0 +[3.3.0]: https://github.com/ramsey/uuid/compare/3.2.0...3.3.0 +[3.2.0]: https://github.com/ramsey/uuid/compare/3.1.0...3.2.0 +[3.1.0]: https://github.com/ramsey/uuid/compare/3.0.1...3.1.0 +[3.0.1]: https://github.com/ramsey/uuid/compare/3.0.0...3.0.1 +[3.0.0]: https://github.com/ramsey/uuid/compare/3.0.0-beta1...3.0.0 +[3.0.0-beta1]: https://github.com/ramsey/uuid/compare/3.0.0-alpha3...3.0.0-beta1 +[3.0.0-alpha3]: https://github.com/ramsey/uuid/compare/3.0.0-alpha2...3.0.0-alpha3 +[3.0.0-alpha2]: https://github.com/ramsey/uuid/compare/3.0.0-alpha1...3.0.0-alpha2 +[3.0.0-alpha1]: https://github.com/ramsey/uuid/compare/2.9.0...3.0.0-alpha1 +[2.9.0]: https://github.com/ramsey/uuid/compare/2.8.4...2.9.0 +[2.8.4]: https://github.com/ramsey/uuid/compare/2.8.3...2.8.4 +[2.8.3]: https://github.com/ramsey/uuid/compare/2.8.2...2.8.3 +[2.8.2]: https://github.com/ramsey/uuid/compare/2.8.1...2.8.2 +[2.8.1]: https://github.com/ramsey/uuid/compare/2.8.0...2.8.1 +[2.8.0]: https://github.com/ramsey/uuid/compare/2.7.4...2.8.0 +[2.7.4]: https://github.com/ramsey/uuid/compare/2.7.3...2.7.4 +[2.7.3]: https://github.com/ramsey/uuid/compare/2.7.2...2.7.3 +[2.7.2]: https://github.com/ramsey/uuid/compare/2.7.1...2.7.2 +[2.7.1]: https://github.com/ramsey/uuid/compare/2.7.0...2.7.1 +[2.7.0]: https://github.com/ramsey/uuid/compare/2.6.1...2.7.0 +[2.6.1]: https://github.com/ramsey/uuid/compare/2.6.0...2.6.1 +[2.6.0]: https://github.com/ramsey/uuid/compare/2.5.0...2.6.0 +[2.5.0]: https://github.com/ramsey/uuid/compare/2.4.0...2.5.0 +[2.4.0]: https://github.com/ramsey/uuid/compare/2.3.0...2.4.0 +[2.3.0]: https://github.com/ramsey/uuid/compare/2.2.0...2.3.0 +[2.2.0]: https://github.com/ramsey/uuid/compare/2.1.2...2.2.0 +[2.1.2]: https://github.com/ramsey/uuid/compare/2.1.1...2.1.2 +[2.1.1]: https://github.com/ramsey/uuid/compare/2.1.0...2.1.1 +[2.1.0]: https://github.com/ramsey/uuid/compare/2.0.0...2.1.0 +[2.0.0]: https://github.com/ramsey/uuid/compare/1.1.2...2.0.0 +[1.1.2]: https://github.com/ramsey/uuid/compare/1.1.1...1.1.2 +[1.1.1]: https://github.com/ramsey/uuid/compare/1.1.0...1.1.1 +[1.1.0]: https://github.com/ramsey/uuid/compare/1.0.0...1.1.0 +[1.0.0]: https://github.com/ramsey/uuid/commits/1.0.0 diff --git a/vendor/ramsey/uuid/CODE_OF_CONDUCT.md b/vendor/ramsey/uuid/CODE_OF_CONDUCT.md deleted file mode 100644 index 9c207259b..000000000 --- a/vendor/ramsey/uuid/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,74 +0,0 @@ -# Contributor Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of experience, -nationality, personal appearance, race, religion, or sexual identity and -orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or -advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project maintainer at <ben@benramsey.com>. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ diff --git a/vendor/ramsey/uuid/CONTRIBUTING.md b/vendor/ramsey/uuid/CONTRIBUTING.md deleted file mode 100644 index 4cde9b840..000000000 --- a/vendor/ramsey/uuid/CONTRIBUTING.md +++ /dev/null @@ -1,75 +0,0 @@ -# Contributing - -Contributions are welcome. We accept pull requests on [GitHub](https://github.com/ramsey/uuid). - -This project adheres to a [Contributor Code of Conduct](https://github.com/ramsey/uuid/blob/master/CODE_OF_CONDUCT.md). By participating in this project and its community, you are expected to uphold this code. - -## Team members - -* [Ben Ramsey](https://github.com/ramsey) - original author and maintainer -* [Marijn Huizendveld](https://github.com/marijn) - contributor, author of UUID type definition for Doctrine DBAL -* [Thibaud Fabre](https://github.com/aztech-dev) - contributor, lead developer for version 3.0.0 re-architecture - -## Communication Channels - -You can find help and discussion in the following places: - -* GitHub Issues: <https://github.com/ramsey/uuid/issues> -* Wiki: <https://github.com/ramsey/uuid/wiki> - -## Reporting Bugs - -Bugs are tracked in our project's [issue tracker](https://github.com/ramsey/uuid/issues). - -When submitting a bug report, please include enough information for us to reproduce the bug. A good bug report includes the following sections: - -* Expected outcome -* Actual outcome -* Steps to reproduce, including sample code -* Any other information that will help us debug and reproduce the issue, including stack traces, system/environment information, and screenshots - -**Please do not include passwords or any personally identifiable information in your bug report and sample code.** - -## Fixing Bugs - -We welcome pull requests to fix bugs! - -If you see a bug report that you'd like to fix, please feel free to do so. Following the directions and guidelines described in the "Adding New Features" section below, you may create bugfix branches and send us pull requests. - -## Adding New Features - -If you have an idea for a new feature, it's a good idea to check out our [issues](https://github.com/ramsey/uuid/issues) or active [pull requests](https://github.com/ramsey/uuid/pulls) first to see if the feature is already being worked on. If not, feel free to submit an issue first, asking whether the feature is beneficial to the project. This will save you from doing a lot of development work only to have your feature rejected. We don't enjoy rejecting your hard work, but some features just don't fit with the goals of the project. - -When you do begin working on your feature, here are some guidelines to consider: - -* Your pull request description should clearly detail the changes you have made. We will use this description to add to our CHANGELOG. If there is no description or it does not adequately describe your feature, we will ask you to update the description. -* We following the **[PSR-2 coding standard](http://www.php-fig.org/psr/psr-2/)**. Please ensure your code does, too. -* Please **write tests** for any new features you add. -* Please **ensure that tests pass** before submitting your pull request. We have Travis CI automatically running tests for pull requests. However, running the tests locally will help save time. -* **Use topic/feature branches.** Please do not ask us to pull from your master branch. -* **Submit one feature per pull request.** If you have multiple features you wish to submit, please break them up into separate pull requests. -* **Send coherent history**. Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please squash them before submitting. - -## Running Tests - -The following tests must pass before we will accept a pull request. If any of these do not pass, it will result in a complete build failure. Before you can run these, be sure to `composer install`. - -``` -composer test -``` - -### Locally Test With Emulated MIPS Architecture - -The following commands use [Vagrant](https://www.vagrantup.com/) to start an Ubuntu VM, install necessary dependencies, and then run the `tools/run-tests.sh` script that will download a Docker image emulating the MIPS architecture. This is especially helpful for testing UUID generation in a big-endian environment. - -``` -vagrant init ubuntu/trusty64 -vagrant up -vagrant ssh -sudo apt-get install docker.io qemu-user-static php5-cli php5-curl -cd /vagrant -curl -sS https://getcomposer.org/installer | php -php composer.phar install --no-interaction --prefer-dist -mkdir -p build/logs -ARCH=mips PHP_VERSION=5.6.14 TRAVIS_BUILD_DIR=/vagrant ./tools/run-tests.sh -``` diff --git a/vendor/ramsey/uuid/LICENSE b/vendor/ramsey/uuid/LICENSE index 753a4c9c8..f6f7e8043 100644 --- a/vendor/ramsey/uuid/LICENSE +++ b/vendor/ramsey/uuid/LICENSE @@ -1,4 +1,6 @@ -Copyright (c) 2012-2018 Ben Ramsey <ben@benramsey.com> +MIT License + +Copyright (c) 2012-2019 Ben Ramsey <ben@benramsey.com> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -7,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/ramsey/uuid/README.md b/vendor/ramsey/uuid/README.md index b6557abbc..95d4c21c0 100644 --- a/vendor/ramsey/uuid/README.md +++ b/vendor/ramsey/uuid/README.md @@ -1,31 +1,47 @@ # ramsey/uuid -_NOTICE: Formerly known as `rhumsaa/uuid`, The package and namespace names have changed to `ramsey/uuid` and `Ramsey\Uuid`, respectively._ +*NOTICE: Formerly known as `rhumsaa/uuid`, The package and namespace names have +changed to `ramsey/uuid` and `Ramsey\Uuid`, respectively.* [![Source Code][badge-source]][source] [![Latest Version][badge-release]][release] [![Software License][badge-license]][license] +[![PHP Version][badge-php]][php] [![Build Status][badge-build]][build] [![Coverage Status][badge-coverage]][coverage] [![Total Downloads][badge-downloads]][downloads] -ramsey/uuid is a PHP 5.4+ library for generating and working with [RFC 4122][rfc4122] version 1, 3, 4, and 5 universally unique identifiers (UUID). +ramsey/uuid is a PHP 5.4+ library for generating and working with +[RFC 4122][rfc4122] version 1, 3, 4, and 5 universally unique identifiers +(UUID). -This project adheres to a [Contributor Code of Conduct][conduct]. By participating in this project and its community, you are expected to uphold this code. - - -## About +This project adheres to a [Contributor Code of Conduct][conduct]. By +participating in this project and its community, you are expected to uphold this +code. From [Wikipedia](http://en.wikipedia.org/wiki/Universally_unique_identifier): -> The intent of UUIDs is to enable distributed systems to uniquely identify information without significant central coordination. In this context the word unique should be taken to mean "practically unique" rather than "guaranteed unique". Since the identifiers have a finite size, it is possible for two differing items to share the same identifier. The identifier size and generation process need to be selected so as to make this sufficiently improbable in practice. Anyone can create a UUID and use it to identify something with reasonable confidence that the same identifier will never be unintentionally created by anyone to identify something else. Information labeled with UUIDs can therefore be later combined into a single database without needing to resolve identifier (ID) conflicts. +> The intent of UUIDs is to enable distributed systems to uniquely identify +> information without significant central coordination. In this context the word +> unique should be taken to mean "practically unique" rather than "guaranteed +> unique". Since the identifiers have a finite size, it is possible for two +> differing items to share the same identifier. The identifier size and +> generation process need to be selected so as to make this sufficiently +> improbable in practice. Anyone can create a UUID and use it to identify +> something with reasonable confidence that the same identifier will never be +> unintentionally created by anyone to identify something else. Information +> labeled with UUIDs can therefore be later combined into a single database +> without needing to resolve identifier (ID) conflicts. -Much inspiration for this library came from the [Java][javauuid] and [Python][pyuuid] UUID libraries. +Much inspiration for this library came from the [Java][javauuid] and +[Python][pyuuid] UUID libraries. ## Installation -The preferred method of installation is via [Packagist][] and [Composer][]. Run the following command to install the package and add it as a requirement to your project's `composer.json`: +The preferred method of installation is via [Composer][]. Run the following +command to install the package and add it as a requirement to your project's +`composer.json`: ```bash composer require ramsey/uuid @@ -34,23 +50,36 @@ composer require ramsey/uuid ## Upgrading from 2.x to 3.x -While we have made significant internal changes to the library, we have made every effort to ensure a seamless upgrade path from the 2.x series of this library to 3.x. +While we have made significant internal changes to the library, we have made +every effort to ensure a seamless upgrade path from the 2.x series of this +library to 3.x. -One major breaking change is the transition from the `Rhumsaa` root namespace to `Ramsey`. In most cases, all you will need is to change the namespace to `Ramsey` in your code, and everything will "just work." +One major breaking change is the transition from the `Rhumsaa` root namespace to +`Ramsey`. In most cases, all you will need is to change the namespace to +`Ramsey` in your code, and everything will "just work." Here are full details on the breaking changes to the public API of this library: -1. All namespace references of `Rhumsaa` have changed to `Ramsey`. Simply change the namespace to `Ramsey` in your code and everything should work. -2. The console application has moved to [ramsey/uuid-console](https://packagist.org/packages/ramsey/uuid-console). If using the console functionality, use Composer to require `ramsey/uuid-console`. -3. The Doctrine field type mapping has moved to [ramsey/uuid-doctrine](https://packagist.org/packages/ramsey/uuid-doctrine). If using the Doctrine functionality, use Composer to require `ramsey/uuid-doctrine`. +1. All namespace references of `Rhumsaa` have changed to `Ramsey`. Simply change + the namespace to `Ramsey` in your code and everything should work. +2. The console application has moved to + [ramsey/uuid-console](https://packagist.org/packages/ramsey/uuid-console). + If using the console functionality, use Composer to require + `ramsey/uuid-console`. +3. The Doctrine field type mapping has moved to + [ramsey/uuid-doctrine](https://packagist.org/packages/ramsey/uuid-doctrine). + If using the Doctrine functionality, use Composer to require + `ramsey/uuid-doctrine`. ## What to do if you see a "rhumsaa/uuid is abandoned" message -When installing your project's dependencies using Composer, you might see the following message: +When installing your project's dependencies using Composer, you might see the +following message: ``` -Package rhumsaa/uuid is abandoned, you should avoid using it. Use ramsey/uuid instead. +Package rhumsaa/uuid is abandoned, you should avoid using it. Use +ramsey/uuid instead. ``` Don't panic. Simply execute the following commands with Composer: @@ -60,32 +89,28 @@ composer remove rhumsaa/uuid composer require ramsey/uuid=^2.9 ``` -After doing so, you will have the latest ramsey/uuid package in the 2.x series, and there will be no need to modify any code; the namespace in the 2.x series is still `Rhumsaa`. +After doing so, you will have the latest ramsey/uuid package in the 2.x series, +and there will be no need to modify any code; the namespace in the 2.x series is +still `Rhumsaa`. ## Requirements -Some methods in this library have requirements due to integer size restrictions on 32-bit and 64-bit builds of PHP. A 64-bit build of PHP and the [Moontoast\Math][] library are recommended. However, this library is designed to work on 32-bit builds of PHP without Moontoast\Math, with some degraded functionality. Please check the API documentation for more information. - -If a particular requirement is not present, then an `UnsatisfiedDependencyException` is thrown, allowing one to catch a bad call in an environment where the call is not supported and gracefully degrade. +Some methods in this library have requirements due to integer size restrictions +on 32-bit and 64-bit builds of PHP. A 64-bit build of PHP and the +[Moontoast\Math][] library are recommended. However, this library is designed to +work on 32-bit builds of PHP without Moontoast\Math, with some degraded +functionality. Please check the API documentation for more information. - -## API documentation - -The [latest class API documentation][apidocs] is available online. - -This project uses [ApiGen](http://apigen.org/) to generate this documentation. To generate the documentation on your own, install dev dependencies and run the following command from the root of the project: - -``` -composer build-docs -``` - -This will generate documentation in the `build/apidocs/` folder. +If a particular requirement is not present, then an +`UnsatisfiedDependencyException` is thrown, allowing one to catch a bad call in +an environment where the call is not supported and gracefully degrade. ## Examples -See the [cookbook on the wiki][wiki-cookbook] for more examples and approaches to specific use-cases. +See the [cookbook on the wiki][wiki-cookbook] for more examples and approaches +to specific use-cases. ```php <?php @@ -124,36 +149,37 @@ try { ## Contributing -Contributions are welcome! Please read [CONTRIBUTING][] for details. - +Contributions are welcome! Please read [CONTRIBUTING.md][] for details. -## Copyright and license -The ramsey/uuid library is copyright © [Ben Ramsey](https://benramsey.com/) and licensed for use under the MIT License (MIT). Please see [LICENSE][] for more information. +## Copyright and License +The ramsey/uuid library is copyright © [Ben Ramsey](https://benramsey.com/) and +licensed for use under the MIT License (MIT). Please see [LICENSE][] for more +information. [rfc4122]: http://tools.ietf.org/html/rfc4122 -[conduct]: https://github.com/ramsey/uuid/blob/master/CODE_OF_CONDUCT.md +[conduct]: https://github.com/ramsey/uuid/blob/master/.github/CODE_OF_CONDUCT.md [javauuid]: http://docs.oracle.com/javase/6/docs/api/java/util/UUID.html [pyuuid]: http://docs.python.org/3/library/uuid.html -[packagist]: https://packagist.org/packages/ramsey/uuid [composer]: http://getcomposer.org/ [moontoast\math]: https://packagist.org/packages/moontoast/math -[apidocs]: http://docs.benramsey.com/ramsey-uuid/latest/ [wiki-cookbook]: https://github.com/ramsey/uuid/wiki/Ramsey%5CUuid-Cookbook -[contributing]: https://github.com/ramsey/uuid/blob/master/CONTRIBUTING.md +[contributing.md]: https://github.com/ramsey/uuid/blob/master/.github/CONTRIBUTING.md [badge-source]: https://img.shields.io/badge/source-ramsey/uuid-blue.svg?style=flat-square -[badge-release]: https://img.shields.io/packagist/v/ramsey/uuid.svg?style=flat-square -[badge-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square +[badge-release]: https://img.shields.io/packagist/v/ramsey/uuid.svg?style=flat-square&label=release +[badge-license]: https://img.shields.io/packagist/l/ramsey/uuid.svg?style=flat-square +[badge-php]: https://img.shields.io/packagist/php-v/ramsey/uuid.svg?style=flat-square [badge-build]: https://img.shields.io/travis/ramsey/uuid/master.svg?style=flat-square -[badge-coverage]: https://img.shields.io/coveralls/ramsey/uuid/master.svg?style=flat-square -[badge-downloads]: https://img.shields.io/packagist/dt/ramsey/uuid.svg?style=flat-square +[badge-coverage]: https://img.shields.io/coveralls/github/ramsey/uuid/master.svg?style=flat-square +[badge-downloads]: https://img.shields.io/packagist/dt/ramsey/uuid.svg?style=flat-square&colorB=mediumvioletred [source]: https://github.com/ramsey/uuid [release]: https://packagist.org/packages/ramsey/uuid [license]: https://github.com/ramsey/uuid/blob/master/LICENSE +[php]: https://php.net [build]: https://travis-ci.org/ramsey/uuid -[coverage]: https://coveralls.io/r/ramsey/uuid?branch=master +[coverage]: https://coveralls.io/github/ramsey/uuid?branch=master [downloads]: https://packagist.org/packages/ramsey/uuid diff --git a/vendor/ramsey/uuid/composer.json b/vendor/ramsey/uuid/composer.json index 952120cd4..5319644fe 100644 --- a/vendor/ramsey/uuid/composer.json +++ b/vendor/ramsey/uuid/composer.json @@ -1,7 +1,7 @@ { "name": "ramsey/uuid", - "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", "type": "library", + "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", "keywords": ["uuid", "identifier", "guid"], "homepage": "https://github.com/ramsey/uuid", "license": "MIT", @@ -20,61 +20,79 @@ "email": "thibaud@aztech.io" } ], - "support": { - "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid" - }, "require": { - "php": "^5.4 || ^7.0", - "paragonie/random_compat": "^1.0|^2.0|9.99.99", + "php": "^5.4 | ^7", + "ext-json": "*", + "paragonie/random_compat": "^1 | ^2 | 9.99.99", "symfony/polyfill-ctype": "^1.8" }, "require-dev": { - "codeception/aspect-mock": "^1.0 | ~2.0.0", - "doctrine/annotations": "~1.2.0", - "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0", - "ircmaxell/random-lib": "^1.1", + "codeception/aspect-mock": "^1 | ^2", + "doctrine/annotations": "^1.2", + "goaop/framework": "1.0.0-alpha.2 | ^1 | ^2.1", "jakub-onderka/php-parallel-lint": "^0.9.0", "mockery/mockery": "^0.9.9", "moontoast/math": "^1.1", - "php-mock/php-mock-phpunit": "^0.3|^1.1", - "phpunit/phpunit": "^4.7|^5.0|^6.5", + "paragonie/random-lib": "^2", + "php-mock/php-mock-phpunit": "^0.3 | ^1.1", + "phpunit/phpunit": "^4.8 | ^5.4 | ^6.5", "squizlabs/php_codesniffer": "^2.3" }, "suggest": { "ext-ctype": "Provides support for PHP Ctype functions", - "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter", "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator", + "ext-openssl": "Provides the OpenSSL extension for use with the OpenSslGenerator", "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator", "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).", + "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid", "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type.", - "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid" + "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter" }, - "autoload": { - "psr-4": {"Ramsey\\Uuid\\": "src/"} + "config": { + "sort-packages": true }, - "autoload-dev": { - "psr-4": {"Ramsey\\Uuid\\Test\\": "tests/"} + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } }, "replace": { "rhumsaa/uuid": "self.version" }, - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" + "autoload": { + "psr-4": { + "Ramsey\\Uuid\\": "src/" + }, + "files": [ + "src/functions.php" + ] + }, + "autoload-dev": { + "psr-4": { + "Ramsey\\Uuid\\Test\\": "tests/" } }, "scripts": { "lint": "parallel-lint src tests", - "phpunit": "phpunit --verbose --colors=always", "phpcs": "phpcs src tests --standard=psr2 -sp --colors", + "phpunit": "phpunit --verbose --colors=always", + "phpunit-ci": "phpunit --verbose --coverage-clover build/logs/clover.xml", + "phpunit-coverage": "phpunit --verbose --colors=always --coverage-html build/coverage", "test": [ "@lint", - "@phpunit", - "@phpcs" + "@phpcs", + "@phpunit" + ], + "test-ci": [ + "@lint", + "@phpcs", + "@phpunit-ci" ] }, - "config": { - "sort-packages": true + "support": { + "issues": "https://github.com/ramsey/uuid/issues", + "rss": "https://github.com/ramsey/uuid/releases.atom", + "source": "https://github.com/ramsey/uuid", + "wiki": "https://github.com/ramsey/uuid/wiki" } } diff --git a/vendor/ramsey/uuid/src/BinaryUtils.php b/vendor/ramsey/uuid/src/BinaryUtils.php index f04a9d9c1..18ea467d9 100644 --- a/vendor/ramsey/uuid/src/BinaryUtils.php +++ b/vendor/ramsey/uuid/src/BinaryUtils.php @@ -18,7 +18,6 @@ class BinaryUtils { // Set the variant to RFC 4122 $clockSeqHi = $clockSeqHi & 0x3f; - $clockSeqHi &= ~(0xc0); $clockSeqHi |= 0x80; return $clockSeqHi; @@ -35,7 +34,6 @@ class BinaryUtils public static function applyVersion($timeHi, $version) { $timeHi = hexdec($timeHi) & 0x0fff; - $timeHi &= ~(0xf000); $timeHi |= $version << 12; return $timeHi; 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..270a1e75b 100644 --- a/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php +++ b/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php @@ -13,6 +13,7 @@ */ namespace Ramsey\Uuid\Codec; +use Ramsey\Uuid\Exception\InvalidUuidStringException; use Ramsey\Uuid\UuidInterface; /** @@ -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 { - } diff --git a/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php b/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php index 9505e8c6d..b978e2e7b 100644 --- a/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php +++ b/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php @@ -14,6 +14,8 @@ namespace Ramsey\Uuid\Converter; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; + /** * NumberConverterInterface converts UUIDs from hexadecimal characters into * representations of integers and vice versa @@ -28,7 +30,7 @@ interface NumberConverterInterface * * @param string $hex The hexadecimal string representation to convert * @return mixed - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present */ public function fromHex($hex); @@ -40,7 +42,7 @@ interface NumberConverterInterface * a true integer, a string integer, or a object representation that * this converter can understand * @return string Hexadecimal string - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present */ public function toHex($integer); } diff --git a/vendor/ramsey/uuid/src/Converter/Time/BigNumberTimeConverter.php b/vendor/ramsey/uuid/src/Converter/Time/BigNumberTimeConverter.php index d47c80191..112f72272 100644 --- a/vendor/ramsey/uuid/src/Converter/Time/BigNumberTimeConverter.php +++ b/vendor/ramsey/uuid/src/Converter/Time/BigNumberTimeConverter.php @@ -43,16 +43,17 @@ class BigNumberTimeConverter implements TimeConverterInterface $usec = new BigNumber($microSeconds); $usec->multiply('10'); - $uuidTime->add($sec) + $uuidTime + ->add($sec) ->add($usec) ->add('122192928000000000'); $uuidTimeHex = sprintf('%016s', $uuidTime->convertToBase(16)); - return array( + return [ 'low' => substr($uuidTimeHex, 8), 'mid' => substr($uuidTimeHex, 4, 4), 'hi' => substr($uuidTimeHex, 0, 4), - ); + ]; } } diff --git a/vendor/ramsey/uuid/src/Converter/Time/PhpTimeConverter.php b/vendor/ramsey/uuid/src/Converter/Time/PhpTimeConverter.php index 6a9da74b8..57c882dbb 100644 --- a/vendor/ramsey/uuid/src/Converter/Time/PhpTimeConverter.php +++ b/vendor/ramsey/uuid/src/Converter/Time/PhpTimeConverter.php @@ -38,10 +38,10 @@ class PhpTimeConverter implements TimeConverterInterface // UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00. $uuidTime = ($seconds * 10000000) + ($microSeconds * 10) + 0x01b21dd213814000; - return array( + return [ 'low' => sprintf('%08x', $uuidTime & 0xffffffff), 'mid' => sprintf('%04x', ($uuidTime >> 32) & 0xffff), 'hi' => sprintf('%04x', ($uuidTime >> 48) & 0x0fff), - ); + ]; } } diff --git a/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php b/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php index 382008ac3..c851792f3 100644 --- a/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php +++ b/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php @@ -14,6 +14,8 @@ namespace Ramsey\Uuid\Converter; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; + /** * TimeConverterInterface provides facilities for converting parts of time into * representations that may be used in UUIDs @@ -27,7 +29,7 @@ interface TimeConverterInterface * @param string $seconds * @param string $microSeconds * @return string[] An array guaranteed to contain `low`, `mid`, and `high` keys - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and + * @throws UnsatisfiedDependencyException if called on a 32-bit system and * `Moontoast\Math\BigNumber` is not present * @link http://tools.ietf.org/html/rfc4122#section-4.2.2 */ diff --git a/vendor/ramsey/uuid/src/DegradedUuid.php b/vendor/ramsey/uuid/src/DegradedUuid.php index bcf0be800..26697615c 100644 --- a/vendor/ramsey/uuid/src/DegradedUuid.php +++ b/vendor/ramsey/uuid/src/DegradedUuid.php @@ -14,6 +14,8 @@ namespace Ramsey\Uuid; +use DateTime; +use Moontoast\Math\BigNumber; use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; use Ramsey\Uuid\Exception\UnsupportedOperationException; @@ -35,13 +37,13 @@ class DegradedUuid extends Uuid $time = $this->converter->fromHex($this->getTimestampHex()); - $ts = new \Moontoast\Math\BigNumber($time, 20); + $ts = new BigNumber($time, 20); $ts->subtract('122192928000000000'); $ts->divide('10000000.0'); $ts->round(); $unixTime = $ts->getValue(); - return new \DateTime("@{$unixTime}"); + return new DateTime("@{$unixTime}"); } /** diff --git a/vendor/ramsey/uuid/src/Exception/InvalidUuidStringException.php b/vendor/ramsey/uuid/src/Exception/InvalidUuidStringException.php index 0e480649d..7df0e8cce 100644 --- a/vendor/ramsey/uuid/src/Exception/InvalidUuidStringException.php +++ b/vendor/ramsey/uuid/src/Exception/InvalidUuidStringException.php @@ -14,9 +14,11 @@ namespace Ramsey\Uuid\Exception; +use InvalidArgumentException; + /** * Thrown to indicate that the parsed UUID string is invalid. */ -class InvalidUuidStringException extends \InvalidArgumentException +class InvalidUuidStringException extends InvalidArgumentException { } diff --git a/vendor/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php b/vendor/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php index 8b5d5d08e..89c739658 100644 --- a/vendor/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php +++ b/vendor/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php @@ -14,10 +14,12 @@ namespace Ramsey\Uuid\Exception; +use RuntimeException; + /** * Thrown to indicate that the requested operation has dependencies that have not * been satisfied. */ -class UnsatisfiedDependencyException extends \RuntimeException +class UnsatisfiedDependencyException extends RuntimeException { } diff --git a/vendor/ramsey/uuid/src/Exception/UnsupportedOperationException.php b/vendor/ramsey/uuid/src/Exception/UnsupportedOperationException.php index b371b6823..43409470d 100644 --- a/vendor/ramsey/uuid/src/Exception/UnsupportedOperationException.php +++ b/vendor/ramsey/uuid/src/Exception/UnsupportedOperationException.php @@ -14,9 +14,11 @@ namespace Ramsey\Uuid\Exception; +use RuntimeException; + /** * Thrown to indicate that the requested operation is not supported. */ -class UnsupportedOperationException extends \RuntimeException +class UnsupportedOperationException extends RuntimeException { } diff --git a/vendor/ramsey/uuid/src/FeatureSet.php b/vendor/ramsey/uuid/src/FeatureSet.php index 56a774eab..2027b9e02 100644 --- a/vendor/ramsey/uuid/src/FeatureSet.php +++ b/vendor/ramsey/uuid/src/FeatureSet.php @@ -289,7 +289,9 @@ class FeatureSet { if ($this->is64BitSystem()) { return new PhpTimeConverter(); - } elseif ($this->hasBigNumber()) { + } + + if ($this->hasBigNumber()) { return new BigNumberTimeConverter(); } diff --git a/vendor/ramsey/uuid/src/Generator/CombGenerator.php b/vendor/ramsey/uuid/src/Generator/CombGenerator.php index 7a9482318..1d4a5f604 100644 --- a/vendor/ramsey/uuid/src/Generator/CombGenerator.php +++ b/vendor/ramsey/uuid/src/Generator/CombGenerator.php @@ -14,7 +14,10 @@ namespace Ramsey\Uuid\Generator; +use Exception; +use InvalidArgumentException; use Ramsey\Uuid\Converter\NumberConverterInterface; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; /** * CombGenerator provides functionality to generate COMB (combined GUID/timestamp) @@ -53,14 +56,14 @@ class CombGenerator implements RandomGeneratorInterface * * @param integer $length The number of bytes of random binary data to generate * @return string A binary string - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present - * @throws \InvalidArgumentException if length is not a positive integer - * @throws \Exception + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws InvalidArgumentException if length is not a positive integer + * @throws Exception */ public function generate($length) { if ($length < self::TIMESTAMP_BYTES || $length < 0) { - throw new \InvalidArgumentException('Length must be a positive integer.'); + throw new InvalidArgumentException('Length must be a positive integer.'); } $hash = ''; diff --git a/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php b/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php index c9969b3af..5c5ccb294 100644 --- a/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php +++ b/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php @@ -14,8 +14,11 @@ namespace Ramsey\Uuid\Generator; +use Exception; +use InvalidArgumentException; use Ramsey\Uuid\BinaryUtils; use Ramsey\Uuid\Converter\TimeConverterInterface; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; use Ramsey\Uuid\Provider\NodeProviderInterface; use Ramsey\Uuid\Provider\TimeProviderInterface; @@ -72,10 +75,10 @@ class DefaultTimeGenerator implements TimeGeneratorInterface * could arise when the clock is set backwards in time or if the node ID * changes. * @return string A binary string - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and + * @throws UnsatisfiedDependencyException if called on a 32-bit system and * `Moontoast\Math\BigNumber` is not present - * @throws \InvalidArgumentException - * @throws \Exception if it was not possible to gather sufficient entropy + * @throws InvalidArgumentException + * @throws Exception if it was not possible to gather sufficient entropy */ public function generate($node = null, $clockSeq = null) { @@ -96,14 +99,14 @@ class DefaultTimeGenerator implements TimeGeneratorInterface $hex = vsprintf( '%08s%04s%04s%02s%02s%012s', - array( + [ $uuidTime['low'], $uuidTime['mid'], sprintf('%04x', $timeHi), sprintf('%02x', $clockSeqHi), sprintf('%02x', $clockSeq & 0xff), $node, - ) + ] ); return hex2bin($hex); @@ -115,8 +118,8 @@ class DefaultTimeGenerator implements TimeGeneratorInterface * * @param string|int $node A node value that may be used to override the node provider * @return string Hexadecimal representation of the node ID - * @throws \InvalidArgumentException - * @throws \Exception + * @throws InvalidArgumentException + * @throws Exception */ protected function getValidNode($node) { @@ -130,7 +133,7 @@ class DefaultTimeGenerator implements TimeGeneratorInterface } if (!ctype_xdigit($node) || strlen($node) > 12) { - throw new \InvalidArgumentException('Invalid node value'); + throw new InvalidArgumentException('Invalid node value'); } return strtolower(sprintf('%012s', $node)); diff --git a/vendor/ramsey/uuid/src/Generator/MtRandGenerator.php b/vendor/ramsey/uuid/src/Generator/MtRandGenerator.php index f58b78357..8d4b5f9b9 100644 --- a/vendor/ramsey/uuid/src/Generator/MtRandGenerator.php +++ b/vendor/ramsey/uuid/src/Generator/MtRandGenerator.php @@ -18,6 +18,10 @@ namespace Ramsey\Uuid\Generator; * MtRandRandomGenerator provides functionality to generate strings of random * binary data using the `mt_rand()` PHP function * + * @deprecated The mt_rand() function is not a reliable source of randomness. + * The default RandomBytesGenerator, which uses the random_bytes() function, + * is recommended as the safest and most reliable source of randomness. + * <em>This generator will be removed in ramsey/uuid 4.0.0.</em> * @link http://php.net/mt_rand */ class MtRandGenerator implements RandomGeneratorInterface diff --git a/vendor/ramsey/uuid/src/Generator/OpenSslGenerator.php b/vendor/ramsey/uuid/src/Generator/OpenSslGenerator.php index e8ec6a4d8..47abf9bb5 100644 --- a/vendor/ramsey/uuid/src/Generator/OpenSslGenerator.php +++ b/vendor/ramsey/uuid/src/Generator/OpenSslGenerator.php @@ -21,6 +21,11 @@ namespace Ramsey\Uuid\Generator; * The use of this generator requires PHP to be compiled using the * `--with-openssl` option. * + * @deprecated The openssl_random_pseudo_bytes() function is not a reliable + * source of randomness. The default RandomBytesGenerator, which uses the + * random_bytes() function, is recommended as the safest and most reliable + * source of randomness. + * <em>This generator will be removed in ramsey/uuid 4.0.0.</em> * @link http://php.net/openssl_random_pseudo_bytes */ class OpenSslGenerator implements RandomGeneratorInterface diff --git a/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php b/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php index aaa285df0..cc3d37989 100644 --- a/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php +++ b/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php @@ -14,6 +14,8 @@ namespace Ramsey\Uuid\Generator; +use Exception; + /** * RandomBytesGenerator provides functionality to generate strings of random * binary data using `random_bytes()` function in PHP 7+ or paragonie/random_compat @@ -28,7 +30,7 @@ class RandomBytesGenerator implements RandomGeneratorInterface * * @param integer $length The number of bytes of random binary data to generate * @return string A binary string - * @throws \Exception if it was not possible to gather sufficient entropy + * @throws Exception if it was not possible to gather sufficient entropy */ public function generate($length) { diff --git a/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php b/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php index 3a1bcae7e..b791d60d4 100644 --- a/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php +++ b/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php @@ -14,6 +14,10 @@ namespace Ramsey\Uuid\Generator; +use Exception; +use InvalidArgumentException; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; + /** * RandomGeneratorInterface provides functionality to generate strings of random * binary data @@ -25,9 +29,9 @@ interface RandomGeneratorInterface * * @param integer $length The number of bytes of random binary data to generate * @return string A binary string - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present - * @throws \InvalidArgumentException - * @throws \Exception if it was not possible to gather sufficient entropy + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws InvalidArgumentException + * @throws Exception if it was not possible to gather sufficient entropy */ public function generate($length); } diff --git a/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php b/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php index 25b54a834..5aa0e8865 100644 --- a/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php +++ b/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php @@ -19,9 +19,9 @@ use RandomLib\Factory; /** * RandomLibAdapter provides functionality to generate strings of random - * binary data using the ircmaxell/random-lib library + * binary data using the paragonie/random-lib library * - * @link https://packagist.org/packages/ircmaxell/random-lib + * @link https://packagist.org/packages/paragonie/random-lib */ class RandomLibAdapter implements RandomGeneratorInterface { @@ -33,10 +33,10 @@ class RandomLibAdapter implements RandomGeneratorInterface /** * Constructs a `RandomLibAdapter` using a `RandomLib\Generator` * - * By default, if no `Generator` is passed in, this creates a medium-strength + * By default, if no `Generator` is passed in, this creates a high-strength * generator to use when generating random binary data. * - * @param Generator $generator An ircmaxell/random-lib `Generator` + * @param Generator $generator An paragonie/random-lib `Generator` */ public function __construct(Generator $generator = null) { @@ -45,7 +45,7 @@ class RandomLibAdapter implements RandomGeneratorInterface if ($this->generator === null) { $factory = new Factory(); - $this->generator = $factory->getMediumStrengthGenerator(); + $this->generator = $factory->getHighStrengthGenerator(); } } diff --git a/vendor/ramsey/uuid/src/Generator/SodiumRandomGenerator.php b/vendor/ramsey/uuid/src/Generator/SodiumRandomGenerator.php index 6b08f5402..f4ccf8593 100644 --- a/vendor/ramsey/uuid/src/Generator/SodiumRandomGenerator.php +++ b/vendor/ramsey/uuid/src/Generator/SodiumRandomGenerator.php @@ -18,6 +18,11 @@ namespace Ramsey\Uuid\Generator; * SodiumRandomGenerator provides functionality to generate strings of random * binary data using the PECL libsodium extension * + * @deprecated As of PHP 7.2.0, the libsodium extension is bundled with PHP, and + * the random_bytes() PHP function is now the recommended method for + * generating random byes. The default RandomBytesGenerator uses the + * random_bytes() function. + * <em>This generator will be removed in ramsey/uuid 4.0.0.</em> * @link http://pecl.php.net/package/libsodium * @link https://paragonie.com/book/pecl-libsodium */ diff --git a/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php b/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php index cb182ea00..27c74590f 100644 --- a/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php +++ b/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php @@ -14,6 +14,10 @@ namespace Ramsey\Uuid\Generator; +use Exception; +use InvalidArgumentException; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; + /** * TimeGeneratorInterface provides functionality to generate strings of binary * data for version 1 UUIDs based on a host ID, sequence number, and the current @@ -30,10 +34,10 @@ interface TimeGeneratorInterface * could arise when the clock is set backwards in time or if the node ID * changes. * @return string A binary string - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and + * @throws UnsatisfiedDependencyException if called on a 32-bit system and * `Moontoast\Math\BigNumber` is not present - * @throws \InvalidArgumentException - * @throws \Exception if it was not possible to gather sufficient entropy + * @throws InvalidArgumentException + * @throws Exception if it was not possible to gather sufficient entropy */ public function generate($node = null, $clockSeq = null); } diff --git a/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php index 289fddeae..83488ab96 100644 --- a/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php +++ b/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php @@ -14,6 +14,7 @@ namespace Ramsey\Uuid\Provider\Node; +use Exception; use Ramsey\Uuid\Provider\NodeProviderInterface; /** @@ -43,7 +44,7 @@ class FallbackNodeProvider implements NodeProviderInterface * and returning the first non-empty value found * * @return string System node ID as a hexadecimal string - * @throws \Exception + * @throws Exception */ public function getNode() { diff --git a/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php index 76c570d7f..79ec63cb8 100644 --- a/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php +++ b/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php @@ -14,6 +14,7 @@ namespace Ramsey\Uuid\Provider\Node; +use Exception; use Ramsey\Uuid\Provider\NodeProviderInterface; /** @@ -28,15 +29,29 @@ class RandomNodeProvider implements NodeProviderInterface * Returns the system node ID * * @return string System node ID as a hexadecimal string - * @throws \Exception if it was not possible to gather sufficient entropy + * @throws Exception if it was not possible to gather sufficient entropy */ public function getNode() { - $node = hexdec(bin2hex(random_bytes(6))); + $nodeBytes = random_bytes(6); + + // Split the node bytes for math on 32-bit systems. + $nodeMsb = substr($nodeBytes, 0, 3); + $nodeLsb = substr($nodeBytes, 3); // Set the multicast bit; see RFC 4122, section 4.5. - $node = $node | 0x010000000000; + $nodeMsb = hex2bin( + str_pad( + dechex(hexdec(bin2hex($nodeMsb)) | 0x010000), + 6, + '0', + STR_PAD_LEFT + ) + ); + + // Recombine the node bytes. + $node = $nodeMsb . $nodeLsb; - return str_pad(dechex($node), 12, '0', STR_PAD_LEFT); + return str_pad(bin2hex($node), 12, '0', STR_PAD_LEFT); } } diff --git a/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php index ae6a09eaa..e3c080199 100644 --- a/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php +++ b/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php @@ -36,7 +36,7 @@ class SystemNodeProvider implements NodeProviderInterface } $pattern = '/[^:]([0-9A-Fa-f]{2}([:-])[0-9A-Fa-f]{2}(\2[0-9A-Fa-f]{2}){4})[^:]/'; - $matches = array(); + $matches = []; // first try a linux specific way $node = $this->getSysfs(); @@ -67,7 +67,7 @@ class SystemNodeProvider implements NodeProviderInterface } ob_start(); - switch (strtoupper(substr(php_uname('a'), 0, 3))) { + switch (strtoupper(substr(constant('PHP_OS'), 0, 3))) { case 'WIN': passthru('ipconfig /all 2>&1'); break; @@ -95,7 +95,7 @@ class SystemNodeProvider implements NodeProviderInterface { $mac = false; - if (strtoupper(php_uname('s')) === 'LINUX') { + if (strtoupper(constant('PHP_OS')) === 'LINUX') { $addressPaths = glob('/sys/class/net/*/address', GLOB_NOSORT); if (empty($addressPaths)) { diff --git a/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php b/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php index 14f747bea..b6f721feb 100644 --- a/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php +++ b/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php @@ -14,6 +14,8 @@ namespace Ramsey\Uuid\Provider; +use Exception; + /** * NodeProviderInterface provides functionality to get the node ID (or host ID * in the form of the system's MAC address) from a specific type of node provider @@ -24,7 +26,7 @@ interface NodeProviderInterface * Returns the system node ID * * @return string System node ID as a hexadecimal string - * @throws \Exception if it was not possible to gather sufficient entropy + * @throws Exception if it was not possible to gather sufficient entropy */ public function getNode(); } diff --git a/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php b/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php index a62d39c62..79a9d04e0 100644 --- a/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php +++ b/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php @@ -14,6 +14,7 @@ namespace Ramsey\Uuid\Provider\Time; +use InvalidArgumentException; use Ramsey\Uuid\Provider\TimeProviderInterface; /** @@ -33,12 +34,12 @@ class FixedTimeProvider implements TimeProviderInterface * Constructs a `FixedTimeProvider` using the provided `$timestamp` * * @param int[] Array containing `sec` and `usec` components of a timestamp - * @throws \InvalidArgumentException if the `$timestamp` does not contain `sec` or `usec` components + * @throws InvalidArgumentException if the `$timestamp` does not contain `sec` or `usec` components */ public function __construct(array $timestamp) { if (!array_key_exists('sec', $timestamp) || !array_key_exists('usec', $timestamp)) { - throw new \InvalidArgumentException('Array must contain sec and usec keys.'); + throw new InvalidArgumentException('Array must contain sec and usec keys.'); } $this->fixedTime = $timestamp; diff --git a/vendor/ramsey/uuid/src/Uuid.php b/vendor/ramsey/uuid/src/Uuid.php index 45f9fa448..38fbd5ed6 100644 --- a/vendor/ramsey/uuid/src/Uuid.php +++ b/vendor/ramsey/uuid/src/Uuid.php @@ -14,8 +14,13 @@ namespace Ramsey\Uuid; +use DateTime; +use Exception; +use InvalidArgumentException; use Ramsey\Uuid\Converter\NumberConverterInterface; use Ramsey\Uuid\Codec\CodecInterface; +use Ramsey\Uuid\Exception\InvalidUuidStringException; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; use Ramsey\Uuid\Exception\UnsupportedOperationException; /** @@ -140,14 +145,14 @@ class Uuid implements UuidInterface * @var array * @see UuidInterface::getFieldsHex() */ - protected $fields = array( + protected $fields = [ 'time_low' => '00000000', 'time_mid' => '0000', 'time_hi_and_version' => '0000', 'clock_seq_hi_and_reserved' => '00', 'clock_seq_low' => '00', 'node' => '000000000000', - ); + ]; /** * The number converter to use for converting hex values to/from integers. @@ -229,7 +234,7 @@ class Uuid implements UuidInterface * * @param string $serialized * @link http://php.net/manual/en/class.serializable.php - * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws InvalidUuidStringException */ public function unserialize($serialized) { @@ -241,28 +246,32 @@ class Uuid implements UuidInterface public function compareTo(UuidInterface $other) { - $comparison = 0; - if ($this->getMostSignificantBitsHex() < $other->getMostSignificantBitsHex()) { - $comparison = -1; - } elseif ($this->getMostSignificantBitsHex() > $other->getMostSignificantBitsHex()) { - $comparison = 1; - } elseif ($this->getLeastSignificantBitsHex() < $other->getLeastSignificantBitsHex()) { - $comparison = -1; - } elseif ($this->getLeastSignificantBitsHex() > $other->getLeastSignificantBitsHex()) { - $comparison = 1; + return -1; + } + + if ($this->getMostSignificantBitsHex() > $other->getMostSignificantBitsHex()) { + return 1; + } + + if ($this->getLeastSignificantBitsHex() < $other->getLeastSignificantBitsHex()) { + return -1; + } + + if ($this->getLeastSignificantBitsHex() > $other->getLeastSignificantBitsHex()) { + return 1; } - return $comparison; + return 0; } public function equals($other) { - if (!($other instanceof UuidInterface)) { + if (!$other instanceof UuidInterface) { return false; } - return ($this->compareTo($other) == 0); + return $this->compareTo($other) == 0; } public function getBytes() @@ -319,8 +328,7 @@ class Uuid implements UuidInterface */ public function getClockSequence() { - return (($this->getClockSeqHiAndReserved() & 0x3f) << 8) - | $this->getClockSeqLow(); + return ($this->getClockSeqHiAndReserved() & 0x3f) << 8 | $this->getClockSeqLow(); } public function getClockSequenceHex() @@ -345,7 +353,7 @@ class Uuid implements UuidInterface $unixTime = ($this->getTimestamp() - 0x01b21dd213814000) / 1e7; $unixTime = number_format($unixTime, 0, '', ''); - return new \DateTime("@{$unixTime}"); + return new DateTime("@{$unixTime}"); } /** @@ -368,14 +376,14 @@ class Uuid implements UuidInterface */ public function getFields() { - return array( + return [ 'time_low' => $this->getTimeLow(), 'time_mid' => $this->getTimeMid(), 'time_hi_and_version' => $this->getTimeHiAndVersion(), 'clock_seq_hi_and_reserved' => $this->getClockSeqHiAndReserved(), 'clock_seq_low' => $this->getClockSeqLow(), 'node' => $this->getNode(), - ); + ]; } public function getFieldsHex() @@ -400,7 +408,7 @@ class Uuid implements UuidInterface * Returns the least significant 64 bits of this UUID's 128 bit value. * * @return mixed Converted representation of the unsigned 64-bit integer value - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present */ public function getLeastSignificantBits() { @@ -421,7 +429,7 @@ class Uuid implements UuidInterface * Returns the most significant 64 bits of this UUID's 128 bit value. * * @return mixed Converted representation of the unsigned 64-bit integer value - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present */ public function getMostSignificantBits() { @@ -568,17 +576,20 @@ class Uuid implements UuidInterface public function getVariant() { $clockSeq = $this->getClockSeqHiAndReserved(); + if (0 === ($clockSeq & 0x80)) { - $variant = self::RESERVED_NCS; - } elseif (0 === ($clockSeq & 0x40)) { - $variant = self::RFC_4122; - } elseif (0 === ($clockSeq & 0x20)) { - $variant = self::RESERVED_MICROSOFT; - } else { - $variant = self::RESERVED_FUTURE; + return self::RESERVED_NCS; + } + + if (0 === ($clockSeq & 0x40)) { + return self::RFC_4122; + } + + if (0 === ($clockSeq & 0x20)) { + return self::RESERVED_MICROSOFT; } - return $variant; + return self::RESERVED_FUTURE; } public function getVersion() @@ -624,8 +635,8 @@ class Uuid implements UuidInterface * * @param string $bytes * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException - * @throws \InvalidArgumentException + * @throws InvalidUuidStringException + * @throws InvalidArgumentException */ public static function fromBytes($bytes) { @@ -637,7 +648,7 @@ class Uuid implements UuidInterface * * @param string $name A string that specifies a UUID * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws InvalidUuidStringException */ public static function fromString($name) { @@ -649,8 +660,8 @@ class Uuid implements UuidInterface * * @param string $integer String representation of 128-bit integer * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present - * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws InvalidUuidStringException */ public static function fromInteger($integer) { @@ -665,7 +676,7 @@ class Uuid implements UuidInterface */ public static function isValid($uuid) { - $uuid = str_replace(array('urn:', 'uuid:', '{', '}'), '', $uuid); + $uuid = str_replace(['urn:', 'uuid:', '{', '}'], '', $uuid); if ($uuid == self::NIL) { return true; @@ -687,10 +698,10 @@ class Uuid implements UuidInterface * could arise when the clock is set backwards in time or if the node ID * changes. * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and + * @throws UnsatisfiedDependencyException if called on a 32-bit system and * `Moontoast\Math\BigNumber` is not present - * @throws \InvalidArgumentException - * @throws \Exception if it was not possible to gather sufficient entropy + * @throws InvalidArgumentException + * @throws Exception if it was not possible to gather sufficient entropy */ public static function uuid1($node = null, $clockSeq = null) { @@ -701,10 +712,10 @@ class Uuid implements UuidInterface * Generate a version 3 UUID based on the MD5 hash of a namespace identifier * (which is a UUID) and a name (which is a string). * - * @param string $ns The UUID namespace in which to create the named UUID + * @param string|UuidInterface $ns The UUID namespace in which to create the named UUID * @param string $name The name to create a UUID for * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws InvalidUuidStringException */ public static function uuid3($ns, $name) { @@ -715,9 +726,9 @@ class Uuid implements UuidInterface * Generate a version 4 (random) UUID. * * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present - * @throws \InvalidArgumentException - * @throws \Exception + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws InvalidArgumentException + * @throws Exception */ public static function uuid4() { @@ -728,10 +739,10 @@ class Uuid implements UuidInterface * Generate a version 5 UUID based on the SHA-1 hash of a namespace * identifier (which is a UUID) and a name (which is a string). * - * @param string $ns The UUID namespace in which to create the named UUID + * @param string|UuidInterface $ns The UUID namespace in which to create the named UUID * @param string $name The name to create a UUID for * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws InvalidUuidStringException */ public static function uuid5($ns, $name) { diff --git a/vendor/ramsey/uuid/src/UuidFactory.php b/vendor/ramsey/uuid/src/UuidFactory.php index 99644d4b4..5a57b09b2 100644 --- a/vendor/ramsey/uuid/src/UuidFactory.php +++ b/vendor/ramsey/uuid/src/UuidFactory.php @@ -15,6 +15,7 @@ namespace Ramsey\Uuid; use Ramsey\Uuid\Converter\NumberConverterInterface; +use Ramsey\Uuid\Exception\InvalidUuidStringException; use Ramsey\Uuid\Provider\NodeProviderInterface; use Ramsey\Uuid\Generator\RandomGeneratorInterface; use Ramsey\Uuid\Generator\TimeGeneratorInterface; @@ -274,7 +275,7 @@ class UuidFactory implements UuidFactoryInterface * @param string $hashFunction The hash function to use when hashing together * the namespace and name * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws InvalidUuidStringException */ protected function uuidFromNsAndName($ns, $name, $version, $hashFunction) { @@ -300,14 +301,14 @@ class UuidFactory implements UuidFactoryInterface $timeHi = BinaryUtils::applyVersion(substr($hash, 12, 4), $version); $clockSeqHi = BinaryUtils::applyVariant(hexdec(substr($hash, 16, 2))); - $fields = array( + $fields = [ 'time_low' => substr($hash, 0, 8), 'time_mid' => substr($hash, 8, 4), 'time_hi_and_version' => str_pad(dechex($timeHi), 4, '0', STR_PAD_LEFT), 'clock_seq_hi_and_reserved' => str_pad(dechex($clockSeqHi), 2, '0', STR_PAD_LEFT), 'clock_seq_low' => substr($hash, 18, 2), 'node' => substr($hash, 20, 12), - ); + ]; return $this->uuid($fields); } diff --git a/vendor/ramsey/uuid/src/UuidFactoryInterface.php b/vendor/ramsey/uuid/src/UuidFactoryInterface.php index a228f5bc7..1c1651d64 100644 --- a/vendor/ramsey/uuid/src/UuidFactoryInterface.php +++ b/vendor/ramsey/uuid/src/UuidFactoryInterface.php @@ -14,6 +14,11 @@ namespace Ramsey\Uuid; +use Exception; +use InvalidArgumentException; +use Ramsey\Uuid\Exception\InvalidUuidStringException; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; + /** * UuidFactoryInterface defines common functionality all `UuidFactory` instances * must implement @@ -29,10 +34,10 @@ interface UuidFactoryInterface * could arise when the clock is set backwards in time or if the node ID * changes. * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if called on a 32-bit system and + * @throws UnsatisfiedDependencyException if called on a 32-bit system and * `Moontoast\Math\BigNumber` is not present - * @throws \InvalidArgumentException - * @throws \Exception if it was not possible to gather sufficient entropy + * @throws InvalidArgumentException + * @throws Exception if it was not possible to gather sufficient entropy */ public function uuid1($node = null, $clockSeq = null); @@ -40,10 +45,10 @@ interface UuidFactoryInterface * Generate a version 3 UUID based on the MD5 hash of a namespace identifier * (which is a UUID) and a name (which is a string). * - * @param string $ns The UUID namespace in which to create the named UUID + * @param string|UuidInterface $ns The UUID namespace in which to create the named UUID * @param string $name The name to create a UUID for * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws InvalidUuidStringException */ public function uuid3($ns, $name); @@ -51,9 +56,9 @@ interface UuidFactoryInterface * Generate a version 4 (random) UUID. * * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present - * @throws \InvalidArgumentException - * @throws \Exception + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws InvalidArgumentException + * @throws Exception */ public function uuid4(); @@ -61,10 +66,10 @@ interface UuidFactoryInterface * Generate a version 5 UUID based on the SHA-1 hash of a namespace * identifier (which is a UUID) and a name (which is a string). * - * @param string $ns The UUID namespace in which to create the named UUID + * @param string|UuidInterface $ns The UUID namespace in which to create the named UUID * @param string $name The name to create a UUID for * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws InvalidUuidStringException */ public function uuid5($ns, $name); @@ -73,8 +78,8 @@ interface UuidFactoryInterface * * @param string $bytes A 16-byte string representation of a UUID * @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 fromBytes($bytes); @@ -83,7 +88,7 @@ interface UuidFactoryInterface * * @param string $uuid A string representation of a UUID * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws InvalidUuidStringException */ public function fromString($uuid); @@ -96,8 +101,8 @@ interface UuidFactoryInterface * @param mixed $integer The integer to use when creating a `Uuid` from an * integer; may be of any type understood by the configured number converter * @return UuidInterface - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present - * @throws \Ramsey\Uuid\Exception\InvalidUuidStringException + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws InvalidUuidStringException */ public function fromInteger($integer); } diff --git a/vendor/ramsey/uuid/src/UuidInterface.php b/vendor/ramsey/uuid/src/UuidInterface.php index ea3a46fb2..42a3ad7ff 100644 --- a/vendor/ramsey/uuid/src/UuidInterface.php +++ b/vendor/ramsey/uuid/src/UuidInterface.php @@ -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. @@ -121,9 +125,9 @@ interface UuidInterface extends \JsonSerializable, \Serializable * 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(); @@ -133,7 +137,7 @@ interface UuidInterface extends \JsonSerializable, \Serializable * representation. * * @return mixed Converted representation of the unsigned 128-bit integer value - * @throws \Ramsey\Uuid\Exception\UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present */ public function getInteger(); diff --git a/vendor/ramsey/uuid/src/functions.php b/vendor/ramsey/uuid/src/functions.php new file mode 100644 index 000000000..b5db34183 --- /dev/null +++ b/vendor/ramsey/uuid/src/functions.php @@ -0,0 +1,78 @@ +<?php + +/** + * This file is part of the ramsey/uuid library + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + * + * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com> + * @license http://opensource.org/licenses/MIT MIT + */ + +namespace Ramsey\Uuid; + +use Exception; +use InvalidArgumentException; +use Ramsey\Uuid\Exception\InvalidUuidStringException; +use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; + +/** + * Generate a version 1 UUID from a host ID, sequence number, and the current time. + * + * @param int|string|null $node A 48-bit number representing the hardware address + * This number may be represented as an integer or a hexadecimal string. + * @param int|null $clockSeq A 14-bit number used to help avoid duplicates that + * could arise when the clock is set backwards in time or if the node ID + * changes. + * @return string + * @throws UnsatisfiedDependencyException if called on a 32-bit system and + * `Moontoast\Math\BigNumber` is not present + * @throws InvalidArgumentException + * @throws Exception if it was not possible to gather sufficient entropy + */ +function v1($node = null, $clockSeq = null) +{ + return Uuid::uuid1($node, $clockSeq)->toString(); +} + +/** + * Generate a version 3 UUID based on the MD5 hash of a namespace identifier + * (which is a UUID) and a name (which is a string). + * + * @param string|UuidInterface $ns The UUID namespace in which to create the named UUID + * @param string $name The name to create a UUID for + * @return string + * @throws InvalidUuidStringException + */ +function v3($ns, $name) +{ + return Uuid::uuid3($ns, $name)->toString(); +} + +/** + * Generate a version 4 (random) UUID. + * + * @return string + * @throws UnsatisfiedDependencyException if `Moontoast\Math\BigNumber` is not present + * @throws InvalidArgumentException + * @throws Exception + */ +function v4() +{ + return Uuid::uuid4()->toString(); +} + +/** + * Generate a version 5 UUID based on the SHA-1 hash of a namespace + * identifier (which is a UUID) and a name (which is a string). + * + * @param string|UuidInterface $ns The UUID namespace in which to create the named UUID + * @param string $name The name to create a UUID for + * @return string + * @throws InvalidUuidStringException + */ +function v5($ns, $name) +{ + return Uuid::uuid5($ns, $name)->toString(); +} |