diff options
author | Mario <mario@mariovavti.com> | 2022-06-01 07:00:21 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2022-06-01 07:00:21 +0000 |
commit | e63f0438415bb364f3085286ca2f199e83ab187b (patch) | |
tree | b107429276ebfc92dc9b4f78e302a4967e5bf0a6 /vendor/ramsey/uuid/src/FeatureSet.php | |
parent | c5f33baf27d80e2a7ad7307eacd3137609eeb089 (diff) | |
parent | 33dd0c83e377b8adf00559337d13784ec136cecb (diff) | |
download | volse-hubzilla-e63f0438415bb364f3085286ca2f199e83ab187b.tar.gz volse-hubzilla-e63f0438415bb364f3085286ca2f199e83ab187b.tar.bz2 volse-hubzilla-e63f0438415bb364f3085286ca2f199e83ab187b.zip |
Merge branch '7.4RC'7.4
Diffstat (limited to 'vendor/ramsey/uuid/src/FeatureSet.php')
-rw-r--r-- | vendor/ramsey/uuid/src/FeatureSet.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/vendor/ramsey/uuid/src/FeatureSet.php b/vendor/ramsey/uuid/src/FeatureSet.php index a8ab2fdbb..668366601 100644 --- a/vendor/ramsey/uuid/src/FeatureSet.php +++ b/vendor/ramsey/uuid/src/FeatureSet.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Ramsey\Uuid; -use Ramsey\Uuid\Builder\BuilderCollection; use Ramsey\Uuid\Builder\FallbackBuilder; use Ramsey\Uuid\Builder\UuidBuilderInterface; use Ramsey\Uuid\Codec\CodecInterface; @@ -43,7 +42,6 @@ use Ramsey\Uuid\Nonstandard\UuidBuilder as NonstandardUuidBuilder; use Ramsey\Uuid\Provider\Dce\SystemDceSecurityProvider; use Ramsey\Uuid\Provider\DceSecurityProviderInterface; use Ramsey\Uuid\Provider\Node\FallbackNodeProvider; -use Ramsey\Uuid\Provider\Node\NodeProviderCollection; use Ramsey\Uuid\Provider\Node\RandomNodeProvider; use Ramsey\Uuid\Provider\Node\SystemNodeProvider; use Ramsey\Uuid\Provider\NodeProviderInterface; @@ -350,10 +348,10 @@ class FeatureSet return new RandomNodeProvider(); } - return new FallbackNodeProvider(new NodeProviderCollection([ + return new FallbackNodeProvider([ new SystemNodeProvider(), new RandomNodeProvider(), - ])); + ]); } /** @@ -432,11 +430,10 @@ class FeatureSet return new GuidBuilder($this->numberConverter, $this->timeConverter); } - /** @psalm-suppress ImpureArgument */ - return new FallbackBuilder(new BuilderCollection([ + return new FallbackBuilder([ new Rfc4122UuidBuilder($this->numberConverter, $this->timeConverter), new NonstandardUuidBuilder($this->numberConverter, $this->timeConverter), - ])); + ]); } /** |