diff options
Diffstat (limited to 'vendor/ramsey/uuid/src/Provider')
5 files changed, 49 insertions, 48 deletions
diff --git a/vendor/ramsey/uuid/src/Provider/Dce/SystemDceSecurityProvider.php b/vendor/ramsey/uuid/src/Provider/Dce/SystemDceSecurityProvider.php index d5b6cf0c0..7ff407648 100644 --- a/vendor/ramsey/uuid/src/Provider/Dce/SystemDceSecurityProvider.php +++ b/vendor/ramsey/uuid/src/Provider/Dce/SystemDceSecurityProvider.php @@ -21,6 +21,7 @@ use Ramsey\Uuid\Type\Integer as IntegerObject; use function escapeshellarg; use function preg_split; use function str_getcsv; +use function strpos; use function strrpos; use function strtolower; use function strtoupper; @@ -41,7 +42,6 @@ class SystemDceSecurityProvider implements DceSecurityProviderInterface */ public function getUid(): IntegerObject { - /** @var int|float|string|IntegerObject|null $uid */ static $uid = null; if ($uid instanceof IntegerObject) { @@ -72,7 +72,6 @@ class SystemDceSecurityProvider implements DceSecurityProviderInterface */ public function getGid(): IntegerObject { - /** @var int|float|string|IntegerObject|null $gid */ static $gid = null; if ($gid instanceof IntegerObject) { @@ -105,10 +104,15 @@ class SystemDceSecurityProvider implements DceSecurityProviderInterface return ''; } - return match ($this->getOs()) { - 'WIN' => $this->getWindowsUid(), - default => trim((string) shell_exec('id -u')), - }; + switch ($this->getOs()) { + case 'WIN': + return $this->getWindowsUid(); + case 'DAR': + case 'FRE': + case 'LIN': + default: + return trim((string) shell_exec('id -u')); + } } /** @@ -120,10 +124,15 @@ class SystemDceSecurityProvider implements DceSecurityProviderInterface return ''; } - return match ($this->getOs()) { - 'WIN' => $this->getWindowsGid(), - default => trim((string) shell_exec('id -g')), - }; + switch ($this->getOs()) { + case 'WIN': + return $this->getWindowsGid(); + case 'DAR': + case 'FRE': + case 'LIN': + default: + return trim((string) shell_exec('id -g')); + } } /** @@ -133,7 +142,7 @@ class SystemDceSecurityProvider implements DceSecurityProviderInterface { $disabledFunctions = strtolower((string) ini_get('disable_functions')); - return !str_contains($disabledFunctions, 'shell_exec'); + return strpos($disabledFunctions, 'shell_exec') === false; } /** @@ -141,13 +150,7 @@ class SystemDceSecurityProvider implements DceSecurityProviderInterface */ private function getOs(): string { - /** - * @psalm-suppress UnnecessaryVarAnnotation - * @var string $phpOs - */ - $phpOs = constant('PHP_OS'); - - return strtoupper(substr($phpOs, 0, 3)); + return strtoupper(substr(constant('PHP_OS'), 0, 3)); } /** diff --git a/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php index d2eb20b70..fe890cc4d 100644 --- a/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php +++ b/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php @@ -25,17 +25,23 @@ use Ramsey\Uuid\Type\Hexadecimal; class FallbackNodeProvider implements NodeProviderInterface { /** + * @var iterable<NodeProviderInterface> + */ + private $nodeProviders; + + /** * @param iterable<NodeProviderInterface> $providers Array of node providers */ - public function __construct(private iterable $providers) + public function __construct(iterable $providers) { + $this->nodeProviders = $providers; } public function getNode(): Hexadecimal { $lastProviderException = null; - foreach ($this->providers as $provider) { + foreach ($this->nodeProviders as $provider) { try { return $provider->getNode(); } catch (NodeException $exception) { diff --git a/vendor/ramsey/uuid/src/Provider/Node/StaticNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/StaticNodeProvider.php index 0f7536a82..51f1b02ea 100644 --- a/vendor/ramsey/uuid/src/Provider/Node/StaticNodeProvider.php +++ b/vendor/ramsey/uuid/src/Provider/Node/StaticNodeProvider.php @@ -32,7 +32,10 @@ use const STR_PAD_LEFT; */ class StaticNodeProvider implements NodeProviderInterface { - private Hexadecimal $node; + /** + * @var Hexadecimal + */ + private $node; /** * @param Hexadecimal $node The static node value to use diff --git a/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php b/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php index d0a1e697f..d512f22aa 100644 --- a/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php +++ b/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php @@ -27,8 +27,8 @@ use function ob_start; use function preg_match; use function preg_match_all; use function reset; -use function str_contains; use function str_replace; +use function strpos; use function strtolower; use function strtoupper; use function substr; @@ -100,18 +100,12 @@ class SystemNodeProvider implements NodeProviderInterface { $disabledFunctions = strtolower((string) ini_get('disable_functions')); - if (str_contains($disabledFunctions, 'passthru')) { + if (strpos($disabledFunctions, 'passthru') !== false) { return ''; } - /** - * @psalm-suppress UnnecessaryVarAnnotation - * @var string $phpOs - */ - $phpOs = constant('PHP_OS'); - ob_start(); - switch (strtoupper(substr($phpOs, 0, 3))) { + switch (strtoupper(substr(constant('PHP_OS'), 0, 3))) { case 'WIN': passthru('ipconfig /all 2>&1'); @@ -148,20 +142,13 @@ class SystemNodeProvider implements NodeProviderInterface { $mac = ''; - /** - * @psalm-suppress UnnecessaryVarAnnotation - * @var string $phpOs - */ - $phpOs = constant('PHP_OS'); - - if (strtoupper($phpOs) === 'LINUX') { + if (strtoupper(constant('PHP_OS')) === 'LINUX') { $addressPaths = glob('/sys/class/net/*/address', GLOB_NOSORT); if ($addressPaths === false || count($addressPaths) === 0) { return ''; } - /** @var array<array-key, string> $macs */ $macs = []; array_walk($addressPaths, function (string $addressPath) use (&$macs): void { @@ -170,10 +157,7 @@ class SystemNodeProvider implements NodeProviderInterface } }); - /** @var callable $trim */ - $trim = 'trim'; - - $macs = array_map($trim, $macs); + $macs = array_map('trim', $macs); // Remove invalid entries. $macs = array_filter($macs, function (string $address) { @@ -181,7 +165,6 @@ class SystemNodeProvider implements NodeProviderInterface && preg_match(self::SYSFS_PATTERN, $address); }); - /** @var string|bool $mac */ $mac = reset($macs); } diff --git a/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php b/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php index 526c8ff46..b8bfd7215 100644 --- a/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php +++ b/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php @@ -19,15 +19,21 @@ use Ramsey\Uuid\Type\Integer as IntegerObject; use Ramsey\Uuid\Type\Time; /** - * FixedTimeProvider uses a known time to provide the time + * FixedTimeProvider uses an known time to provide the time * * This provider allows the use of a previously-generated, or known, time * when generating time-based UUIDs. */ class FixedTimeProvider implements TimeProviderInterface { - public function __construct(private Time $time) + /** + * @var Time + */ + private $fixedTime; + + public function __construct(Time $time) { + $this->fixedTime = $time; } /** @@ -37,7 +43,7 @@ class FixedTimeProvider implements TimeProviderInterface */ public function setUsec($value): void { - $this->time = new Time($this->time->getSeconds(), $value); + $this->fixedTime = new Time($this->fixedTime->getSeconds(), $value); } /** @@ -47,11 +53,11 @@ class FixedTimeProvider implements TimeProviderInterface */ public function setSec($value): void { - $this->time = new Time($value, $this->time->getMicroseconds()); + $this->fixedTime = new Time($value, $this->fixedTime->getMicroseconds()); } public function getTime(): Time { - return $this->time; + return $this->fixedTime; } } |