diff options
| author | Greg Roach <fisharebest@gmail.com> | 2015-07-12 13:22:26 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2015-07-12 13:22:26 +0100 |
| commit | eb443f28678ab16161c07687d76f1e44a7965ff2 (patch) | |
| tree | c966da0c221a4deaafed8dbd543ef53262923f0c /vendor/ramsey | |
| parent | e9ac0a130a7293a51af5fb1b6be0d0cbe00b93f4 (diff) | |
| download | webtrees-eb443f28678ab16161c07687d76f1e44a7965ff2.tar.gz webtrees-eb443f28678ab16161c07687d76f1e44a7965ff2.tar.bz2 webtrees-eb443f28678ab16161c07687d76f1e44a7965ff2.zip | |
Update vendor libraries: uuid, tcpdf, utf8, localization
Diffstat (limited to 'vendor/ramsey')
| -rw-r--r-- | vendor/ramsey/uuid/CHANGELOG.md | 9 | ||||
| -rw-r--r-- | vendor/ramsey/uuid/README.md | 13 | ||||
| -rw-r--r-- | vendor/ramsey/uuid/composer.json | 8 | ||||
| -rw-r--r-- | vendor/ramsey/uuid/src/Uuid.php | 20 |
4 files changed, 31 insertions, 19 deletions
diff --git a/vendor/ramsey/uuid/CHANGELOG.md b/vendor/ramsey/uuid/CHANGELOG.md index e4a9b589f0..98505ecfa8 100644 --- a/vendor/ramsey/uuid/CHANGELOG.md +++ b/vendor/ramsey/uuid/CHANGELOG.md @@ -1,5 +1,14 @@ # Rhumsaa\Uuid Changelog +## 2.8.1 + +_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.8.0 _Released: 2014-11-09_ diff --git a/vendor/ramsey/uuid/README.md b/vendor/ramsey/uuid/README.md index 8c9bb2774e..7071c97dde 100644 --- a/vendor/ramsey/uuid/README.md +++ b/vendor/ramsey/uuid/README.md @@ -1,11 +1,10 @@ # 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) -[](http://hhvm.h4cc.de/package/rhumsaa/uuid) +[](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) ## About @@ -91,7 +90,7 @@ the following command to install the package and add it as a requirement to `composer.json`: ```bash -composer.phar require "rhumsaa/uuid=~2.8" +composer.phar require "ramsey/uuid=~2.8" ``` diff --git a/vendor/ramsey/uuid/composer.json b/vendor/ramsey/uuid/composer.json index 4e2c627c0a..4a82193d2e 100644 --- a/vendor/ramsey/uuid/composer.json +++ b/vendor/ramsey/uuid/composer.json @@ -1,5 +1,5 @@ { - "name": "rhumsaa/uuid", + "name": "ramsey/uuid", "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", "type": "library", "keywords": ["uuid", "identifier", "guid"], @@ -38,9 +38,7 @@ "autoload": { "psr-4": {"Rhumsaa\\Uuid\\": "src/"} }, - "extra": { - "branch-alias": { - "dev-master": "2.8.x-dev" - } + "replace": { + "rhumsaa/uuid": "self.version" } } diff --git a/vendor/ramsey/uuid/src/Uuid.php b/vendor/ramsey/uuid/src/Uuid.php index ec03ecdab8..fdea5e1872 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.0'; + const VERSION = '2.8.1'; /** * For testing, 64-bit system override; if true, treat the system as 32-bit @@ -448,7 +448,7 @@ final class Uuid 'Cannot call ' . __METHOD__ . ' without support for large ' . 'integers, since integer is an unsigned ' . '128-bit integer; Moontoast\Math\BigNumber is required' - . '; consider calling getMostSignificantBitsHex instead' + . '; consider calling getHex instead' ); } @@ -1134,20 +1134,21 @@ final class Uuid */ protected static function getIfconfig() { + ob_start(); switch (strtoupper(substr(php_uname('a'), 0, 3))) { case 'WIN': - $ifconfig = `ipconfig /all 2>&1`; + passthru('ipconfig /all 2>&1'); break; case 'DAR': - $ifconfig = `ifconfig 2>&1`; + passthru('ifconfig 2>&1'); break; case 'LIN': default: - $ifconfig = `netstat -ie 2>&1`; + passthru('netstat -ie 2>&1'); break; } - return $ifconfig; + return ob_get_clean(); } /** @@ -1162,7 +1163,12 @@ final class Uuid */ protected static function getNodeFromSystem() { - $node = null; + static $node = null; + + if ($node !== null) { + return $node; + } + $pattern = '/[^:]([0-9A-Fa-f]{2}([:-])[0-9A-Fa-f]{2}(\2[0-9A-Fa-f]{2}){4})[^:]/'; $matches = array(); |
