8000 Merge branch '5.1' into 5.2 · symfony/symfony@c11a6da · GitHub
[go: up one dir, main page]
Skip to content

Commit c11a6da

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.1' into 5.2
* 5.1: [Uid] fix checking for valid UUIDs [HttpKernel] Configure the ErrorHandler even when it is overriden Allow relative path to composer cache
2 parents c38473a + be896b5 commit c11a6da

File tree

5 files changed

+40
-16
lines changed

5 files changed

+40
-16
lines changed

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,18 @@
164164
? ('#!/usr/bin/env php' === file_get_contents($COMPOSER, false, null, 0, 18) ? $PHP : '').' '.escapeshellarg($COMPOSER) // detect shell wrappers by looking at the shebang
165165
: 'composer';
166166

167+
$prevCacheDir = getenv('COMPOSER_CACHE_DIR');
168+
if ($prevCacheDir) {
169+
if (false === $absoluteCacheDir = realpath($prevCacheDir)) {
170+
@mkdir($prevCacheDir, 0777, true);
171+
$absoluteCacheDir = realpath($prevCacheDir);
172+
}
173+
if ($absoluteCacheDir) {
174+
putenv("COMPOSER_CACHE_DIR=$absoluteCacheDir");
175+
} else {
176+
$prevCacheDir = false;
177+
}
178+
}
167179
$SYMFONY_PHPUNIT_REMOVE = $getEnvVar('SYMFONY_PHPUNIT_REMOVE', 'phpspec/prophecy'.($PHPUNIT_VERSION < 6.0 ? ' symfony/yaml' : ''));
168180
$configurationHash = md5(implode(\PHP_EOL, [md5_file(__FILE__), $SYMFONY_PHPUNIT_REMOVE, (int) $PHPUNIT_REMOVE_RETURN_TYPEHINT]));
169181
$PHPUNIT_VERSION_DIR = sprintf('phpunit-%s-%d', $PHPUNIT_VERSION, $PHPUNIT_REMOVE_RETURN_TYPEHINT);
@@ -246,6 +258,9 @@
246258
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
247259
$exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));
248260
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
261+
if ($prevCacheDir) {
262+
putenv("COMPOSER_CACHE_DIR=$prevCacheDir");
263+
}
249264
if ($exit) {
250265
exit($exit);
251266
}

‎src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*/
3131
class DebugHandlersListener implements EventSubscriberInterface
3232
{
33+
private $earlyHandler;
3334
private $exceptionHandler;
3435
private $logger;
3536
private $deprecationLogger;
@@ -51,6 +52,10 @@ class DebugHandlersListener implements EventSubscriberInterface
5152
*/
5253
public function __construct(callable $exceptionHandler = null, LoggerInterface $logger = null, $levels = \E_ALL, ?int $throwAt = \E_ALL, bool $scream = true, $fileLinkFormat = null, bool $scope = true, LoggerInterface $deprecationLogger = null)
5354
{
55+
$handler = set_exception_handler('var_dump');
56+
$this->earlyHandler = \is_array($handler) ? $handler[0] : null;
57+
restore_exception_handler();
58+
5459
$this->exceptionHandler = $exceptionHandler;
5560
$this->logger = $logger;
5661
$this->levels = null === $levels ? \E_ALL : $levels;
@@ -78,6 +83,10 @@ public function configure(object $event = null)
7883
$handler = \is_array($handler) ? $handler[0] : null;
7984
restore_exception_handler();
8085

86+
if (!$handler instanceof ErrorHandler) {
87+
$handler = $this->earlyHandler;
88+
}
89+
8190
if ($handler instanceof ErrorHandler) {
8291
if ($this->logger || $this->deprecationLogger) {
8392
$this->setDefaultLoggers($handler);

‎src/Symfony/Component/Uid/BinaryUtil.php‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class BinaryUtil
4040
// 0x01b21dd213814000 is the number of 100-ns intervals between the
4141
// UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00.
4242
private const TIME_OFFSET_INT = 0x01b21dd213814000;
43-
private const TIME_OFFSET_COM = "\xfe\x4d\xe2\x2d\xec\x7e\xc0\x00";
43+
private const TIME_OFFSET_COM2 = "\xfe\x4d\xe2\x2d\xec\x7e\xc0\x00";
4444

4545
public static function toBase(string $bytes, array $map): string
4646
{
@@ -121,9 +121,15 @@ public static function timeToFloat(string $time): float
121121
}
122122

123123
$time = str_pad(hex2bin($time), 8, "\0", \STR_PAD_LEFT);
124-
$time = self::add($time, self::TIME_OFFSET_COM);
125-
$time[0] = $time[0] & "\x7F";
124+
$time = self::add($time, self::TIME_OFFSET_COM2);
126125

127-
return self::toBase($time, self::BASE10) / 10000000;
126+
if ($time >= self::TIME_OFFSET_COM2) {
127+
$time = -1 * self::toBase($time ^ "\xff\xff\xff\xff\xff\xff\xff\xff", self::BASE10);
128+
} else {
129+
$time[0] = $time[0] & "\x7F";
130+
$time = self::toBase($time, self::BASE10);
131+
}
132+
133+
return $time / 10000000;
128134
}
129135
}

‎src/Symfony/Component/Uid/Ulid.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private static function generate(): string
153153
if (\PHP_INT_SIZE >= 8) {
154154
$time = base_convert($time, 10, 32);
155155
} else {
156-
$time = bin2hex(BinaryUtil::fromBase($time, BinaryUtil::BASE10));
156+
$time = str_pad(bin2hex(BinaryUtil::fromBase($time, BinaryUtil::BASE10)), 12, '0', \STR_PAD_LEFT);
157157
$time = sprintf('%s%04s%04s',
158158
base_convert(substr($time, 0, 2), 16, 32),
159159
base_convert(substr($time, 2, 5), 16, 32),

‎src/Symfony/Component/Uid/Uuid.php‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ class Uuid extends AbstractUid
2222

2323
public function __construct(string $uuid)
2424
{
25-
try {
26-
$type = uuid_type($uuid);
27-
} catch (\ValueError $e) {
28-
throw new \InvalidArgumentException(sprintf('Invalid UUID%s: "%s".', static::TYPE ? 'v'.static::TYPE : '', $uuid), 0, $e);
29-
}
25+
$type = uuid_is_valid($uuid) ? uuid_type($uuid) : false;
3026

3127
if (false === $type || \UUID_TYPE_INVALID === $type || (static::TYPE ?: $type) !== $type) {
3228
throw new \InvalidArgumentException(sprintf('Invalid UUID%s: "%s".', static::TYPE ? 'v'.static::TYPE : '', $uuid));
@@ -59,13 +55,11 @@ public static function fromString(string $uuid): parent
5955
return new static($uuid);
6056
}
6157

62-
try {
63-
$type = uuid_type($uuid);
64-
} catch (\ValueError $e) {
65-
throw new \InvalidArgumentException(sprintf('Invalid UUID%s: "%s".', static::TYPE ? 'v'.static::TYPE : '', $uuid), 0, $e);
58+
if (!uuid_is_valid($uuid)) {
59+
throw new \InvalidArgumentException(sprintf('Invalid UUID%s: "%s".', static::TYPE ? 'v'.static::TYPE : '', $uuid));
6660
}
6761

68-
switch ($type) {
62+
switch (uuid_type($uuid)) {
6963
case UuidV1::TYPE: return new UuidV1($uuid);
7064
case UuidV3::TYPE: return new UuidV3($uuid);
7165
case UuidV4::TYPE: return new UuidV4($uuid);
@@ -114,7 +108,7 @@ public static function isValid(string $uuid): bool
114108
return uuid_is_valid($uuid);
115109
}
116110

117-
return static::TYPE === uuid_type($uuid);
111+
return uuid_is_valid($uuid) && static::TYPE === uuid_type($uuid);
118112
}
119113

120114
public function toBinary(): string

0 commit comments

Comments
 (0)
0