diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-08-14 12:40:16 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-08-14 12:40:16 +0100 |
| commit | dad548b731abe450e7085eb217a43c6aaace17ae (patch) | |
| tree | 5e865684d8f842389f5e9c33139b3fd54064cdc8 /vendor/ramsey | |
| parent | d497237ae87bc7c0b5be5c54631242f402e0d4c4 (diff) | |
| download | webtrees-dad548b731abe450e7085eb217a43c6aaace17ae.tar.gz webtrees-dad548b731abe450e7085eb217a43c6aaace17ae.tar.bz2 webtrees-dad548b731abe450e7085eb217a43c6aaace17ae.zip | |
Update vendor libraries
Diffstat (limited to 'vendor/ramsey')
| -rw-r--r-- | vendor/ramsey/uuid/CHANGELOG.md | 7 | ||||
| -rw-r--r-- | vendor/ramsey/uuid/CONTRIBUTING.md | 62 | ||||
| -rw-r--r-- | vendor/ramsey/uuid/README.md | 19 | ||||
| -rw-r--r-- | vendor/ramsey/uuid/composer.json | 14 | ||||
| -rw-r--r-- | vendor/ramsey/uuid/src/Console/Command/DecodeCommand.php | 1 | ||||
| -rw-r--r-- | vendor/ramsey/uuid/src/Uuid.php | 18 |
6 files changed, 94 insertions, 27 deletions
diff --git a/vendor/ramsey/uuid/CHANGELOG.md b/vendor/ramsey/uuid/CHANGELOG.md index 98505ecfa8..d686aeb62c 100644 --- a/vendor/ramsey/uuid/CHANGELOG.md +++ b/vendor/ramsey/uuid/CHANGELOG.md @@ -1,5 +1,12 @@ # Rhumsaa\Uuid Changelog +## 2.8.2 + +_Released: 2015-07-23_ + + * Ensure the release tag makes it into the rhumsaa/uuid package. + * Minor documentation changes. + ## 2.8.1 _Released: 2015-06-16_ diff --git a/vendor/ramsey/uuid/CONTRIBUTING.md b/vendor/ramsey/uuid/CONTRIBUTING.md new file mode 100644 index 0000000000..3cd9dc1c0e --- /dev/null +++ b/vendor/ramsey/uuid/CONTRIBUTING.md @@ -0,0 +1,62 @@ +# Contributing + +Contributions are welcome. We accept pull requests on [GitHub](https://github.com/ramsey/uuid). + +_**Please note:** Currently, all active development is working towards the major 3.0 release. This work is taking place in the `master` branch. If you have patches for the 2.x series, please send those to the `2.8` branch._ + +## 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: + +* Gitter chat: <https://gitter.im/ramsey/uuid> +* 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`. + +``` +./vendor/bin/parallel-lint src tests +./vendor/bin/phpunit --coverage-text +./vendor/bin/phpcs src --standard=psr2 -sp +``` diff --git a/vendor/ramsey/uuid/README.md b/vendor/ramsey/uuid/README.md index 7071c97dde..00702fc19a 100644 --- a/vendor/ramsey/uuid/README.md +++ b/vendor/ramsey/uuid/README.md @@ -1,10 +1,15 @@ # Rhumsaa\Uuid for PHP -[](https://travis-ci.org/ramsey/uuid) -[](https://coveralls.io/r/ramsey/uuid) -[](https://packagist.org/packages/rhumsaa/uuid) -[](https://packagist.org/packages/rhumsaa/uuid) -[](https://packagist.org/packages/rhumsaa/uuid) [](https://packagist.org/packages/rhumsaa/uuid) +_**WARNING: This package is no longer maintained. Use [ramsey/uuid](https://github.com/ramsey/uuid) instead.**_ + +---- + +[](https://travis-ci.org/ramsey/uuid) +[](https://coveralls.io/r/ramsey/uuid) +[](https://packagist.org/packages/rhumsaa/uuid) +[](https://packagist.org/packages/rhumsaa/uuid) +[](https://packagist.org/packages/rhumsaa/uuid) +[](http://hhvm.h4cc.de/package/rhumsaa/uuid) ## About @@ -97,7 +102,7 @@ composer.phar require "ramsey/uuid=~2.8" [rfc4122]: http://tools.ietf.org/html/rfc4122 [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/rhumsaa/uuid +[packagist]: https://packagist.org/packages/ramsey/uuid [composer]: http://getcomposer.org/ [moontoast\math]: https://github.com/moontoast/math -[apidocs]: http://ramsey.github.io/uuid/apidocs +[apidocs]: http://docs.benramsey.com/ramsey-uuid/2.8/ diff --git a/vendor/ramsey/uuid/composer.json b/vendor/ramsey/uuid/composer.json index 4a82193d2e..a02198dec2 100644 --- a/vendor/ramsey/uuid/composer.json +++ b/vendor/ramsey/uuid/composer.json @@ -1,9 +1,9 @@ { - "name": "ramsey/uuid", - "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", + "name": "rhumsaa/uuid", + "description": "NO LONGER MAINTAINED. Use ramsey/uuid instead. A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", "type": "library", "keywords": ["uuid", "identifier", "guid"], - "homepage": "https://github.com/ramsey/uuid", + "homepage": "https://github.com/ramsey/rhumsaa-uuid", "license": "MIT", "authors": [ { @@ -16,8 +16,8 @@ } ], "support": { - "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid" + "issues": "https://github.com/ramsey/rhumsaa-uuid/issues", + "source": "https://github.com/ramsey/rhumsaa-uuid" }, "require": { "php": ">=5.3.3" @@ -27,7 +27,9 @@ "symfony/console": "~2.3", "doctrine/dbal": ">=2.3", "phpunit/phpunit": "~4.1", - "satooshi/php-coveralls": "~0.6" + "satooshi/php-coveralls": "~0.6", + "squizlabs/php_codesniffer": "^2.3", + "jakub-onderka/php-parallel-lint": "^0.9.0" }, "bin": ["bin/uuid"], "suggest": { diff --git a/vendor/ramsey/uuid/src/Console/Command/DecodeCommand.php b/vendor/ramsey/uuid/src/Console/Command/DecodeCommand.php index 0c1758fbf0..97c9728dcf 100644 --- a/vendor/ramsey/uuid/src/Console/Command/DecodeCommand.php +++ b/vendor/ramsey/uuid/src/Console/Command/DecodeCommand.php @@ -64,7 +64,6 @@ class DecodeCommand extends Command )); if ($uuid->getVariant() != Uuid::RFC_4122) { - $table->addRows(array( array('decode:', 'variant:', 'Not an RFC 4122 UUID'), )); diff --git a/vendor/ramsey/uuid/src/Uuid.php b/vendor/ramsey/uuid/src/Uuid.php index fdea5e1872..1d3f143756 100644 --- a/vendor/ramsey/uuid/src/Uuid.php +++ b/vendor/ramsey/uuid/src/Uuid.php @@ -93,7 +93,7 @@ final class Uuid /** * Version of the Rhumsaa\Uuid package */ - const VERSION = '2.8.1'; + const VERSION = '2.8.2'; /** * For testing, 64-bit system override; if true, treat the system as 32-bit @@ -327,7 +327,8 @@ final class Uuid * * @return \DateTime A PHP DateTime representation of the date * @throws Exception\UnsupportedOperationException If this UUID is not a version 1 UUID - * @throws Exception\UnsatisfiedDependencyException if called on a 32-bit system and Moontoast\Math\BigNumber is not present + * @throws Exception\UnsatisfiedDependencyException if called on a 32-bit system + * and Moontoast\Math\BigNumber is not present */ public function getDateTime() { @@ -335,30 +336,22 @@ final class Uuid throw new Exception\UnsupportedOperationException('Not a time-based UUID'); } - if (self::is64BitSystem()) { - $unixTime = ($this->getTimestamp() - 0x01b21dd213814000) / 1e7; $unixTime = number_format($unixTime, 0, '', ''); - } elseif (self::hasBigNumber()) { - $time = \Moontoast\Math\BigNumber::baseConvert($this->getTimestampHex(), 16, 10); - $ts = new \Moontoast\Math\BigNumber($time, 20); $ts->subtract('122192928000000000'); $ts->divide('10000000.0'); $ts->round(); $unixTime = $ts->getValue(); - } else { - throw new Exception\UnsatisfiedDependencyException( 'When calling ' . __METHOD__ . ' on a 32-bit system, ' . 'Moontoast\Math\BigNumber must be present in order ' . 'to extract DateTime from version 1 UUIDs' ); - } return new \DateTime("@{$unixTime}"); @@ -1078,12 +1071,12 @@ final class Uuid * @param int $sec Seconds since the Unix Epoch * @param int $usec Microseconds * @return array - * @throws Exception\UnsatisfiedDependencyException if called on a 32-bit system and Moontoast\Math\BigNumber is not present + * @throws Exception\UnsatisfiedDependencyException if called on a 32-bit system + * and Moontoast\Math\BigNumber is not present */ protected static function calculateUuidTime($sec, $usec) { if (self::is64BitSystem()) { - // 0x01b21dd213814000 is the number of 100-ns intervals between the // UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00. $uuidTime = ($sec * 10000000) + ($usec * 10) + 0x01b21dd213814000; @@ -1096,7 +1089,6 @@ final class Uuid } if (self::hasBigNumber()) { - $uuidTime = new \Moontoast\Math\BigNumber('0'); $sec = new \Moontoast\Math\BigNumber($sec); |
