From b038e59ad003c0769ac3b8effbf3b4256f1002ee Mon Sep 17 00:00:00 2001 From: George Steel Date: Sat, 8 Jan 2022 12:03:46 +0000 Subject: [PATCH 01/38] Fix phpunit.xsd url to locally installed file --- phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 2d76cfb..4aa4920 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,6 @@ From 02b3b8512b8069b57d6fe2ebb5a0e0e2e6eaafde Mon Sep 17 00:00:00 2001 From: George Steel Date: Sat, 8 Jan 2022 12:53:17 +0000 Subject: [PATCH 02/38] Initial implementation of api-provided nullable urls for documents and document links --- CHANGELOG.md | 22 +++++++ src/Document.php | 5 ++ src/Document/DocumentDataConsumer.php | 5 ++ src/Document/Fragment/DocumentLink.php | 19 ++++-- src/Document/Fragment/Factory.php | 3 +- src/Value/DocumentData.php | 10 +++ .../Document/DocumentDataConsumerTest.php | 1 + .../Document/Fragment/DocumentLinkTest.php | 36 ++++++++++- test/Unit/Document/Fragment/FactoryTest.php | 64 +++++++++++++++++++ test/Unit/Value/DocumentDataTest.php | 33 ++++++++++ test/fixture/document-with-null-url.json | 18 ++++++ test/fixture/document-with-url.json | 18 ++++++ 12 files changed, 228 insertions(+), 6 deletions(-) create mode 100644 test/fixture/document-with-null-url.json create mode 100644 test/fixture/document-with-url.json diff --git a/CHANGELOG.md b/CHANGELOG.md index f4c9371..c6be6e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,28 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. +## 2.0.0 - TBD + +### Added + +- [#91](https://github.com/netglue/prismic-client/pull/91) Adds `\Prismic\Document::url(): ?string` method to the interface so this will break any existing implementors, however, if you had been using `Prismic\Document\DocumentDataConsumer` trait to fulfill most of the methods in `Document` you shouldn't need to do anything unless the method name or signature conflicts with your own implementation. The `Prismic\Document\Fragment\DocumentLink::url(): ?string` method has been added as document links might have a pre-made url available now. + +### Changed + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- Nothing. + ## 1.1.0 - 2022-01-07 ### Added diff --git a/src/Document.php b/src/Document.php index 9bc444c..0a9f865 100644 --- a/src/Document.php +++ b/src/Document.php @@ -48,4 +48,9 @@ public function asLink(): DocumentLink; * Return the value object containing all of the document content fragments */ public function data(): DocumentData; + + /** + * If the api has been configured with a route for this type of document, the url might be a string + */ + public function url(): ?string; } diff --git a/src/Document/DocumentDataConsumer.php b/src/Document/DocumentDataConsumer.php index 94610dc..05e1792 100644 --- a/src/Document/DocumentDataConsumer.php +++ b/src/Document/DocumentDataConsumer.php @@ -65,4 +65,9 @@ public function data(): DocumentData { return $this->data; } + + public function url(): ?string + { + return $this->data->url(); + } } diff --git a/src/Document/Fragment/DocumentLink.php b/src/Document/Fragment/DocumentLink.php index 82b177d..aa6fc1b 100644 --- a/src/Document/Fragment/DocumentLink.php +++ b/src/Document/Fragment/DocumentLink.php @@ -22,6 +22,8 @@ final class DocumentLink implements Fragment, Link private $lang; /** @var bool */ private $isBroken; + /** @var string|null */ + private $url; /** @param string[] $tags */ private function __construct( @@ -30,13 +32,15 @@ private function __construct( string $type, string $lang, bool $isBroken, - iterable $tags + iterable $tags, + ?string $url ) { $this->id = $id; $this->uid = $uid; $this->type = $type; $this->lang = $lang; $this->isBroken = $isBroken; + $this->url = $url; $this->tags = []; foreach ($tags as $tag) { $this->addTag($tag); @@ -55,9 +59,10 @@ public static function new( string $type, string $lang, bool $isBroken = false, - iterable $tags = [] + iterable $tags = [], + ?string $url = null ): self { - return new self($id, $uid, $type, $lang, $isBroken, $tags); + return new self($id, $uid, $type, $lang, $isBroken, $tags, $url); } public static function withDocument(Document $document): self @@ -68,7 +73,8 @@ public static function withDocument(Document $document): self $document->type(), $document->lang(), false, - $document->tags() + $document->tags(), + $document->url() ); } @@ -112,4 +118,9 @@ public function isEmpty(): bool { return false; } + + public function url(): ?string + { + return $this->url; + } } diff --git a/src/Document/Fragment/Factory.php b/src/Document/Fragment/Factory.php index 3a8b631..b1987c4 100644 --- a/src/Document/Fragment/Factory.php +++ b/src/Document/Fragment/Factory.php @@ -212,7 +212,8 @@ private static function linkFactory(object $data): Link self::assertObjectPropertyIsString($data, 'type'), $lang, $isBroken, - self::assertObjectPropertyAllString($data, 'tags') + self::assertObjectPropertyAllString($data, 'tags'), + self::optionalStringProperty($data, 'url') ); } diff --git a/src/Value/DocumentData.php b/src/Value/DocumentData.php index 6feaa88..17a5f8f 100644 --- a/src/Value/DocumentData.php +++ b/src/Value/DocumentData.php @@ -39,6 +39,8 @@ final class DocumentData implements Document private $body; /** @var Translation[] */ private $translations; + /** @var string|null */ + private $url; /** * @param string[] $tags @@ -51,6 +53,7 @@ private function __construct( string $lang, DateTimeImmutable $firstPublished, DateTimeImmutable $lastPublished, + ?string $url, iterable $tags, iterable $translations, FragmentCollection $body @@ -61,6 +64,7 @@ private function __construct( $this->lang = $lang; $this->firstPublished = $firstPublished; $this->lastPublished = $lastPublished; + $this->url = $url; $this->setTags(...$tags); $this->setTranslations(...$translations); $this->body = $body; @@ -96,6 +100,7 @@ public static function factory(object $data): self self::assertObjectPropertyIsString($data, 'lang'), self::assertObjectPropertyIsUtcDateTime($data, 'first_publication_date'), self::assertObjectPropertyIsUtcDateTime($data, 'last_publication_date'), + self::optionalStringProperty($data, 'url'), self::assertObjectPropertyAllString($data, 'tags'), $translations, $body @@ -168,4 +173,9 @@ public function data(): DocumentData { return $this; } + + public function url(): ?string + { + return $this->url; + } } diff --git a/test/Unit/Document/DocumentDataConsumerTest.php b/test/Unit/Document/DocumentDataConsumerTest.php index dacfb1d..2977856 100644 --- a/test/Unit/Document/DocumentDataConsumerTest.php +++ b/test/Unit/Document/DocumentDataConsumerTest.php @@ -45,6 +45,7 @@ public function testProxyMethods(): void $this->assertSame($this->document->type(), $this->subject->type()); $this->assertSame($this->document->tags(), $this->subject->tags()); $this->assertSame($this->document->lang(), $this->subject->lang()); + $this->assertSame($this->document->url(), $this->subject->url()); $this->assertSame($this->document->firstPublished(), $this->subject->firstPublished()); $this->assertSame($this->document->lastPublished(), $this->subject->lastPublished()); $this->assertSame($this->document->translations(), $this->subject->translations()); diff --git a/test/Unit/Document/Fragment/DocumentLinkTest.php b/test/Unit/Document/Fragment/DocumentLinkTest.php index 225b4a9..215fb5c 100644 --- a/test/Unit/Document/Fragment/DocumentLinkTest.php +++ b/test/Unit/Document/Fragment/DocumentLinkTest.php @@ -34,7 +34,29 @@ public function testConstructor(): DocumentLink false, ['a', 'b'], ); - $this->expectNotToPerformAssertions(); + self::assertTrue(true); + + return $link; + } + + /** @depends testConstructor */ + public function testThatCastingALinkToAStringWillYieldItsId(DocumentLink $link): void + { + self::assertSame('id', (string) $link); + } + + public function testConstructorWithUrl(): DocumentLink + { + $link = DocumentLink::new( + 'id', + 'uid', + 'type', + 'en-gb', + false, + ['a', 'b'], + '/some/url' + ); + self::assertTrue(true); return $link; } @@ -81,4 +103,16 @@ public function testThatTagsHaveExpectedMembers(DocumentLink $link): void $this->assertContainsEquals('a', $link->tags()); $this->assertContainsEquals('b', $link->tags()); } + + /** @depends testConstructor */ + public function testTheLinkMayHaveAUrlAndItIsNullByDefault(DocumentLink $link): void + { + self::assertNull($link->url()); + } + + /** @depends testConstructorWithUrl */ + public function testThatUrlReturnsTheExpectedValue(DocumentLink $link): void + { + self::assertSame('/some/url', $link->url()); + } } diff --git a/test/Unit/Document/Fragment/FactoryTest.php b/test/Unit/Document/Fragment/FactoryTest.php index 10ff3ed..6a67d3e 100644 --- a/test/Unit/Document/Fragment/FactoryTest.php +++ b/test/Unit/Document/Fragment/FactoryTest.php @@ -293,4 +293,68 @@ public function testAMediaLinkWithNonNumericSizeIsExceptional(): void Factory::factory($data); } + + /** @return array */ + public function documentLinkProvider(): array + { + return [ + 'Valid String Url' => [ + '{ + "link_type": "Document", + "id": "foo", + "uid": "bar", + "url": "/something", + "type": "bing", + "isBroken": false, + "tags": [] + }', + '/something', + ], + 'Unset URL' => [ + '{ + "link_type": "Document", + "id": "foo", + "uid": "bar", + "type": "bing", + "isBroken": false, + "tags": [] + }', + null, + ], + 'Explicit Null' => [ + '{ + "link_type": "Document", + "id": "foo", + "uid": "bar", + "type": "bing", + "isBroken": false, + "tags": [], + "url": null + }', + null, + ], + ]; + } + + /** @dataProvider documentLinkProvider */ + public function testThatDocumentLinksWithReadyMadeUrlsWillHaveTheExpectedValue(string $json, ?string $expect): void + { + $data = Json::decodeObject($json); + $link = Factory::factory($data); + self::assertInstanceOf(DocumentLink::class, $link); + self::assertSame($expect, $link->url()); + } + + /** + * @param scalar|null $value + * @param class-string $expectedType + * + * @dataProvider scalarTypes + */ + public function testThatTheFactoryCanBeNewedAndInvoked($value, string $expectedType): void + { + $factory = new Factory(); + $fragment = $factory($value); + $this->assertInstanceOf($expectedType, $fragment); + } } diff --git a/test/Unit/Value/DocumentDataTest.php b/test/Unit/Value/DocumentDataTest.php index edd3305..64ef4fa 100644 --- a/test/Unit/Value/DocumentDataTest.php +++ b/test/Unit/Value/DocumentDataTest.php @@ -25,6 +25,8 @@ class DocumentDataTest extends TestCase { /** @var DocumentData */ private $document; + /** @var DocumentData */ + private $documentWithUrl; protected function setUp(): void { @@ -34,6 +36,12 @@ protected function setUp(): void $this->jsonFixtureByFileName('document.json') ) ); + + $this->documentWithUrl = DocumentData::factory( + Json::decodeObject( + $this->jsonFixtureByFileName('document-with-url.json') + ) + ); } public function testId(): void @@ -179,4 +187,29 @@ public function testThatNowIsUsedForPublicationDatesWhenThePayloadIsNull(): void $this->assertGreaterThanOrEqual($now, $data->lastPublished()); $this->assertLessThanOrEqual($then, $data->lastPublished()); } + + public function testThatADocumentWithoutAUrlPropertyWillHaveANullUrl(): void + { + self::assertNull($this->document->url()); + } + + public function testThatADocumentWithANullUrlWillHaveANullUrl(): void + { + $document = DocumentData::factory( + Json::decodeObject( + $this->jsonFixtureByFileName('document-with-null-url.json') + ) + ); + self::assertNull($document->url()); + } + + public function testThatADocumentWithAStringUrlWillReturnExpectedValue(): void + { + self::assertSame('/example/url', $this->documentWithUrl->url()); + } + + public function testThatADocumentWithAStringUrlWillReturnTheCorrectUrlWhenCastToALink(): void + { + self::assertSame('/example/url', $this->documentWithUrl->asLink()->url()); + } } diff --git a/test/fixture/document-with-null-url.json b/test/fixture/document-with-null-url.json new file mode 100644 index 0000000..b7f55c0 --- /dev/null +++ b/test/fixture/document-with-null-url.json @@ -0,0 +1,18 @@ +{ + "id": "document-id", + "uid": "document-uid", + "type": "custom-type", + "href": "https://repo.cdn.prismic.io/api/v2/documents/search?ref=master-ref&q=%5B%5B%3Ad+%3D+at%28document.id%2C+%22document-id%22%29+%5D%5D", + "url": null, + "tags": [ + "tag-1", + "tag-2" + ], + "first_publication_date": "2020-01-01T01:23:45+0000", + "last_publication_date": "2020-01-02T01:23:45+0000", + "slugs": [], + "linked_documents": [], + "lang": "en-gb", + "alternate_languages": [], + "data": {} +} diff --git a/test/fixture/document-with-url.json b/test/fixture/document-with-url.json new file mode 100644 index 0000000..6efe1c6 --- /dev/null +++ b/test/fixture/document-with-url.json @@ -0,0 +1,18 @@ +{ + "id": "document-id", + "uid": "document-uid", + "type": "custom-type", + "href": "https://repo.cdn.prismic.io/api/v2/documents/search?ref=master-ref&q=%5B%5B%3Ad+%3D+at%28document.id%2C+%22document-id%22%29+%5D%5D", + "url": "/example/url", + "tags": [ + "tag-1", + "tag-2" + ], + "first_publication_date": "2020-01-01T01:23:45+0000", + "last_publication_date": "2020-01-02T01:23:45+0000", + "slugs": [], + "linked_documents": [], + "lang": "en-gb", + "alternate_languages": [], + "data": {} +} From 336d50784386d567c59af8b5ebef72f44cae5f51 Mon Sep 17 00:00:00 2001 From: George Steel Date: Sat, 8 Jan 2022 13:18:06 +0000 Subject: [PATCH 03/38] Initial implementation of api-provided nullable urls for documents and document links --- CHANGELOG.md | 1 + src/DefaultLinkResolver.php | 2 +- test/Unit/DefaultLinkResolverTest.php | 57 +++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 test/Unit/DefaultLinkResolverTest.php diff --git a/CHANGELOG.md b/CHANGELOG.md index c6be6e5..9c4a335 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file, in reverse ### Added - [#91](https://github.com/netglue/prismic-client/pull/91) Adds `\Prismic\Document::url(): ?string` method to the interface so this will break any existing implementors, however, if you had been using `Prismic\Document\DocumentDataConsumer` trait to fulfill most of the methods in `Document` you shouldn't need to do anything unless the method name or signature conflicts with your own implementation. The `Prismic\Document\Fragment\DocumentLink::url(): ?string` method has been added as document links might have a pre-made url available now. +- [#91](https://github.com/netglue/prismic-client/pull/91) Changes the behaviour of the abstract `Prismic\DefaultLinkResolver` so that document links with an url provided by the remote api will not be passed the custom resolver method, effectively preferring the url received in the payload. ### Changed diff --git a/src/DefaultLinkResolver.php b/src/DefaultLinkResolver.php index b1fd0e1..0b6f042 100644 --- a/src/DefaultLinkResolver.php +++ b/src/DefaultLinkResolver.php @@ -15,7 +15,7 @@ public function resolve(Link $link): ?string } if ($link instanceof DocumentLink) { - return $this->resolveDocumentLink($link); + return $link->url() ?? $this->resolveDocumentLink($link); } return null; diff --git a/test/Unit/DefaultLinkResolverTest.php b/test/Unit/DefaultLinkResolverTest.php new file mode 100644 index 0000000..86e6a64 --- /dev/null +++ b/test/Unit/DefaultLinkResolverTest.php @@ -0,0 +1,57 @@ +linkResolver = new class extends DefaultLinkResolver { + protected function resolveDocumentLink(DocumentLink $link): ?string + { + return '/some/url'; + } + }; + } + + public function testMediaUrlsReturnTheExpectedUrl(): void + { + $media = MediaLink::new('/foo', 'whatever.jpg', 1234); + + self::assertSame('/foo', $this->linkResolver->resolve($media)); + } + + public function testDocLinksWillYieldStoredUrlWhenPresent(): void + { + $docLink = DocumentLink::new('id', 'uid', 'foo', 'en-gb', false, [], '/special'); + + self::assertSame('/special', $this->linkResolver->resolve($docLink)); + } + + public function testDocLinksWillUseCustomResolveWhenNull(): void + { + $docLink = DocumentLink::new('id', 'uid', 'foo', 'en-gb', false, [], null); + + self::assertSame('/some/url', $this->linkResolver->resolve($docLink)); + } + + public function testUnknownLinkTypesWillYieldNull(): void + { + $link = $this->createMock(Link::class); + + self::assertNull($this->linkResolver->resolve($link)); + } +} From f91de335a08bc71523f35411df2d600a5a314b08 Mon Sep 17 00:00:00 2001 From: George Steel Date: Sat, 8 Jan 2022 16:03:20 +0000 Subject: [PATCH 04/38] Adds the route resolver spec value object and update query with a new method so that router specification can be provided --- src/Query.php | 25 +++++++--- src/Value/RouteResolverSpec.php | 56 +++++++++++++++++++++++ test/Unit/QueryTest.php | 23 +++++++++- test/Unit/Value/RouteResolverSpecTest.php | 41 +++++++++++++++++ test/fixture/forms.json | 54 ++++++++++++++++++++++ 5 files changed, 192 insertions(+), 7 deletions(-) create mode 100644 src/Value/RouteResolverSpec.php create mode 100644 test/Unit/Value/RouteResolverSpecTest.php diff --git a/src/Query.php b/src/Query.php index b8b2524..6ecaf62 100644 --- a/src/Query.php +++ b/src/Query.php @@ -6,6 +6,7 @@ use Prismic\Value\FormSpec; use Prismic\Value\Ref; +use Prismic\Value\RouteResolverSpec; use function array_filter; use function array_map; @@ -49,21 +50,21 @@ public function toUrl(): string /** @psalm-return QueryParams */ private function mergeWithDefaults(): array { - $parameters = $this->defaultParameters(); + $defaults = $this->defaultParameters(); foreach ($this->parameters as $name => $value) { if (is_scalar($value)) { - $parameters[$name] = $value; + $defaults[$name] = $value; continue; } - $merged = isset($parameters[$name]) && is_array($parameters[$name]) - ? array_merge($parameters[$name], (array) $value) + $merged = isset($defaults[$name]) && is_array($defaults[$name]) + ? array_merge($defaults[$name], (array) $value) : $value; - $parameters[$name] = $merged; + $defaults[$name] = $merged; } - return $parameters; + return $defaults; } private function buildQuery(): string @@ -231,6 +232,18 @@ public function ref(Ref $ref): self return $this->set('ref', (string) $ref); } + /** + * Override or set Route Resolvers used to return document and link urls in received payloads + * + * If the api was initialised with a `routes` parameter, the query will be pre-populated with that value. + * + * @param list $routes + */ + public function routes(array $routes): self + { + return $this->set('routes', Json::encode($routes)); + } + /** * Order results * diff --git a/src/Value/RouteResolverSpec.php b/src/Value/RouteResolverSpec.php new file mode 100644 index 0000000..2bdf317 --- /dev/null +++ b/src/Value/RouteResolverSpec.php @@ -0,0 +1,56 @@ + */ + private $resolvers; + + /** @param array $resolvers */ + public function __construct(string $type, string $path, array $resolvers) + { + $this->type = $type; + $this->path = $path; + $this->resolvers = $resolvers; + } + + public function __toString(): string + { + return Json::encode($this, JSON_FORCE_OBJECT); + } + + /** @return array{type: string, path: string, resolvers: array} */ + public function jsonSerialize(): array + { + return [ + 'type' => $this->type, + 'path' => $this->path, + 'resolvers' => $this->resolvers, + ]; + } + + /** @param array{type: string, path: string, resolvers: array} $data */ + public static function __set_state(array $data): self + { + return new self( + $data['type'], + $data['path'], + $data['resolvers'] + ); + } +} diff --git a/test/Unit/QueryTest.php b/test/Unit/QueryTest.php index 25d31ed..a5ce952 100644 --- a/test/Unit/QueryTest.php +++ b/test/Unit/QueryTest.php @@ -8,6 +8,7 @@ use Prismic\Predicate; use Prismic\Query; use Prismic\Value\FormSpec; +use Prismic\Value\RouteResolverSpec; use PrismicTest\Framework\TestCase; use function array_merge; @@ -21,7 +22,7 @@ class QueryTest extends TestCase private $formData; /** - * @return object{everything: object, withQuery: object, collection: object} + * @return object{everything: object, withQuery: object, collection: object, withRoutes: object} * * @psalm-suppress LessSpecificReturnStatement * @psalm-suppress MoreSpecificReturnType @@ -284,4 +285,24 @@ public function testThatOrderCanBeRemoved(Query $query): void $query->order('a', 'b', 'c')->order()->toUrl() ); } + + public function testThatTheUrlWillContainTheRoutesParameterWhenPresent(): void + { + $form = FormSpec::factory('withRoutes', $this->formData()->withRoutes); + $default = $form->field('routes')->defaultValue(); + $query = new Query($form); + + $expect = 'routes=' . urlencode((string) $default); + + self::assertStringContainsString($expect, $query->toUrl()); + } + + public function testThatTheRoutesParameterCanBeReplaced(): void + { + $form = FormSpec::factory('withRoutes', $this->formData()->withRoutes); + $newRoutes = new RouteResolverSpec('mine', '/blah', ['hey' => 'there']); + $query = (new Query($form))->routes([$newRoutes]); + + self::assertStringContainsString(urlencode((string) $newRoutes), $query->toUrl()); + } } diff --git a/test/Unit/Value/RouteResolverSpecTest.php b/test/Unit/Value/RouteResolverSpecTest.php new file mode 100644 index 0000000..711bd2b --- /dev/null +++ b/test/Unit/Value/RouteResolverSpecTest.php @@ -0,0 +1,41 @@ + 'some-prop'])) + ); + } + + public function testExportedSpecCanBeRehydrated(): void + { + $spec = RouteResolverSpec::__set_state([ + 'type' => 'mine', + 'path' => '/path', + 'resolvers' => ['foo' => 'bar'], + ]); + + $expect = '{"type":"mine","path":"\/path","resolvers":{"foo":"bar"}}'; + + self::assertEquals($expect, (string) $spec); + } +} diff --git a/test/fixture/forms.json b/test/fixture/forms.json index d3037a2..5a5aaf5 100644 --- a/test/fixture/forms.json +++ b/test/fixture/forms.json @@ -148,5 +148,59 @@ "multiple": false } } + }, + "withRoutes": { + "method": "GET", + "enctype": "application/x-www-form-urlencoded", + "action": "https://example.com/api/v2", + "fields": { + "ref": { + "type": "String", + "multiple": false + }, + "q": { + "type": "String", + "multiple": true + }, + "lang": { + "type": "String", + "multiple": false + }, + "page": { + "type": "Integer", + "multiple": false, + "default": "1" + }, + "pageSize": { + "type": "Integer", + "multiple": false, + "default": "20" + }, + "after": { + "type": "String", + "multiple": false + }, + "fetch": { + "type": "String", + "multiple": false + }, + "fetchLinks": { + "type": "String", + "multiple": false + }, + "orderings": { + "type": "String", + "multiple": false + }, + "referer": { + "type": "String", + "multiple": false + }, + "routes": { + "type": "String", + "multiple": false, + "default": "{\"type\":\"mine\",\"path\":\"\\\/path\",\"resolvers\":{\"foo\":\"bar\"}}" + } + } } } From 28c3f53a93c5f8d9f78d33da2906448e68fb20cd Mon Sep 17 00:00:00 2001 From: George Steel Date: Sat, 8 Jan 2022 16:06:30 +0000 Subject: [PATCH 05/38] Adds a test proving that setting routes causes an exception when the api has not been initialised with routes. This behaviour is probably undesirable and likely needs changing --- test/Unit/QueryTest.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/Unit/QueryTest.php b/test/Unit/QueryTest.php index a5ce952..1262806 100644 --- a/test/Unit/QueryTest.php +++ b/test/Unit/QueryTest.php @@ -4,6 +4,7 @@ namespace PrismicTest; +use Prismic\Exception\UnknownFormField; use Prismic\Json; use Prismic\Predicate; use Prismic\Query; @@ -305,4 +306,12 @@ public function testThatTheRoutesParameterCanBeReplaced(): void self::assertStringContainsString(urlencode((string) $newRoutes), $query->toUrl()); } + + public function testSettingRoutesWillCauseAnExceptionWhenApiIsNotInitialisedWithRoutes(): void + { + $form = FormSpec::factory('everything', $this->formData()->everything); + $newRoutes = new RouteResolverSpec('mine', '/blah', ['hey' => 'there']); + $this->expectException(UnknownFormField::class); + (new Query($form))->routes([$newRoutes]); + } } From 1e1daa962757d3b5d917f3fac3ec8b548ced646e Mon Sep 17 00:00:00 2001 From: George Steel Date: Thu, 20 Jan 2022 13:43:08 +0000 Subject: [PATCH 06/38] Modifies form spec so that a `routes` form parameter will always be considered valid and known. --- src/Value/FormSpec.php | 8 +++++++- test/Unit/QueryTest.php | 7 ++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Value/FormSpec.php b/src/Value/FormSpec.php index 0fb658e..9e8fdd8 100644 --- a/src/Value/FormSpec.php +++ b/src/Value/FormSpec.php @@ -48,6 +48,12 @@ private function __construct( $this->encType = $encType; $this->action = $action; $this->fields = $fields; + + if ($this->hasField('routes')) { + return; + } + + $this->fields[] = FormField::new('routes', FormField::TYPE_STRING, false, null); } public static function factory(string $id, object $object): self @@ -124,7 +130,7 @@ public function field(string $name): FormField } /** - * @return FormField[] + * @return Traversable * @psalm-return ArrayIterator */ public function getIterator(): Traversable diff --git a/test/Unit/QueryTest.php b/test/Unit/QueryTest.php index 1262806..62e9735 100644 --- a/test/Unit/QueryTest.php +++ b/test/Unit/QueryTest.php @@ -307,11 +307,12 @@ public function testThatTheRoutesParameterCanBeReplaced(): void self::assertStringContainsString(urlencode((string) $newRoutes), $query->toUrl()); } - public function testSettingRoutesWillCauseAnExceptionWhenApiIsNotInitialisedWithRoutes(): void + public function testSettingRoutesWillNotCauseAnExceptionWhenApiIsNotInitialisedWithRoutes(): void { $form = FormSpec::factory('everything', $this->formData()->everything); $newRoutes = new RouteResolverSpec('mine', '/blah', ['hey' => 'there']); - $this->expectException(UnknownFormField::class); - (new Query($form))->routes([$newRoutes]); + + $query = (new Query($form))->routes([$newRoutes]); + self::assertStringContainsString(urlencode((string) $newRoutes), $query->toUrl()); } } From 5801640c8eefa4c7bf7437ce194e9993fb52e218 Mon Sep 17 00:00:00 2001 From: George Steel Date: Thu, 20 Jan 2022 13:46:52 +0000 Subject: [PATCH 07/38] Remove unused use --- test/Unit/QueryTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Unit/QueryTest.php b/test/Unit/QueryTest.php index 62e9735..a8ab30d 100644 --- a/test/Unit/QueryTest.php +++ b/test/Unit/QueryTest.php @@ -4,7 +4,6 @@ namespace PrismicTest; -use Prismic\Exception\UnknownFormField; use Prismic\Json; use Prismic\Predicate; use Prismic\Query; From 4b7ae32f16b22f87822df8d1418c007b9ef288d2 Mon Sep 17 00:00:00 2001 From: George Steel Date: Thu, 20 Jan 2022 14:27:09 +0000 Subject: [PATCH 08/38] Update changelog with more changes from #91 --- CHANGELOG.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c4a335..893a3c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,14 @@ All notable changes to this project will be documented in this file, in reverse ### Added -- [#91](https://github.com/netglue/prismic-client/pull/91) Adds `\Prismic\Document::url(): ?string` method to the interface so this will break any existing implementors, however, if you had been using `Prismic\Document\DocumentDataConsumer` trait to fulfill most of the methods in `Document` you shouldn't need to do anything unless the method name or signature conflicts with your own implementation. The `Prismic\Document\Fragment\DocumentLink::url(): ?string` method has been added as document links might have a pre-made url available now. -- [#91](https://github.com/netglue/prismic-client/pull/91) Changes the behaviour of the abstract `Prismic\DefaultLinkResolver` so that document links with an url provided by the remote api will not be passed the custom resolver method, effectively preferring the url received in the payload. +- [#91](https://github.com/netglue/prismic-client/pull/91) Adds `\Prismic\Document::url(): ?string` method to the interface so this will break any existing implementors, however, if you had been using `Prismic\Document\DocumentDataConsumer` trait to fulfill most of the methods in `Document` you shouldn't need to do anything unless the method name or signature conflicts with your own implementation. The `Prismic\Document\Fragment\DocumentLink::url(): ?string` method has been added as document links might have a pre-made url available now. +- [#91](https://github.com/netglue/prismic-client/pull/91) Adds `\Prismic\Value\RouteResolverSpec` - a value object that defines the shape of a single route as required by the remote API +- [#91](https://github.com/netglue/prismic-client/pull/91) Adds the method `\Prismic\Query::routes()` that accepts a list of `\Prismic\Value\RouteResolverSpec` instances. Routes are populated automatically when the API client is initialised with an appropriate Json encoded string _(Query parameter)_. ### Changed -- Nothing. +- [#91](https://github.com/netglue/prismic-client/pull/91) Changes the behaviour of the abstract `Prismic\DefaultLinkResolver` so that document links with an url provided by the remote api will not be passed the custom resolver method, effectively preferring the url received in the payload. +- [#91](https://github.com/netglue/prismic-client/pull/91) Changes the behaviour of the defined "form" specifications ensuring that it is always possible to submit a 'routes' parameter with a query enabling you to define server side resolved routes as part of the query parameters regardless of whether those routes have been defined up-front during api-client initialisation. ### Deprecated From 90801412e1c25184c35bea9b2b6e58157a8b718c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jan 2022 16:56:11 +0000 Subject: [PATCH 09/38] Bump ridedott/merge-me-action from 2.9.89 to 2.9.96 Bumps [ridedott/merge-me-action](https://github.com/ridedott/merge-me-action) from 2.9.89 to 2.9.96. - [Release notes](https://github.com/ridedott/merge-me-action/releases) - [Changelog](https://github.com/ridedott/merge-me-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/ridedott/merge-me-action/compare/v2.9.89...v2.9.96) --- updated-dependencies: - dependency-name: ridedott/merge-me-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-dependabot-upgrades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml index f89dd5c..73643aa 100644 --- a/.github/workflows/merge-dependabot-upgrades.yml +++ b/.github/workflows/merge-dependabot-upgrades.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Auto-Merge if: ${{ github.event.workflow_run.conclusion == 'success' }} - uses: ridedott/merge-me-action@v2.9.89 + uses: ridedott/merge-me-action@v2.9.96 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_METHOD: MERGE From 051e6c5b36f0aeaf8623552ce300e74fb97fcb8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jan 2022 16:56:18 +0000 Subject: [PATCH 10/38] Bump php-http/cache-plugin from 1.7.4 to 1.7.5 Bumps [php-http/cache-plugin](https://github.com/php-http/cache-plugin) from 1.7.4 to 1.7.5. - [Release notes](https://github.com/php-http/cache-plugin/releases) - [Changelog](https://github.com/php-http/cache-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/php-http/cache-plugin/compare/1.7.4...1.7.5) --- updated-dependencies: - dependency-name: php-http/cache-plugin dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 272 +++++++++++++++++++++++++------------------------- 1 file changed, 136 insertions(+), 136 deletions(-) diff --git a/composer.lock b/composer.lock index 08d6565..62aacc4 100644 --- a/composer.lock +++ b/composer.lock @@ -135,49 +135,54 @@ "time": "2021-09-02T17:10:53+00:00" }, { - "name": "php-http/curl-client", - "version": "2.2.1", + "name": "php-http/client-common", + "version": "2.5.0", "source": { "type": "git", - "url": "https://github.com/php-http/curl-client.git", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" + "url": "https://github.com/php-http/client-common.git", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", "shasum": "" }, "require": { - "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message": "^1.2", + "php-http/message": "^1.6", + "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0", - "psr/http-client-implementation": "1.0" + "psr/http-message": "^1.0", + "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", + "symfony/polyfill-php80": "^1.17" }, "require-dev": { - "guzzlehttp/psr7": "^1.0", - "laminas/laminas-diactoros": "^2.0", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^7.5 || ^9.4" + "doctrine/instantiator": "^1.1", + "guzzlehttp/psr7": "^1.4", + "nyholm/psr7": "^1.2", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", + "phpspec/prophecy": "^1.10.2", + "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + }, + "suggest": { + "ext-json": "To detect JSON responses with the ContentTypePlugin", + "ext-libxml": "To detect XML responses with the ContentTypePlugin", + "php-http/cache-plugin": "PSR-6 Cache plugin", + "php-http/logger-plugin": "PSR-3 Logger plugin", + "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { "psr-4": { - "Http\\Client\\Curl\\": "src/" + "Http\\Client\\Common\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -186,22 +191,23 @@ ], "authors": [ { - "name": "Михаил Красильников", - "email": "m.krasilnikov@yandex.ru" + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" } ], - "description": "PSR-18 and HTTPlug Async client with cURL", - "homepage": "http://php-http.org", + "description": "Common HTTP Client implementations and tools for HTTPlug", + "homepage": "http://httplug.io", "keywords": [ - "curl", + "client", + "common", "http", - "psr-18" + "httplug" ], "support": { - "issues": "https://github.com/php-http/curl-client/issues", - "source": "https://github.com/php-http/curl-client/tree/2.2.1" + "issues": "https://github.com/php-http/client-common/issues", + "source": "https://github.com/php-http/client-common/tree/2.5.0" }, - "time": "2021-12-10T18:02:07+00:00" + "time": "2021-11-26T15:01:24+00:00" }, { "name": "php-http/discovery", @@ -461,6 +467,74 @@ }, "time": "2015-12-19T14:08:53+00:00" }, + { + "name": "php-http/mock-client", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/mock-client.git", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/client-common": "^2.0", + "php-http/discovery": "^1.0", + "php-http/httplug": "^2.0", + "php-http/message-factory": "^1.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "symfony/polyfill-php80": "^1.17" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "phpspec/phpspec": "^5.1 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Mock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David de Boer", + "email": "david@ddeboer.nl" + } + ], + "description": "Mock HTTP client", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "http", + "mock", + "psr7" + ], + "support": { + "issues": "https://github.com/php-http/mock-client/issues", + "source": "https://github.com/php-http/mock-client/tree/1.5.0" + }, + "time": "2021-08-25T07:01:14+00:00" + }, { "name": "php-http/promise", "version": "1.1.0", @@ -2319,23 +2393,23 @@ }, { "name": "php-http/cache-plugin", - "version": "1.7.4", + "version": "1.7.5", "source": { "type": "git", "url": "https://github.com/php-http/cache-plugin.git", - "reference": "2c00b4c6d41c0c9cad4d901adaf1a7db55f98744" + "reference": "63bc3f7242825c9a817db8f78e4c9703b0c471e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/cache-plugin/zipball/2c00b4c6d41c0c9cad4d901adaf1a7db55f98744", - "reference": "2c00b4c6d41c0c9cad4d901adaf1a7db55f98744", + "url": "https://api.github.com/repos/php-http/cache-plugin/zipball/63bc3f7242825c9a817db8f78e4c9703b0c471e2", + "reference": "63bc3f7242825c9a817db8f78e4c9703b0c471e2", "shasum": "" }, "require": { "php": "^7.1 || ^8.0", "php-http/client-common": "^1.9 || ^2.0", "php-http/message-factory": "^1.0", - "psr/cache": "^1.0 || ^2.0", + "psr/cache": "^1.0 || ^2.0 || ^3.0", "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { @@ -2372,109 +2446,33 @@ ], "support": { "issues": "https://github.com/php-http/cache-plugin/issues", - "source": "https://github.com/php-http/cache-plugin/tree/1.7.4" + "source": "https://github.com/php-http/cache-plugin/tree/1.7.5" }, - "time": "2021-11-30T07:06:42+00:00" + "time": "2022-01-18T12:24:56+00:00" }, { - "name": "php-http/client-common", - "version": "2.5.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/client-common.git", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0", - "php-http/httplug": "^2.0", - "php-http/message": "^1.6", - "php-http/message-factory": "^1.0", - "psr/http-client": "^1.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", - "symfony/polyfill-php80": "^1.17" - }, - "require-dev": { - "doctrine/instantiator": "^1.1", - "guzzlehttp/psr7": "^1.4", - "nyholm/psr7": "^1.2", - "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", - "phpspec/prophecy": "^1.10.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" - }, - "suggest": { - "ext-json": "To detect JSON responses with the ContentTypePlugin", - "ext-libxml": "To detect XML responses with the ContentTypePlugin", - "php-http/cache-plugin": "PSR-6 Cache plugin", - "php-http/logger-plugin": "PSR-3 Logger plugin", - "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Client\\Common\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "Common HTTP Client implementations and tools for HTTPlug", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "common", - "http", - "httplug" - ], - "support": { - "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.5.0" - }, - "time": "2021-11-26T15:01:24+00:00" - }, - { - "name": "php-http/mock-client", - "version": "1.5.0", + "name": "php-http/curl-client", + "version": "2.2.1", "source": { "type": "git", - "url": "https://github.com/php-http/mock-client.git", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + "url": "https://github.com/php-http/curl-client.git", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", "shasum": "" }, "require": { + "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/client-common": "^2.0", - "php-http/discovery": "^1.0", + "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message-factory": "^1.0", + "php-http/message": "^1.2", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/polyfill-php80": "^1.17" + "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, "provide": { "php-http/async-client-implementation": "1.0", @@ -2482,17 +2480,20 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "phpspec/phpspec": "^5.1 || ^6.0" + "guzzlehttp/psr7": "^1.0", + "laminas/laminas-diactoros": "^2.0", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^7.5 || ^9.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "Http\\Mock\\": "src/" + "Http\\Client\\Curl\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2501,23 +2502,22 @@ ], "authors": [ { - "name": "David de Boer", - "email": "david@ddeboer.nl" + "name": "Михаил Красильников", + "email": "m.krasilnikov@yandex.ru" } ], - "description": "Mock HTTP client", - "homepage": "http://httplug.io", + "description": "PSR-18 and HTTPlug Async client with cURL", + "homepage": "http://php-http.org", "keywords": [ - "client", + "curl", "http", - "mock", - "psr7" + "psr-18" ], "support": { - "issues": "https://github.com/php-http/mock-client/issues", - "source": "https://github.com/php-http/mock-client/tree/1.5.0" + "issues": "https://github.com/php-http/curl-client/issues", + "source": "https://github.com/php-http/curl-client/tree/2.2.1" }, - "time": "2021-08-25T07:01:14+00:00" + "time": "2021-12-10T18:02:07+00:00" }, { "name": "phpdocumentor/reflection-common", From 3fb288e3e6af521c735e63686cdbadc7383c5fae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jan 2022 16:56:29 +0000 Subject: [PATCH 11/38] Bump vimeo/psalm from 4.18 to 4.18.1 Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 4.18 to 4.18.1. - [Release notes](https://github.com/vimeo/psalm/releases) - [Commits](https://github.com/vimeo/psalm/compare/4.18...4.18.1) --- updated-dependencies: - dependency-name: vimeo/psalm dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 286 +++++++++++++++++++++++++------------------------- 1 file changed, 143 insertions(+), 143 deletions(-) diff --git a/composer.lock b/composer.lock index 08d6565..046de8e 100644 --- a/composer.lock +++ b/composer.lock @@ -135,49 +135,54 @@ "time": "2021-09-02T17:10:53+00:00" }, { - "name": "php-http/curl-client", - "version": "2.2.1", + "name": "php-http/client-common", + "version": "2.5.0", "source": { "type": "git", - "url": "https://github.com/php-http/curl-client.git", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" + "url": "https://github.com/php-http/client-common.git", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", "shasum": "" }, "require": { - "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message": "^1.2", + "php-http/message": "^1.6", + "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0", - "psr/http-client-implementation": "1.0" + "psr/http-message": "^1.0", + "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", + "symfony/polyfill-php80": "^1.17" }, "require-dev": { - "guzzlehttp/psr7": "^1.0", - "laminas/laminas-diactoros": "^2.0", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^7.5 || ^9.4" + "doctrine/instantiator": "^1.1", + "guzzlehttp/psr7": "^1.4", + "nyholm/psr7": "^1.2", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", + "phpspec/prophecy": "^1.10.2", + "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + }, + "suggest": { + "ext-json": "To detect JSON responses with the ContentTypePlugin", + "ext-libxml": "To detect XML responses with the ContentTypePlugin", + "php-http/cache-plugin": "PSR-6 Cache plugin", + "php-http/logger-plugin": "PSR-3 Logger plugin", + "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { "psr-4": { - "Http\\Client\\Curl\\": "src/" + "Http\\Client\\Common\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -186,22 +191,23 @@ ], "authors": [ { - "name": "Михаил Красильников", - "email": "m.krasilnikov@yandex.ru" + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" } ], - "description": "PSR-18 and HTTPlug Async client with cURL", - "homepage": "http://php-http.org", + "description": "Common HTTP Client implementations and tools for HTTPlug", + "homepage": "http://httplug.io", "keywords": [ - "curl", + "client", + "common", "http", - "psr-18" + "httplug" ], "support": { - "issues": "https://github.com/php-http/curl-client/issues", - "source": "https://github.com/php-http/curl-client/tree/2.2.1" + "issues": "https://github.com/php-http/client-common/issues", + "source": "https://github.com/php-http/client-common/tree/2.5.0" }, - "time": "2021-12-10T18:02:07+00:00" + "time": "2021-11-26T15:01:24+00:00" }, { "name": "php-http/discovery", @@ -461,6 +467,74 @@ }, "time": "2015-12-19T14:08:53+00:00" }, + { + "name": "php-http/mock-client", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/mock-client.git", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/client-common": "^2.0", + "php-http/discovery": "^1.0", + "php-http/httplug": "^2.0", + "php-http/message-factory": "^1.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "symfony/polyfill-php80": "^1.17" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "phpspec/phpspec": "^5.1 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Mock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David de Boer", + "email": "david@ddeboer.nl" + } + ], + "description": "Mock HTTP client", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "http", + "mock", + "psr7" + ], + "support": { + "issues": "https://github.com/php-http/mock-client/issues", + "source": "https://github.com/php-http/mock-client/tree/1.5.0" + }, + "time": "2021-08-25T07:01:14+00:00" + }, { "name": "php-http/promise", "version": "1.1.0", @@ -1195,16 +1269,16 @@ }, { "name": "composer/package-versions-deprecated", - "version": "1.11.99.4", + "version": "1.11.99.5", "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "b174585d1fe49ceed21928a945138948cb394600" + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600", - "reference": "b174585d1fe49ceed21928a945138948cb394600", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", "shasum": "" }, "require": { @@ -1248,7 +1322,7 @@ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4" + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" }, "funding": [ { @@ -1264,7 +1338,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T08:41:34+00:00" + "time": "2022-01-17T14:14:24+00:00" }, { "name": "composer/pcre", @@ -2377,104 +2451,28 @@ "time": "2021-11-30T07:06:42+00:00" }, { - "name": "php-http/client-common", - "version": "2.5.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/client-common.git", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0", - "php-http/httplug": "^2.0", - "php-http/message": "^1.6", - "php-http/message-factory": "^1.0", - "psr/http-client": "^1.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", - "symfony/polyfill-php80": "^1.17" - }, - "require-dev": { - "doctrine/instantiator": "^1.1", - "guzzlehttp/psr7": "^1.4", - "nyholm/psr7": "^1.2", - "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", - "phpspec/prophecy": "^1.10.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" - }, - "suggest": { - "ext-json": "To detect JSON responses with the ContentTypePlugin", - "ext-libxml": "To detect XML responses with the ContentTypePlugin", - "php-http/cache-plugin": "PSR-6 Cache plugin", - "php-http/logger-plugin": "PSR-3 Logger plugin", - "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Client\\Common\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "Common HTTP Client implementations and tools for HTTPlug", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "common", - "http", - "httplug" - ], - "support": { - "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.5.0" - }, - "time": "2021-11-26T15:01:24+00:00" - }, - { - "name": "php-http/mock-client", - "version": "1.5.0", + "name": "php-http/curl-client", + "version": "2.2.1", "source": { "type": "git", - "url": "https://github.com/php-http/mock-client.git", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + "url": "https://github.com/php-http/curl-client.git", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", "shasum": "" }, "require": { + "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/client-common": "^2.0", - "php-http/discovery": "^1.0", + "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message-factory": "^1.0", + "php-http/message": "^1.2", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/polyfill-php80": "^1.17" + "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, "provide": { "php-http/async-client-implementation": "1.0", @@ -2482,17 +2480,20 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "phpspec/phpspec": "^5.1 || ^6.0" + "guzzlehttp/psr7": "^1.0", + "laminas/laminas-diactoros": "^2.0", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^7.5 || ^9.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "Http\\Mock\\": "src/" + "Http\\Client\\Curl\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2501,23 +2502,22 @@ ], "authors": [ { - "name": "David de Boer", - "email": "david@ddeboer.nl" + "name": "Михаил Красильников", + "email": "m.krasilnikov@yandex.ru" } ], - "description": "Mock HTTP client", - "homepage": "http://httplug.io", + "description": "PSR-18 and HTTPlug Async client with cURL", + "homepage": "http://php-http.org", "keywords": [ - "client", + "curl", "http", - "mock", - "psr7" + "psr-18" ], "support": { - "issues": "https://github.com/php-http/mock-client/issues", - "source": "https://github.com/php-http/mock-client/tree/1.5.0" + "issues": "https://github.com/php-http/curl-client/issues", + "source": "https://github.com/php-http/curl-client/tree/2.2.1" }, - "time": "2021-08-25T07:01:14+00:00" + "time": "2021-12-10T18:02:07+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -5795,22 +5795,22 @@ }, { "name": "vimeo/psalm", - "version": "4.18", + "version": "4.18.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "760baddcea5e0d2ba5bfb882a3243265ad1430d3" + "reference": "dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/760baddcea5e0d2ba5bfb882a3243265ad1430d3", - "reference": "760baddcea5e0d2ba5bfb882a3243265ad1430d3", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb", + "reference": "dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb", "shasum": "" }, "require": { "amphp/amp": "^2.4.2", "amphp/byte-stream": "^1.5", - "composer-runtime-api": "^2.0.0", + "composer/package-versions-deprecated": "^1.8.0", "composer/semver": "^1.4 || ^2.0 || ^3.0", "composer/xdebug-handler": "^1.1 || ^2.0 || ^3.0", "dnoegel/php-xdg-base-dir": "^0.1.1", @@ -5843,7 +5843,7 @@ "phpmyadmin/sql-parser": "5.1.0||dev-master", "phpspec/prophecy": ">=1.9.0", "phpunit/phpunit": "^9.0", - "psalm/plugin-phpunit": "^0.16.1", + "psalm/plugin-phpunit": "^0.16", "slevomat/coding-standard": "^7.0", "squizlabs/php_codesniffer": "^3.5", "symfony/process": "^4.3 || ^5.0 || ^6.0", @@ -5895,9 +5895,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.18" + "source": "https://github.com/vimeo/psalm/tree/4.18.1" }, - "time": "2022-01-06T20:49:15+00:00" + "time": "2022-01-08T21:21:26+00:00" }, { "name": "webmozart/assert", From 4939bdf78cbf47e05defcb9f5ecd05dbc96a0c03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jan 2022 14:01:05 +0000 Subject: [PATCH 12/38] Bump phpunit/phpunit from 9.5.11 to 9.5.13 Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.11 to 9.5.13. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md) - [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.11...9.5.13) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 94f0f0e..091fc65 100644 --- a/composer.lock +++ b/composer.lock @@ -3115,16 +3115,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.11", + "version": "9.5.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "2406855036db1102126125537adb1406f7242fdd" + "reference": "597cb647654ede35e43b137926dfdfef0fb11743" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2406855036db1102126125537adb1406f7242fdd", - "reference": "2406855036db1102126125537adb1406f7242fdd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/597cb647654ede35e43b137926dfdfef0fb11743", + "reference": "597cb647654ede35e43b137926dfdfef0fb11743", "shasum": "" }, "require": { @@ -3202,7 +3202,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.11" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.13" }, "funding": [ { @@ -3214,7 +3214,7 @@ "type": "github" } ], - "time": "2021-12-25T07:07:57+00:00" + "time": "2022-01-24T07:33:35+00:00" }, { "name": "psalm/plugin-phpunit", From 9bc2000eb4f340d575f5b33916ba7e325f4c90ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jan 2022 14:15:48 +0000 Subject: [PATCH 13/38] Bump ridedott/merge-me-action from 2.9.96 to 2.9.99 Bumps [ridedott/merge-me-action](https://github.com/ridedott/merge-me-action) from 2.9.96 to 2.9.99. - [Release notes](https://github.com/ridedott/merge-me-action/releases) - [Changelog](https://github.com/ridedott/merge-me-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/ridedott/merge-me-action/compare/v2.9.96...v2.9.99) --- updated-dependencies: - dependency-name: ridedott/merge-me-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-dependabot-upgrades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml index 73643aa..ecc8cfc 100644 --- a/.github/workflows/merge-dependabot-upgrades.yml +++ b/.github/workflows/merge-dependabot-upgrades.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Auto-Merge if: ${{ github.event.workflow_run.conclusion == 'success' }} - uses: ridedott/merge-me-action@v2.9.96 + uses: ridedott/merge-me-action@v2.9.99 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_METHOD: MERGE From 4f5bcd8bedf294df524dec881f4f297f66e3fa02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 14:01:01 +0000 Subject: [PATCH 14/38] Bump symfony/cache from 5.4.2 to 5.4.3 Bumps [symfony/cache](https://github.com/symfony/cache) from 5.4.2 to 5.4.3. - [Release notes](https://github.com/symfony/cache/releases) - [Changelog](https://github.com/symfony/cache/blob/5.4/CHANGELOG.md) - [Commits](https://github.com/symfony/cache/compare/v5.4.2...v5.4.3) --- updated-dependencies: - dependency-name: symfony/cache dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 091fc65..26b7594 100644 --- a/composer.lock +++ b/composer.lock @@ -4898,16 +4898,16 @@ }, { "name": "symfony/cache", - "version": "v5.4.2", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "8aad4b69a10c5c51ab54672e78995860f5e447ec" + "reference": "4178f0a19ec3f1f76e7f1a07b8187cbe3d94b825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/8aad4b69a10c5c51ab54672e78995860f5e447ec", - "reference": "8aad4b69a10c5c51ab54672e78995860f5e447ec", + "url": "https://api.github.com/repos/symfony/cache/zipball/4178f0a19ec3f1f76e7f1a07b8187cbe3d94b825", + "reference": "4178f0a19ec3f1f76e7f1a07b8187cbe3d94b825", "shasum": "" }, "require": { @@ -4975,7 +4975,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.2" + "source": "https://github.com/symfony/cache/tree/v5.4.3" }, "funding": [ { @@ -4991,7 +4991,7 @@ "type": "tidelift" } ], - "time": "2021-12-28T17:15:56+00:00" + "time": "2022-01-26T16:28:35+00:00" }, { "name": "symfony/cache-contracts", @@ -5672,16 +5672,16 @@ }, { "name": "symfony/var-exporter", - "version": "v5.4.2", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "2360c8525815b8535caac27cbc1994e2fa8644ba" + "reference": "b199936b7365be36663532e547812d3abb10234a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/2360c8525815b8535caac27cbc1994e2fa8644ba", - "reference": "2360c8525815b8535caac27cbc1994e2fa8644ba", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b199936b7365be36663532e547812d3abb10234a", + "reference": "b199936b7365be36663532e547812d3abb10234a", "shasum": "" }, "require": { @@ -5725,7 +5725,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.2" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.3" }, "funding": [ { @@ -5741,7 +5741,7 @@ "type": "tidelift" } ], - "time": "2021-12-16T21:58:21+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "theseer/tokenizer", From 5284366531258ed913bc41fadb538a2ddfaaf953 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 14:01:07 +0000 Subject: [PATCH 15/38] Bump vimeo/psalm from 4.18.1 to 4.19.0 Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 4.18.1 to 4.19.0. - [Release notes](https://github.com/vimeo/psalm/releases) - [Commits](https://github.com/vimeo/psalm/compare/4.18.1...4.19.0) --- updated-dependencies: - dependency-name: vimeo/psalm dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/composer.lock b/composer.lock index 091fc65..59d8e8c 100644 --- a/composer.lock +++ b/composer.lock @@ -1342,23 +1342,23 @@ }, { "name": "composer/pcre", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" + "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", - "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", + "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560", + "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1", + "phpstan/phpstan": "^1.3", "phpstan/phpstan-strict-rules": "^1.1", "symfony/phpunit-bridge": "^4.2 || ^5" }, @@ -1393,7 +1393,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/1.0.0" + "source": "https://github.com/composer/pcre/tree/1.0.1" }, "funding": [ { @@ -1409,7 +1409,7 @@ "type": "tidelift" } ], - "time": "2021-12-06T15:17:27+00:00" + "time": "2022-01-21T20:24:37+00:00" }, { "name": "composer/semver", @@ -5074,16 +5074,16 @@ }, { "name": "symfony/console", - "version": "v5.4.2", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e" + "reference": "a2a86ec353d825c75856c6fd14fac416a7bdb6b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a2c6b7ced2eb7799a35375fb9022519282b5405e", - "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e", + "url": "https://api.github.com/repos/symfony/console/zipball/a2a86ec353d825c75856c6fd14fac416a7bdb6b8", + "reference": "a2a86ec353d825c75856c6fd14fac416a7bdb6b8", "shasum": "" }, "require": { @@ -5153,7 +5153,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.2" + "source": "https://github.com/symfony/console/tree/v5.4.3" }, "funding": [ { @@ -5169,7 +5169,7 @@ "type": "tidelift" } ], - "time": "2021-12-20T16:11:12+00:00" + "time": "2022-01-26T16:28:35+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5586,16 +5586,16 @@ }, { "name": "symfony/string", - "version": "v5.4.2", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d" + "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", - "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d", + "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10", + "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10", "shasum": "" }, "require": { @@ -5652,7 +5652,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.2" + "source": "https://github.com/symfony/string/tree/v5.4.3" }, "funding": [ { @@ -5668,7 +5668,7 @@ "type": "tidelift" } ], - "time": "2021-12-16T21:52:00+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/var-exporter", @@ -5795,16 +5795,16 @@ }, { "name": "vimeo/psalm", - "version": "4.18.1", + "version": "4.19.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb" + "reference": "a2ad69ae4f5ab1f7d225a8dc4e2ec2d9415ed599" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb", - "reference": "dda05fa913f4dc6eb3386f2f7ce5a45d37a71bcb", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/a2ad69ae4f5ab1f7d225a8dc4e2ec2d9415ed599", + "reference": "a2ad69ae4f5ab1f7d225a8dc4e2ec2d9415ed599", "shasum": "" }, "require": { @@ -5895,9 +5895,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.18.1" + "source": "https://github.com/vimeo/psalm/tree/4.19.0" }, - "time": "2022-01-08T21:21:26+00:00" + "time": "2022-01-27T19:00:37+00:00" }, { "name": "webmozart/assert", From bdb0cb87fd70ccc4dd160afe74b8720c822c21c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 14:19:21 +0000 Subject: [PATCH 16/38] Bump ridedott/merge-me-action from 2.9.99 to 2.9.102 Bumps [ridedott/merge-me-action](https://github.com/ridedott/merge-me-action) from 2.9.99 to 2.9.102. - [Release notes](https://github.com/ridedott/merge-me-action/releases) - [Changelog](https://github.com/ridedott/merge-me-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/ridedott/merge-me-action/compare/v2.9.99...v2.9.102) --- updated-dependencies: - dependency-name: ridedott/merge-me-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-dependabot-upgrades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml index ecc8cfc..dc0031a 100644 --- a/.github/workflows/merge-dependabot-upgrades.yml +++ b/.github/workflows/merge-dependabot-upgrades.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Auto-Merge if: ${{ github.event.workflow_run.conclusion == 'success' }} - uses: ridedott/merge-me-action@v2.9.99 + uses: ridedott/merge-me-action@v2.9.102 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_METHOD: MERGE From 99900951a9d4b66b31421f97f9406d7b2b2ace17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 14:00:48 +0000 Subject: [PATCH 17/38] Bump vimeo/psalm from 4.19.0 to 4.20.0 Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 4.19.0 to 4.20.0. - [Release notes](https://github.com/vimeo/psalm/releases) - [Commits](https://github.com/vimeo/psalm/compare/4.19.0...4.20.0) --- updated-dependencies: - dependency-name: vimeo/psalm dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 68 +++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/composer.lock b/composer.lock index 5843a38..da76899 100644 --- a/composer.lock +++ b/composer.lock @@ -965,12 +965,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1044,12 +1044,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1223,12 +1223,12 @@ } }, "autoload": { - "psr-4": { - "Amp\\ByteStream\\": "lib" - }, "files": [ "lib/functions.php" - ] + ], + "psr-4": { + "Amp\\ByteStream\\": "lib" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1413,23 +1413,23 @@ }, { "name": "composer/semver", - "version": "3.2.7", + "version": "3.2.9", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "deac27056b57e46faf136fae7b449eeaa71661ee" + "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/deac27056b57e46faf136fae7b449eeaa71661ee", - "reference": "deac27056b57e46faf136fae7b449eeaa71661ee", + "url": "https://api.github.com/repos/composer/semver/zipball/a951f614bd64dcd26137bc9b7b2637ddcfc57649", + "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.54", + "phpstan/phpstan": "^1.4", "symfony/phpunit-bridge": "^4.2 || ^5" }, "type": "library", @@ -1474,7 +1474,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.7" + "source": "https://github.com/composer/semver/tree/3.2.9" }, "funding": [ { @@ -1490,7 +1490,7 @@ "type": "tidelift" } ], - "time": "2022-01-04T09:57:54+00:00" + "time": "2022-02-04T13:58:43+00:00" }, { "name": "composer/xdebug-handler", @@ -5284,12 +5284,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5365,12 +5365,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -5795,16 +5795,16 @@ }, { "name": "vimeo/psalm", - "version": "4.19.0", + "version": "4.20.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "a2ad69ae4f5ab1f7d225a8dc4e2ec2d9415ed599" + "reference": "f82a70e7edfc6cf2705e9374c8a0b6a974a779ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/a2ad69ae4f5ab1f7d225a8dc4e2ec2d9415ed599", - "reference": "a2ad69ae4f5ab1f7d225a8dc4e2ec2d9415ed599", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/f82a70e7edfc6cf2705e9374c8a0b6a974a779ed", + "reference": "f82a70e7edfc6cf2705e9374c8a0b6a974a779ed", "shasum": "" }, "require": { @@ -5870,13 +5870,13 @@ } }, "autoload": { - "psr-4": { - "Psalm\\": "src/Psalm/" - }, "files": [ "src/functions.php", "src/spl_object_id.php" - ] + ], + "psr-4": { + "Psalm\\": "src/Psalm/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5895,9 +5895,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.19.0" + "source": "https://github.com/vimeo/psalm/tree/4.20.0" }, - "time": "2022-01-27T19:00:37+00:00" + "time": "2022-02-03T17:03:47+00:00" }, { "name": "webmozart/assert", From 9823dbde35cbe34f26b4fa9c3ceffadfcebc39f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 14:15:46 +0000 Subject: [PATCH 18/38] Bump ridedott/merge-me-action from 2.9.102 to 2.9.106 Bumps [ridedott/merge-me-action](https://github.com/ridedott/merge-me-action) from 2.9.102 to 2.9.106. - [Release notes](https://github.com/ridedott/merge-me-action/releases) - [Changelog](https://github.com/ridedott/merge-me-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/ridedott/merge-me-action/compare/v2.9.102...v2.9.106) --- updated-dependencies: - dependency-name: ridedott/merge-me-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-dependabot-upgrades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml index dc0031a..1b77cda 100644 --- a/.github/workflows/merge-dependabot-upgrades.yml +++ b/.github/workflows/merge-dependabot-upgrades.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Auto-Merge if: ${{ github.event.workflow_run.conclusion == 'success' }} - uses: ridedott/merge-me-action@v2.9.102 + uses: ridedott/merge-me-action@v2.9.106 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_METHOD: MERGE From 3818ad6b2ca5308a9a5eb6fe5023029e947f29a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 14:18:04 +0000 Subject: [PATCH 19/38] Bump ridedott/merge-me-action from 2.9.106 to 2.9.109 Bumps [ridedott/merge-me-action](https://github.com/ridedott/merge-me-action) from 2.9.106 to 2.9.109. - [Release notes](https://github.com/ridedott/merge-me-action/releases) - [Changelog](https://github.com/ridedott/merge-me-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/ridedott/merge-me-action/compare/v2.9.106...v2.9.109) --- updated-dependencies: - dependency-name: ridedott/merge-me-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-dependabot-upgrades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml index 1b77cda..8869f60 100644 --- a/.github/workflows/merge-dependabot-upgrades.yml +++ b/.github/workflows/merge-dependabot-upgrades.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Auto-Merge if: ${{ github.event.workflow_run.conclusion == 'success' }} - uses: ridedott/merge-me-action@v2.9.106 + uses: ridedott/merge-me-action@v2.9.109 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_METHOD: MERGE From 6c7dec12da2c70c8c8ff817f4f28faf21a859155 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Feb 2022 14:00:58 +0000 Subject: [PATCH 20/38] Bump phpunit/phpunit from 9.5.13 to 9.5.14 Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.13 to 9.5.14. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/master/ChangeLog-9.5.md) - [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.13...9.5.14) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index da76899..6bfe9a2 100644 --- a/composer.lock +++ b/composer.lock @@ -2089,12 +2089,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, "files": [ "src/DeepCopy/deep_copy.php" - ] + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2342,16 +2342,16 @@ }, { "name": "phar-io/version", - "version": "3.1.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/phar-io/version.git", - "reference": "bae7c545bef187884426f042434e561ab1ddb182" + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182", - "reference": "bae7c545bef187884426f042434e561ab1ddb182", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", "shasum": "" }, "require": { @@ -2387,9 +2387,9 @@ "description": "Library for handling version information and constraints", "support": { "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.1.0" + "source": "https://github.com/phar-io/version/tree/3.2.1" }, - "time": "2021-02-23T14:00:09+00:00" + "time": "2022-02-21T01:04:05+00:00" }, { "name": "php-http/cache-plugin", @@ -2797,16 +2797,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.10", + "version": "9.2.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687" + "reference": "665a1ac0a763c51afc30d6d130dac0813092b17f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687", - "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/665a1ac0a763c51afc30d6d130dac0813092b17f", + "reference": "665a1ac0a763c51afc30d6d130dac0813092b17f", "shasum": "" }, "require": { @@ -2862,7 +2862,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.11" }, "funding": [ { @@ -2870,7 +2870,7 @@ "type": "github" } ], - "time": "2021-12-05T09:12:13+00:00" + "time": "2022-02-18T12:46:09+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3115,16 +3115,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.13", + "version": "9.5.14", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "597cb647654ede35e43b137926dfdfef0fb11743" + "reference": "1883687169c017d6ae37c58883ca3994cfc34189" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/597cb647654ede35e43b137926dfdfef0fb11743", - "reference": "597cb647654ede35e43b137926dfdfef0fb11743", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1883687169c017d6ae37c58883ca3994cfc34189", + "reference": "1883687169c017d6ae37c58883ca3994cfc34189", "shasum": "" }, "require": { @@ -3175,11 +3175,11 @@ } }, "autoload": { - "classmap": [ - "src/" - ], "files": [ "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -3202,7 +3202,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.13" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.14" }, "funding": [ { @@ -3214,7 +3214,7 @@ "type": "github" } ], - "time": "2022-01-24T07:33:35+00:00" + "time": "2022-02-18T12:54:07+00:00" }, { "name": "psalm/plugin-phpunit", @@ -4321,16 +4321,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.3", + "version": "5.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49" + "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49", - "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", "shasum": "" }, "require": { @@ -4373,7 +4373,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" }, "funding": [ { @@ -4381,7 +4381,7 @@ "type": "github" } ], - "time": "2021-06-11T13:31:12+00:00" + "time": "2022-02-14T08:28:10+00:00" }, { "name": "sebastian/lines-of-code", From b9e535d65e7c9034604efa4a7ea971b582aad838 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Feb 2022 14:15:16 +0000 Subject: [PATCH 21/38] Bump ridedott/merge-me-action from 2.9.109 to 2.9.110 Bumps [ridedott/merge-me-action](https://github.com/ridedott/merge-me-action) from 2.9.109 to 2.9.110. - [Release notes](https://github.com/ridedott/merge-me-action/releases) - [Changelog](https://github.com/ridedott/merge-me-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/ridedott/merge-me-action/compare/v2.9.109...v2.9.110) --- updated-dependencies: - dependency-name: ridedott/merge-me-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-dependabot-upgrades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml index 8869f60..3a3c736 100644 --- a/.github/workflows/merge-dependabot-upgrades.yml +++ b/.github/workflows/merge-dependabot-upgrades.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Auto-Merge if: ${{ github.event.workflow_run.conclusion == 'success' }} - uses: ridedott/merge-me-action@v2.9.109 + uses: ridedott/merge-me-action@v2.9.110 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_METHOD: MERGE From a35770a1aa35658c2d0bd060a3bec05cfe692ed7 Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 21 Feb 2022 14:49:41 +0000 Subject: [PATCH 22/38] Updates lock-file for 2.x --- composer.lock | 463 ++++++++++++++++++++++++++------------------------ 1 file changed, 239 insertions(+), 224 deletions(-) diff --git a/composer.lock b/composer.lock index 6bfe9a2..a12a757 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "clue/stream-filter", - "version": "v1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/clue/stream-filter.git", - "reference": "aeb7d8ea49c7963d3b581378955dbf5bc49aa320" + "reference": "d6169430c7731d8509da7aecd0af756a5747b78e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/clue/stream-filter/zipball/aeb7d8ea49c7963d3b581378955dbf5bc49aa320", - "reference": "aeb7d8ea49c7963d3b581378955dbf5bc49aa320", + "url": "https://api.github.com/repos/clue/stream-filter/zipball/d6169430c7731d8509da7aecd0af756a5747b78e", + "reference": "d6169430c7731d8509da7aecd0af756a5747b78e", "shasum": "" }, "require": { @@ -28,12 +28,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Clue\\StreamFilter\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "Clue\\StreamFilter\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -58,7 +58,7 @@ ], "support": { "issues": "https://github.com/clue/stream-filter/issues", - "source": "https://github.com/clue/stream-filter/tree/v1.5.0" + "source": "https://github.com/clue/stream-filter/tree/v1.6.0" }, "funding": [ { @@ -70,7 +70,7 @@ "type": "github" } ], - "time": "2020-10-02T12:38:20+00:00" + "time": "2022-02-21T13:15:14+00:00" }, { "name": "laminas/laminas-escaper", @@ -135,54 +135,49 @@ "time": "2021-09-02T17:10:53+00:00" }, { - "name": "php-http/client-common", - "version": "2.5.0", + "name": "php-http/curl-client", + "version": "2.2.1", "source": { "type": "git", - "url": "https://github.com/php-http/client-common.git", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" + "url": "https://github.com/php-http/curl-client.git", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", + "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", "shasum": "" }, "require": { + "ext-curl": "*", "php": "^7.1 || ^8.0", + "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message": "^1.6", - "php-http/message-factory": "^1.0", + "php-http/message": "^1.2", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", - "symfony/polyfill-php80": "^1.17" + "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, - "require-dev": { - "doctrine/instantiator": "^1.1", - "guzzlehttp/psr7": "^1.4", - "nyholm/psr7": "^1.2", - "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", - "phpspec/prophecy": "^1.10.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" }, - "suggest": { - "ext-json": "To detect JSON responses with the ContentTypePlugin", - "ext-libxml": "To detect XML responses with the ContentTypePlugin", - "php-http/cache-plugin": "PSR-6 Cache plugin", - "php-http/logger-plugin": "PSR-3 Logger plugin", - "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" + "require-dev": { + "guzzlehttp/psr7": "^1.0", + "laminas/laminas-diactoros": "^2.0", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^7.5 || ^9.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "Http\\Client\\Common\\": "src/" + "Http\\Client\\Curl\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -191,23 +186,22 @@ ], "authors": [ { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" + "name": "Михаил Красильников", + "email": "m.krasilnikov@yandex.ru" } ], - "description": "Common HTTP Client implementations and tools for HTTPlug", - "homepage": "http://httplug.io", + "description": "PSR-18 and HTTPlug Async client with cURL", + "homepage": "http://php-http.org", "keywords": [ - "client", - "common", + "curl", "http", - "httplug" + "psr-18" ], "support": { - "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.5.0" + "issues": "https://github.com/php-http/curl-client/issues", + "source": "https://github.com/php-http/curl-client/tree/2.2.1" }, - "time": "2021-11-26T15:01:24+00:00" + "time": "2021-12-10T18:02:07+00:00" }, { "name": "php-http/discovery", @@ -279,16 +273,16 @@ }, { "name": "php-http/httplug", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9" + "reference": "f640739f80dfa1152533976e3c112477f69274eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/191a0a1b41ed026b717421931f8d3bd2514ffbf9", - "reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9", + "url": "https://api.github.com/repos/php-http/httplug/zipball/f640739f80dfa1152533976e3c112477f69274eb", + "reference": "f640739f80dfa1152533976e3c112477f69274eb", "shasum": "" }, "require": { @@ -335,22 +329,22 @@ ], "support": { "issues": "https://github.com/php-http/httplug/issues", - "source": "https://github.com/php-http/httplug/tree/master" + "source": "https://github.com/php-http/httplug/tree/2.3.0" }, - "time": "2020-07-13T15:43:23+00:00" + "time": "2022-02-21T09:52:22+00:00" }, { "name": "php-http/message", - "version": "1.12.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "39eb7548be982a81085fe5a6e2a44268cd586291" + "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/39eb7548be982a81085fe5a6e2a44268cd586291", - "reference": "39eb7548be982a81085fe5a6e2a44268cd586291", + "url": "https://api.github.com/repos/php-http/message/zipball/7886e647a30a966a1a8d1dad1845b71ca8678361", + "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361", "shasum": "" }, "require": { @@ -367,7 +361,7 @@ "ext-zlib": "*", "guzzlehttp/psr7": "^1.0", "laminas/laminas-diactoros": "^2.0", - "phpspec/phpspec": "^5.1 || ^6.3", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", "slim/slim": "^3.0" }, "suggest": { @@ -383,12 +377,12 @@ } }, "autoload": { - "psr-4": { - "Http\\Message\\": "src/" - }, "files": [ "src/filters.php" - ] + ], + "psr-4": { + "Http\\Message\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -409,9 +403,9 @@ ], "support": { "issues": "https://github.com/php-http/message/issues", - "source": "https://github.com/php-http/message/tree/1.12.0" + "source": "https://github.com/php-http/message/tree/1.13.0" }, - "time": "2021-08-29T09:13:12+00:00" + "time": "2022-02-11T13:41:14+00:00" }, { "name": "php-http/message-factory", @@ -467,74 +461,6 @@ }, "time": "2015-12-19T14:08:53+00:00" }, - { - "name": "php-http/mock-client", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/mock-client.git", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0", - "php-http/client-common": "^2.0", - "php-http/discovery": "^1.0", - "php-http/httplug": "^2.0", - "php-http/message-factory": "^1.0", - "psr/http-client": "^1.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/polyfill-php80": "^1.17" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0", - "psr/http-client-implementation": "1.0" - }, - "require-dev": { - "phpspec/phpspec": "^5.1 || ^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Mock\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "David de Boer", - "email": "david@ddeboer.nl" - } - ], - "description": "Mock HTTP client", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "http", - "mock", - "psr7" - ], - "support": { - "issues": "https://github.com/php-http/mock-client/issues", - "source": "https://github.com/php-http/mock-client/tree/1.5.0" - }, - "time": "2021-08-25T07:01:14+00:00" - }, { "name": "php-http/promise", "version": "1.1.0", @@ -870,16 +796,16 @@ }, { "name": "symfony/options-resolver", - "version": "v5.4.0", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847" + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847", - "reference": "b0fb78576487af19c500aaddb269fd36701d4847", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8", + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8", "shasum": "" }, "require": { @@ -919,7 +845,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v5.4.0" + "source": "https://github.com/symfony/options-resolver/tree/v5.4.3" }, "funding": [ { @@ -935,7 +861,7 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/polyfill-php73", @@ -1103,16 +1029,16 @@ "packages-dev": [ { "name": "amphp/amp", - "version": "v2.6.1", + "version": "v2.6.2", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae" + "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", - "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae", + "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", "shasum": "" }, "require": { @@ -1134,13 +1060,13 @@ } }, "autoload": { - "psr-4": { - "Amp\\": "lib" - }, "files": [ "lib/functions.php", "lib/Internal/functions.php" - ] + ], + "psr-4": { + "Amp\\": "lib" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1165,7 +1091,7 @@ } ], "description": "A non-blocking concurrency framework for PHP applications.", - "homepage": "http://amphp.org/amp", + "homepage": "https://amphp.org/amp", "keywords": [ "async", "asynchronous", @@ -1180,7 +1106,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.1" + "source": "https://github.com/amphp/amp/tree/v2.6.2" }, "funding": [ { @@ -1188,7 +1114,7 @@ "type": "github" } ], - "time": "2021-09-23T18:43:08+00:00" + "time": "2022-02-20T17:52:18+00:00" }, { "name": "amphp/byte-stream", @@ -1560,27 +1486,27 @@ }, { "name": "dealerdirect/phpcodesniffer-composer-installer", - "version": "v0.7.1", + "version": "v0.7.2", "source": { "type": "git", "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git", - "reference": "fe390591e0241955f22eb9ba327d137e501c771c" + "reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/fe390591e0241955f22eb9ba327d137e501c771c", - "reference": "fe390591e0241955f22eb9ba327d137e501c771c", + "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db", + "reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db", "shasum": "" }, "require": { "composer-plugin-api": "^1.0 || ^2.0", "php": ">=5.3", - "squizlabs/php_codesniffer": "^2.0 || ^3.0 || ^4.0" + "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0" }, "require-dev": { "composer/composer": "*", - "phpcompatibility/php-compatibility": "^9.0", - "sensiolabs/security-checker": "^4.1.0" + "php-parallel-lint/php-parallel-lint": "^1.3.1", + "phpcompatibility/php-compatibility": "^9.0" }, "type": "composer-plugin", "extra": { @@ -1601,6 +1527,10 @@ "email": "franck.nijhof@dealerdirect.com", "homepage": "http://www.frenck.nl", "role": "Developer / IT Manager" + }, + { + "name": "Contributors", + "homepage": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer/graphs/contributors" } ], "description": "PHP_CodeSniffer Standards Composer Installer Plugin", @@ -1612,6 +1542,7 @@ "codesniffer", "composer", "installer", + "phpcbf", "phpcs", "plugin", "qa", @@ -1626,7 +1557,7 @@ "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues", "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer" }, - "time": "2020-12-07T18:04:37+00:00" + "time": "2022-02-04T12:51:07+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -2451,28 +2382,104 @@ "time": "2022-01-18T12:24:56+00:00" }, { - "name": "php-http/curl-client", - "version": "2.2.1", + "name": "php-http/client-common", + "version": "2.5.0", "source": { "type": "git", - "url": "https://github.com/php-http/curl-client.git", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" + "url": "https://github.com/php-http/client-common.git", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", "shasum": "" }, "require": { - "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message": "^1.2", + "php-http/message": "^1.6", + "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" + "psr/http-message": "^1.0", + "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", + "symfony/polyfill-php80": "^1.17" + }, + "require-dev": { + "doctrine/instantiator": "^1.1", + "guzzlehttp/psr7": "^1.4", + "nyholm/psr7": "^1.2", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", + "phpspec/prophecy": "^1.10.2", + "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + }, + "suggest": { + "ext-json": "To detect JSON responses with the ContentTypePlugin", + "ext-libxml": "To detect XML responses with the ContentTypePlugin", + "php-http/cache-plugin": "PSR-6 Cache plugin", + "php-http/logger-plugin": "PSR-3 Logger plugin", + "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Client\\Common\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Common HTTP Client implementations and tools for HTTPlug", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "common", + "http", + "httplug" + ], + "support": { + "issues": "https://github.com/php-http/client-common/issues", + "source": "https://github.com/php-http/client-common/tree/2.5.0" + }, + "time": "2021-11-26T15:01:24+00:00" + }, + { + "name": "php-http/mock-client", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/mock-client.git", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/client-common": "^2.0", + "php-http/discovery": "^1.0", + "php-http/httplug": "^2.0", + "php-http/message-factory": "^1.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "symfony/polyfill-php80": "^1.17" }, "provide": { "php-http/async-client-implementation": "1.0", @@ -2480,20 +2487,17 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "guzzlehttp/psr7": "^1.0", - "laminas/laminas-diactoros": "^2.0", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^7.5 || ^9.4" + "phpspec/phpspec": "^5.1 || ^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "Http\\Client\\Curl\\": "src/" + "Http\\Mock\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2502,22 +2506,23 @@ ], "authors": [ { - "name": "Михаил Красильников", - "email": "m.krasilnikov@yandex.ru" + "name": "David de Boer", + "email": "david@ddeboer.nl" } ], - "description": "PSR-18 and HTTPlug Async client with cURL", - "homepage": "http://php-http.org", + "description": "Mock HTTP client", + "homepage": "http://httplug.io", "keywords": [ - "curl", + "client", "http", - "psr-18" + "mock", + "psr7" ], "support": { - "issues": "https://github.com/php-http/curl-client/issues", - "source": "https://github.com/php-http/curl-client/tree/2.2.1" + "issues": "https://github.com/php-http/mock-client/issues", + "source": "https://github.com/php-http/mock-client/tree/1.5.0" }, - "time": "2021-12-10T18:02:07+00:00" + "time": "2021-08-25T07:01:14+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -3380,17 +3385,17 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "5d1ae7d4b053281a29a24e6e21ede5f9ef245b05" + "reference": "6ba1494c9aaa556dc45e13eaab644a280ad76558" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/5d1ae7d4b053281a29a24e6e21ede5f9ef245b05", - "reference": "5d1ae7d4b053281a29a24e6e21ede5f9ef245b05", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6ba1494c9aaa556dc45e13eaab644a280ad76558", + "reference": "6ba1494c9aaa556dc45e13eaab644a280ad76558", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", - "adodb/adodb-php": "<5.20.12", + "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "akaunting/akaunting": "<2.1.13", "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1", "amazing/media2click": ">=1,<1.3.3", @@ -3410,11 +3415,13 @@ "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", "bolt/bolt": "<3.7.2", "bolt/core": "<4.1.13", + "bottelet/flarepoint": "<2.2.1", "brightlocal/phpwhois": "<=4.2.5", "buddypress/buddypress": "<7.2.1", "bugsnag/bugsnag-laravel": ">=2,<2.0.2", + "bytefury/crater": "<6.0.2", "cachethq/cachet": "<2.5.1", - "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.5.18|>=3.6,<3.6.15|>=3.7,<3.7.7", + "cakephp/cakephp": "<4.0.6", "cardgate/magento2": "<2.0.33", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", "cartalyst/sentry": "<=2.1.6", @@ -3423,14 +3430,14 @@ "cesnet/simplesamlphp-module-proxystatistics": "<3.1", "codeception/codeception": "<3.1.3|>=4,<4.1.22", "codeigniter/framework": "<=3.0.6", - "codeigniter4/framework": "<4.1.6", + "codeigniter4/framework": "<4.1.8", "codiad/codiad": "<=2.8.4", "composer/composer": "<1.10.23|>=2-alpha.1,<2.1.9", - "concrete5/concrete5": "<8.5.5", + "concrete5/concrete5": "<9", "concrete5/core": "<8.5.7", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/core": ">=2,<3.5.39", - "contao/core-bundle": ">=4,<4.4.56|>=4.5,<4.9.18|>=4.10,<4.11.7|= 4.10.0", + "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|= 4.10.0", "contao/listing-bundle": ">=4,<4.4.8", "craftcms/cms": "<3.7.14", "croogo/croogo": "<3.0.7", @@ -3447,7 +3454,7 @@ "doctrine/mongodb-odm": ">=1,<1.0.2", "doctrine/mongodb-odm-bundle": ">=2,<3.0.1", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", - "dolibarr/dolibarr": "<14|>= 3.3.beta1, < 13.0.2", + "dolibarr/dolibarr": "<=14.0.5|>= 3.3.beta1, < 13.0.2", "dompdf/dompdf": ">=0.6,<0.6.2", "drupal/core": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", "drupal/drupal": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", @@ -3455,7 +3462,7 @@ "ecodev/newsletter": "<=4", "elgg/elgg": "<3.3.24|>=4,<4.0.5", "endroid/qr-code-bundle": "<3.4.2", - "enshrined/svg-sanitize": "<0.13.1", + "enshrined/svg-sanitize": "<0.15", "erusev/parsedown": "<1.7.2", "ether/logs": "<3.0.4", "ezsystems/demobundle": ">=5.4,<5.4.6.1", @@ -3469,7 +3476,7 @@ "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8", "ezsystems/ezplatform-richtext": ">=2.3,<=2.3.7", "ezsystems/ezplatform-user": ">=1,<1.0.1", - "ezsystems/ezpublish-kernel": "<=6.13.8.1|>=7,<=7.5.15.1", + "ezsystems/ezpublish-kernel": "<=6.13.8.1|>=7,<7.5.26", "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.3.5.1", "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", "ezsystems/repository-forms": ">=2.3,<2.3.2.1", @@ -3493,11 +3500,12 @@ "froala/wysiwyg-editor": "<3.2.7", "fuel/core": "<1.8.1", "gaoming13/wechat-php-sdk": "<=1.10.2", - "getgrav/grav": "<=1.7.24", + "getgrav/grav": "<1.7.28", "getkirby/cms": "<3.5.8", "getkirby/panel": "<2.5.14", "gilacms/gila": "<=1.11.4", "globalpayments/php-sdk": "<2", + "google/protobuf": "<3.15", "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3", "gree/jose": "<=2.2", "gregwar/rst": "<1.0.3", @@ -3508,7 +3516,7 @@ "hjue/justwriting": "<=1", "hov/jobfair": "<1.0.13|>=2,<2.0.2", "ibexa/post-install": "<=1.0.4", - "icecoder/icecoder": "<=8", + "icecoder/icecoder": "<=8.1", "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10", "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4", "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40", @@ -3522,6 +3530,7 @@ "james-heinrich/getid3": "<1.9.21", "joomla/archive": "<1.1.10", "joomla/session": "<1.3.1", + "jsdecena/laracom": "<2.0.9", "jsmitty12/phpwhois": "<5.1", "kazist/phpwhois": "<=4.2.6", "kevinpapst/kimai2": "<1.16.7", @@ -3529,6 +3538,7 @@ "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", @@ -3538,8 +3548,9 @@ "league/commonmark": "<0.18.3", "league/flysystem": "<1.1.4|>=2,<2.1.1", "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3", - "librenms/librenms": "<=21.11", + "librenms/librenms": "<22.2", "limesurvey/limesurvey": "<3.27.19", + "livehelperchat/livehelperchat": "<=3.91", "livewire/livewire": ">2.2.4,<2.2.6", "lms/routes": "<2.1.1", "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2", @@ -3550,12 +3561,13 @@ "marcwillmann/turn": "<0.3.3", "mautic/core": "<4|= 2.13.1", "mediawiki/core": ">=1.27,<1.27.6|>=1.29,<1.29.3|>=1.30,<1.30.2|>=1.31,<1.31.9|>=1.32,<1.32.6|>=1.32.99,<1.33.3|>=1.33.99,<1.34.3|>=1.34.99,<1.35", - "microweber/microweber": "<1.2.8", + "microweber/microweber": "<1.2.11", "miniorange/miniorange-saml": "<1.4.3", "mittwald/typo3_forum": "<1.2.1", "modx/revolution": "<2.8", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<3.7.9|>=3.8,<3.8.8|>=3.9,<3.9.5|>=3.10-beta,<3.10.2", + "moodle/moodle": "<3.9.11|>=3.10-beta,<3.10.8|>=3.11,<3.11.5", + "mustache/mustache": ">=2,<2.14.1", "namshi/jose": "<2.2", "neoan3-apps/template": "<1.1.1", "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", @@ -3573,7 +3585,7 @@ "october/cms": "= 1.1.1|= 1.0.471|= 1.0.469|>=1.0.319,<1.0.469", "october/october": ">=1.0.319,<1.0.466|>=2.1,<2.1.12", "october/rain": "<1.0.472|>=1.1,<1.1.2", - "october/system": "<1.0.472|>=1.1.1,<1.1.5|>=2.1,<2.1.12", + "october/system": "<1.0.473|>=1.1,<1.1.6|>=2.1,<2.1.12", "onelogin/php-saml": "<2.10.4", "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", "opencart/opencart": "<=3.0.3.2", @@ -3581,7 +3593,7 @@ "openmage/magento-lts": "<19.4.15|>=20,<20.0.13", "orchid/platform": ">=9,<9.4.4", "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", - "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.21|>=4.1,<4.1.14|>=4.2,<4.2.8", + "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<4.2.8", "padraic/humbug_get_contents": "<1.1.2", "pagarme/pagarme-php": ">=0,<3", "pagekit/pagekit": "<=1.0.18", @@ -3595,7 +3607,7 @@ "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7", "phpmailer/phpmailer": "<6.5", "phpmussel/phpmussel": ">=1,<1.6", - "phpmyadmin/phpmyadmin": "<4.9.6|>=5,<5.0.3", + "phpmyadmin/phpmyadmin": "<4.9.8|>=5,<5.0.3|>=5.1,<5.1.2", "phpoffice/phpexcel": "<1.8.2", "phpoffice/phpspreadsheet": "<1.16", "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.7", @@ -3603,13 +3615,13 @@ "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", "phpwhois/phpwhois": "<=4.2.5", "phpxmlrpc/extras": "<0.6.1", - "pimcore/pimcore": "<10.2.7", - "pocketmine/pocketmine-mp": "<4.0.5", + "pimcore/pimcore": "<10.3.1", + "pocketmine/pocketmine-mp": "<4.0.7", "pressbooks/pressbooks": "<5.18", "prestashop/autoupgrade": ">=4,<4.10.1", "prestashop/contactform": ">1.0.1,<4.3", "prestashop/gamification": "<2.3.2", - "prestashop/prestashop": ">=1.7.5,<=1.7.8.1", + "prestashop/prestashop": ">=1.7,<=1.7.8.2", "prestashop/productcomments": ">=4,<4.2.1", "prestashop/ps_emailsubscription": "<2.6.1", "prestashop/ps_facetedsearch": "<3.4.1", @@ -3617,11 +3629,12 @@ "privatebin/privatebin": "<1.2.2|>=1.3,<1.3.2", "propel/propel": ">=2-alpha.1,<=2-alpha.7", "propel/propel1": ">=1,<=1.7.1", - "pterodactyl/panel": "<1.6.6", + "pterodactyl/panel": "<1.7", + "ptrofimov/beanstalk_console": "<1.7.14", "pusher/pusher-php-server": "<2.2.1", "pwweb/laravel-core": "<=0.3.6-beta", "rainlab/debugbar-plugin": "<3.1", - "remdex/livehelperchat": "<3.91", + "remdex/livehelperchat": "<3.93", "rmccue/requests": ">=1.6,<1.8", "robrichards/xmlseclibs": "<3.0.4", "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1", @@ -3633,13 +3646,13 @@ "shopware/platform": "<=6.4.6", "shopware/production": "<=6.3.5.2", "shopware/shopware": "<5.7.7", - "showdoc/showdoc": "<2.10", + "showdoc/showdoc": "<=2.10.2", "silverstripe/admin": ">=1,<1.8.1", "silverstripe/assets": ">=1,<1.4.7|>=1.5,<1.5.2", "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4", "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", - "silverstripe/framework": "<4.7.4", + "silverstripe/framework": "<4.10.1", "silverstripe/graphql": "<3.5.2|>=4-alpha.1,<4-alpha.2", "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4", @@ -3652,13 +3665,14 @@ "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "simplito/elliptic-php": "<1.0.6", "slim/slim": "<2.6", - "smarty/smarty": "<3.1.39", - "snipe/snipe-it": "<5.3.5", + "smarty/smarty": "<3.1.43|>=4,<4.0.3", + "snipe/snipe-it": "<5.3.10", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", + "spipu/html2pdf": "<5.2.4", "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", - "ssddanbrown/bookstack": "<21.11.3", + "ssddanbrown/bookstack": "<21.12.1", "stormpath/sdk": ">=0,<9.9.99", "studio-42/elfinder": "<2.1.59", "subrion/cms": "<=4.2.1", @@ -3678,7 +3692,7 @@ "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4", "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", - "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3|= 6.0.3|= 5.4.3|= 5.3.14", "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", "symfony/http-kernel": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.4.13|>=5,<5.1.5|>=5.2,<5.3.12", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", @@ -3696,7 +3710,7 @@ "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8|>=5.3,<5.3.2", "symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12", - "symfony/symfony": ">=2,<3.4.49|>=4,<4.4.35|>=5,<5.3.12", + "symfony/symfony": ">=2,<3.4.49|>=4,<4.4.35|>=5,<5.3.12|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3", "symfony/translation": ">=2,<2.0.17", "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", @@ -3705,6 +3719,7 @@ "t3/dce": ">=2.2,<2.6.2", "t3g/svg-sanitizer": "<1.0.3", "tecnickcom/tcpdf": "<6.2.22", + "terminal42/contao-tablelookupwizard": "<3.3.5", "thelia/backoffice-default-template": ">=2.1,<2.1.2", "thelia/thelia": ">=2.1-beta.1,<2.1.3", "theonedemon/phpwhois": "<=4.2.5", @@ -3715,7 +3730,7 @@ "topthink/thinkphp": "<=3.2.3", "tribalsystems/zenario": "<8.8.53370", "truckersmp/phpwhois": "<=4.3.1", - "twig/twig": "<1.38|>=2,<2.7", + "twig/twig": "<1.38|>=2,<2.14.11|>=3,<3.3.8", "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.5", "typo3/cms-backend": ">=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", "typo3/cms-core": ">=6.2,<=6.2.56|>=7,<=7.6.52|>=8,<=8.7.41|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.5", @@ -3813,7 +3828,7 @@ "type": "tidelift" } ], - "time": "2022-01-07T00:58:09+00:00" + "time": "2022-02-17T14:18:41+00:00" }, { "name": "sebastian/cli-parser", @@ -5452,12 +5467,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5795,16 +5810,16 @@ }, { "name": "vimeo/psalm", - "version": "4.20.0", + "version": "4.21.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "f82a70e7edfc6cf2705e9374c8a0b6a974a779ed" + "reference": "d8bec4c7aaee111a532daec32fb09de5687053d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/f82a70e7edfc6cf2705e9374c8a0b6a974a779ed", - "reference": "f82a70e7edfc6cf2705e9374c8a0b6a974a779ed", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/d8bec4c7aaee111a532daec32fb09de5687053d1", + "reference": "d8bec4c7aaee111a532daec32fb09de5687053d1", "shasum": "" }, "require": { @@ -5895,9 +5910,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.20.0" + "source": "https://github.com/vimeo/psalm/tree/4.21.0" }, - "time": "2022-02-03T17:03:47+00:00" + "time": "2022-02-18T04:34:15+00:00" }, { "name": "webmozart/assert", From bdd16158ab36db6871c6ceea5fa3dca172d974ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Jul 2022 21:56:26 +0000 Subject: [PATCH 23/38] Bump laminas/laminas-diactoros from 2.11.0 to 2.11.2 Bumps [laminas/laminas-diactoros](https://github.com/laminas/laminas-diactoros) from 2.11.0 to 2.11.2. - [Release notes](https://github.com/laminas/laminas-diactoros/releases) - [Commits](https://github.com/laminas/laminas-diactoros/compare/2.11.0...2.11.2) --- updated-dependencies: - dependency-name: laminas/laminas-diactoros dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 3b2d117..dba22d7 100644 --- a/composer.lock +++ b/composer.lock @@ -1898,16 +1898,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.11.0", + "version": "2.11.2", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "d1bc565b23c2040fafde398a8a5db083c47928c0" + "reference": "78846cbce0550ec174508a646f46fd6dee76099b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/d1bc565b23c2040fafde398a8a5db083c47928c0", - "reference": "d1bc565b23c2040fafde398a8a5db083c47928c0", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/78846cbce0550ec174508a646f46fd6dee76099b", + "reference": "78846cbce0550ec174508a646f46fd6dee76099b", "shasum": "" }, "require": { @@ -1993,7 +1993,7 @@ "type": "community_bridge" } ], - "time": "2022-05-17T10:57:52+00:00" + "time": "2022-06-29T14:15:02+00:00" }, { "name": "maglnet/composer-require-checker", From e9ab01c8f6349893cd72725f435a4587b3974656 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Jul 2022 21:57:31 +0000 Subject: [PATCH 24/38] Bump vimeo/psalm from 4.23.0 to 4.24.0 Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 4.23.0 to 4.24.0. - [Release notes](https://github.com/vimeo/psalm/releases) - [Commits](https://github.com/vimeo/psalm/compare/4.23.0...4.24.0) --- updated-dependencies: - dependency-name: vimeo/psalm dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/composer.lock b/composer.lock index 638df1c..bbbc4c8 100644 --- a/composer.lock +++ b/composer.lock @@ -802,7 +802,7 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -849,7 +849,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" }, "funding": [ { @@ -5013,7 +5013,7 @@ }, { "name": "symfony/cache-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", @@ -5072,7 +5072,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/cache-contracts/tree/v2.5.2" }, "funding": [ { @@ -5092,16 +5092,16 @@ }, { "name": "symfony/console", - "version": "v5.4.9", + "version": "v5.4.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb" + "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/829d5d1bf60b2efeb0887b7436873becc71a45eb", - "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb", + "url": "https://api.github.com/repos/symfony/console/zipball/4d671ab4ddac94ee439ea73649c69d9d200b5000", + "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000", "shasum": "" }, "require": { @@ -5171,7 +5171,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.9" + "source": "https://github.com/symfony/console/tree/v5.4.10" }, "funding": [ { @@ -5187,7 +5187,7 @@ "type": "tidelift" } ], - "time": "2022-05-18T06:17:34+00:00" + "time": "2022-06-26T13:00:04+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5521,16 +5521,16 @@ }, { "name": "symfony/service-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", "shasum": "" }, "require": { @@ -5584,7 +5584,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" }, "funding": [ { @@ -5600,20 +5600,20 @@ "type": "tidelift" } ], - "time": "2022-03-13T20:07:29+00:00" + "time": "2022-05-30T19:17:29+00:00" }, { "name": "symfony/string", - "version": "v5.4.9", + "version": "v5.4.10", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99" + "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", - "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", + "url": "https://api.github.com/repos/symfony/string/zipball/4432bc7df82a554b3e413a8570ce2fea90e94097", + "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097", "shasum": "" }, "require": { @@ -5670,7 +5670,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.9" + "source": "https://github.com/symfony/string/tree/v5.4.10" }, "funding": [ { @@ -5686,7 +5686,7 @@ "type": "tidelift" } ], - "time": "2022-04-19T10:40:37+00:00" + "time": "2022-06-26T15:57:47+00:00" }, { "name": "symfony/var-exporter", @@ -5813,16 +5813,16 @@ }, { "name": "vimeo/psalm", - "version": "4.23.0", + "version": "4.24.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "f1fe6ff483bf325c803df9f510d09a03fd796f88" + "reference": "06dd975cb55d36af80f242561738f16c5f58264f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/f1fe6ff483bf325c803df9f510d09a03fd796f88", - "reference": "f1fe6ff483bf325c803df9f510d09a03fd796f88", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/06dd975cb55d36af80f242561738f16c5f58264f", + "reference": "06dd975cb55d36af80f242561738f16c5f58264f", "shasum": "" }, "require": { @@ -5914,9 +5914,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.23.0" + "source": "https://github.com/vimeo/psalm/tree/4.24.0" }, - "time": "2022-04-28T17:35:49+00:00" + "time": "2022-06-26T11:47:54+00:00" }, { "name": "webmozart/assert", From eb88fc1133533ce5d877cfaa483191c5aca3d494 Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 11 Jul 2022 21:31:00 +0100 Subject: [PATCH 25/38] Updates locked dependencies --- composer.lock | 630 +++++++++++++++++++++++++++----------------------- 1 file changed, 342 insertions(+), 288 deletions(-) diff --git a/composer.lock b/composer.lock index 6f7cedb..8ca9211 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c46173cc4ea676dce1183f7e235b2e7f", + "content-hash": "9e8521e5954473d232ee5cd5b91fb9e3", "packages": [ { "name": "clue/stream-filter", @@ -74,33 +74,33 @@ }, { "name": "laminas/laminas-escaper", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-escaper.git", - "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f" + "reference": "58af67282db37d24e584a837a94ee55b9c7552be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/891ad70986729e20ed2e86355fcf93c9dc238a5f", - "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f", + "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/58af67282db37d24e584a837a94ee55b9c7552be", + "reference": "58af67282db37d24e584a837a94ee55b9c7552be", "shasum": "" }, "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0" + "ext-ctype": "*", + "ext-mbstring": "*", + "php": "^7.4 || ~8.0.0 || ~8.1.0" }, "conflict": { "zendframework/zend-escaper": "*" }, "require-dev": { + "infection/infection": "^0.26.6", "laminas/laminas-coding-standard": "~2.3.0", - "phpunit/phpunit": "^9.3", - "psalm/plugin-phpunit": "^0.12.2", - "vimeo/psalm": "^3.16" - }, - "suggest": { - "ext-iconv": "*", - "ext-mbstring": "*" + "maglnet/composer-require-checker": "^3.8.0", + "phpunit/phpunit": "^9.5.18", + "psalm/plugin-phpunit": "^0.16.1", + "vimeo/psalm": "^4.22.0" }, "type": "library", "autoload": { @@ -132,57 +132,52 @@ "type": "community_bridge" } ], - "time": "2021-09-02T17:10:53+00:00" + "time": "2022-03-08T20:15:36+00:00" }, { - "name": "php-http/client-common", - "version": "2.5.0", + "name": "php-http/curl-client", + "version": "2.2.1", "source": { "type": "git", - "url": "https://github.com/php-http/client-common.git", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" + "url": "https://github.com/php-http/curl-client.git", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", + "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", "shasum": "" }, "require": { + "ext-curl": "*", "php": "^7.1 || ^8.0", + "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message": "^1.6", - "php-http/message-factory": "^1.0", + "php-http/message": "^1.2", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", - "symfony/polyfill-php80": "^1.17" + "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, - "require-dev": { - "doctrine/instantiator": "^1.1", - "guzzlehttp/psr7": "^1.4", - "nyholm/psr7": "^1.2", - "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", - "phpspec/prophecy": "^1.10.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" }, - "suggest": { - "ext-json": "To detect JSON responses with the ContentTypePlugin", - "ext-libxml": "To detect XML responses with the ContentTypePlugin", - "php-http/cache-plugin": "PSR-6 Cache plugin", - "php-http/logger-plugin": "PSR-3 Logger plugin", - "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" + "require-dev": { + "guzzlehttp/psr7": "^1.0", + "laminas/laminas-diactoros": "^2.0", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^7.5 || ^9.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "Http\\Client\\Common\\": "src/" + "Http\\Client\\Curl\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -191,36 +186,35 @@ ], "authors": [ { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" + "name": "Михаил Красильников", + "email": "m.krasilnikov@yandex.ru" } ], - "description": "Common HTTP Client implementations and tools for HTTPlug", - "homepage": "http://httplug.io", + "description": "PSR-18 and HTTPlug Async client with cURL", + "homepage": "http://php-http.org", "keywords": [ - "client", - "common", + "curl", "http", - "httplug" + "psr-18" ], "support": { - "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.5.0" + "issues": "https://github.com/php-http/curl-client/issues", + "source": "https://github.com/php-http/curl-client/tree/2.2.1" }, - "time": "2021-11-26T15:01:24+00:00" + "time": "2021-12-10T18:02:07+00:00" }, { "name": "php-http/discovery", - "version": "1.14.2", + "version": "1.14.3", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "c8d48852fbc052454af42f6de27635ddd916b959" + "reference": "31d8ee46d0215108df16a8527c7438e96a4d7735" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/c8d48852fbc052454af42f6de27635ddd916b959", - "reference": "c8d48852fbc052454af42f6de27635ddd916b959", + "url": "https://api.github.com/repos/php-http/discovery/zipball/31d8ee46d0215108df16a8527c7438e96a4d7735", + "reference": "31d8ee46d0215108df16a8527c7438e96a4d7735", "shasum": "" }, "require": { @@ -272,9 +266,9 @@ ], "support": { "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.14.2" + "source": "https://github.com/php-http/discovery/tree/1.14.3" }, - "time": "2022-05-25T07:26:05+00:00" + "time": "2022-07-11T14:04:40+00:00" }, { "name": "php-http/httplug", @@ -466,74 +460,6 @@ }, "time": "2015-12-19T14:08:53+00:00" }, - { - "name": "php-http/mock-client", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/mock-client.git", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0", - "php-http/client-common": "^2.0", - "php-http/discovery": "^1.0", - "php-http/httplug": "^2.0", - "php-http/message-factory": "^1.0", - "psr/http-client": "^1.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/polyfill-php80": "^1.17" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0", - "psr/http-client-implementation": "1.0" - }, - "require-dev": { - "phpspec/phpspec": "^5.1 || ^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Mock\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "David de Boer", - "email": "david@ddeboer.nl" - } - ], - "description": "Mock HTTP client", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "http", - "mock", - "psr7" - ], - "support": { - "issues": "https://github.com/php-http/mock-client/issues", - "source": "https://github.com/php-http/mock-client/tree/1.5.0" - }, - "time": "2021-08-25T07:01:14+00:00" - }, { "name": "php-http/promise", "version": "1.1.0", @@ -1341,20 +1267,20 @@ }, { "name": "composer/pcre", - "version": "2.0.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "c8e9d27cfc5ed22643c19c160455b473ffd8aabe" + "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/c8e9d27cfc5ed22643c19c160455b473ffd8aabe", - "reference": "c8e9d27cfc5ed22643c19c160455b473ffd8aabe", + "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd", + "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^1.3", @@ -1364,7 +1290,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -1392,7 +1318,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/2.0.0" + "source": "https://github.com/composer/pcre/tree/3.0.0" }, "funding": [ { @@ -1408,7 +1334,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T20:05:29+00:00" + "time": "2022-02-25T20:21:48+00:00" }, { "name": "composer/semver", @@ -1897,16 +1823,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.11.2", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "78846cbce0550ec174508a646f46fd6dee76099b" + "reference": "34ba65010be9aa74e159d168c5ecfa5c01e4d956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/78846cbce0550ec174508a646f46fd6dee76099b", - "reference": "78846cbce0550ec174508a646f46fd6dee76099b", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/34ba65010be9aa74e159d168c5ecfa5c01e4d956", + "reference": "34ba65010be9aa74e159d168c5ecfa5c01e4d956", "shasum": "" }, "require": { @@ -1927,13 +1853,13 @@ "ext-dom": "*", "ext-gd": "*", "ext-libxml": "*", - "http-interop/http-factory-tests": "^0.8.0", - "laminas/laminas-coding-standard": "~1.0.0", - "php-http/psr7-integration-tests": "^1.1", + "http-interop/http-factory-tests": "^0.9.0", + "laminas/laminas-coding-standard": "~2.3.0", + "php-http/psr7-integration-tests": "^1.1.1", "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.1", - "psalm/plugin-phpunit": "^0.14.0", - "vimeo/psalm": "^4.3" + "phpunit/phpunit": "^9.5", + "psalm/plugin-phpunit": "^0.17.0", + "vimeo/psalm": "^4.24.0" }, "type": "library", "extra": { @@ -1992,36 +1918,40 @@ "type": "community_bridge" } ], - "time": "2022-06-29T14:15:02+00:00" + "time": "2022-07-07T12:31:03+00:00" }, { "name": "maglnet/composer-require-checker", - "version": "2.1.0", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/maglnet/ComposerRequireChecker.git", - "reference": "0c66698d487fcb5c66cf07108e2180c818fb2e72" + "reference": "537138b833ab0f9ad72b667a72bece2a765e88ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maglnet/ComposerRequireChecker/zipball/0c66698d487fcb5c66cf07108e2180c818fb2e72", - "reference": "0c66698d487fcb5c66cf07108e2180c818fb2e72", + "url": "https://api.github.com/repos/maglnet/ComposerRequireChecker/zipball/537138b833ab0f9ad72b667a72bece2a765e88ab", + "reference": "537138b833ab0f9ad72b667a72bece2a765e88ab", "shasum": "" }, "require": { + "composer-runtime-api": "^2.0.0", "ext-json": "*", "ext-phar": "*", - "nikic/php-parser": "^4.3", - "ocramius/package-versions": "^1.4.2", - "php": "^7.2", - "symfony/console": "^5.0", - "webmozart/glob": "^4.1" + "nikic/php-parser": "^4.13.0", + "php": "^7.4 || ^8.0", + "symfony/console": "^5.4.0", + "webmozart/assert": "^1.9.1", + "webmozart/glob": "^4.4.0" }, "require-dev": { + "doctrine/coding-standard": "^9.0.0", "ext-zend-opcache": "*", - "mikey179/vfsstream": "^1.6", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^8.4.3" + "mikey179/vfsstream": "^1.6.10", + "phing/phing": "^2.17.0", + "phpstan/phpstan": "^1.2.0", + "phpunit/phpunit": "^9.5.10", + "vimeo/psalm": "^4.14.0" }, "bin": [ "bin/composer-require-checker" @@ -2066,9 +1996,9 @@ ], "support": { "issues": "https://github.com/maglnet/ComposerRequireChecker/issues", - "source": "https://github.com/maglnet/ComposerRequireChecker/tree/2.1.0" + "source": "https://github.com/maglnet/ComposerRequireChecker/tree/3.8.0" }, - "time": "2019-12-28T13:49:20+00:00" + "time": "2021-12-07T14:25:47+00:00" }, { "name": "myclabs/deep-copy", @@ -2460,28 +2390,104 @@ "time": "2022-01-18T12:24:56+00:00" }, { - "name": "php-http/curl-client", - "version": "2.2.1", + "name": "php-http/client-common", + "version": "2.5.0", "source": { "type": "git", - "url": "https://github.com/php-http/curl-client.git", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" + "url": "https://github.com/php-http/client-common.git", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", "shasum": "" }, "require": { - "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message": "^1.2", + "php-http/message": "^1.6", + "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" + "psr/http-message": "^1.0", + "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", + "symfony/polyfill-php80": "^1.17" + }, + "require-dev": { + "doctrine/instantiator": "^1.1", + "guzzlehttp/psr7": "^1.4", + "nyholm/psr7": "^1.2", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", + "phpspec/prophecy": "^1.10.2", + "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + }, + "suggest": { + "ext-json": "To detect JSON responses with the ContentTypePlugin", + "ext-libxml": "To detect XML responses with the ContentTypePlugin", + "php-http/cache-plugin": "PSR-6 Cache plugin", + "php-http/logger-plugin": "PSR-3 Logger plugin", + "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Client\\Common\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Common HTTP Client implementations and tools for HTTPlug", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "common", + "http", + "httplug" + ], + "support": { + "issues": "https://github.com/php-http/client-common/issues", + "source": "https://github.com/php-http/client-common/tree/2.5.0" + }, + "time": "2021-11-26T15:01:24+00:00" + }, + { + "name": "php-http/mock-client", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/mock-client.git", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/client-common": "^2.0", + "php-http/discovery": "^1.0", + "php-http/httplug": "^2.0", + "php-http/message-factory": "^1.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "symfony/polyfill-php80": "^1.17" }, "provide": { "php-http/async-client-implementation": "1.0", @@ -2489,20 +2495,17 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "guzzlehttp/psr7": "^1.0", - "laminas/laminas-diactoros": "^2.0", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^7.5 || ^9.4" + "phpspec/phpspec": "^5.1 || ^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "Http\\Client\\Curl\\": "src/" + "Http\\Mock\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2511,22 +2514,23 @@ ], "authors": [ { - "name": "Михаил Красильников", - "email": "m.krasilnikov@yandex.ru" + "name": "David de Boer", + "email": "david@ddeboer.nl" } ], - "description": "PSR-18 and HTTPlug Async client with cURL", - "homepage": "http://php-http.org", + "description": "Mock HTTP client", + "homepage": "http://httplug.io", "keywords": [ - "curl", + "client", "http", - "psr-18" + "mock", + "psr7" ], "support": { - "issues": "https://github.com/php-http/curl-client/issues", - "source": "https://github.com/php-http/curl-client/tree/2.2.1" + "issues": "https://github.com/php-http/mock-client/issues", + "source": "https://github.com/php-http/mock-client/tree/1.5.0" }, - "time": "2021-12-10T18:02:07+00:00" + "time": "2021-08-25T07:01:14+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2757,35 +2761,31 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.2.0", + "version": "1.6.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e" + "reference": "135607f9ccc297d6923d49c2bcf309f509413215" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/dbc093d7af60eff5cd575d2ed761b15ed40bd08e", - "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/135607f9ccc297d6923d49c2bcf309f509413215", + "reference": "135607f9ccc297d6923d49c2bcf309f509413215", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.0", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^9.5", "symfony/process": "^5.2" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "autoload": { "psr-4": { "PHPStan\\PhpDocParser\\": [ @@ -2800,9 +2800,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.2.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.6.4" }, - "time": "2021-09-16T20:46:02+00:00" + "time": "2022-06-26T13:09:08+00:00" }, { "name": "phpunit/php-code-coverage", @@ -3286,20 +3286,20 @@ }, { "name": "psr/container", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=7.4.0" }, "type": "library", "autoload": { @@ -3328,9 +3328,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { "name": "psr/log", @@ -3388,43 +3388,52 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "6ba1494c9aaa556dc45e13eaab644a280ad76558" + "reference": "bc4d989050885c9c2138e0da74519efaad597076" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6ba1494c9aaa556dc45e13eaab644a280ad76558", - "reference": "6ba1494c9aaa556dc45e13eaab644a280ad76558", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/bc4d989050885c9c2138e0da74519efaad597076", + "reference": "bc4d989050885c9c2138e0da74519efaad597076", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", + "admidio/admidio": "<4.1.9", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "akaunting/akaunting": "<2.1.13", + "alextselegidis/easyappointments": "<=1.4.3", "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1", "amazing/media2click": ">=1,<1.3.3", "amphp/artax": "<1.0.6|>=2,<2.0.6", "amphp/http": "<1.0.1", "amphp/http-client": ">=4,<4.4", "anchorcms/anchor-cms": "<=0.12.7", + "andreapollastri/cipi": "<=3.1.15", "api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6", + "appwrite/server-ce": "<0.11.1|>=0.12,<0.12.2", "area17/twill": "<1.2.5|>=2,<2.5.3", "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99", "aws/aws-sdk-php": ">=3,<3.2.1", "bagisto/bagisto": "<0.1.5", "barrelstrength/sprout-base-email": "<1.2.7", "barrelstrength/sprout-forms": "<3.9", + "barryvdh/laravel-translation-manager": "<0.6.2", "baserproject/basercms": "<4.5.4", "billz/raspap-webgui": "<=2.6.6", "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", + "bmarshall511/wordpress_zero_spam": "<5.2.13", "bolt/bolt": "<3.7.2", - "bolt/core": "<4.1.13", + "bolt/core": "<=4.2", "bottelet/flarepoint": "<2.2.1", "brightlocal/phpwhois": "<=4.2.5", + "brotkrueml/codehighlight": "<2.7", + "brotkrueml/schema": "<1.13.1|>=2,<2.5.1", + "brotkrueml/typo3-matomo-integration": "<1.3.2", "buddypress/buddypress": "<7.2.1", "bugsnag/bugsnag-laravel": ">=2,<2.0.2", "bytefury/crater": "<6.0.2", "cachethq/cachet": "<2.5.1", - "cakephp/cakephp": "<4.0.6", + "cakephp/cakephp": "<3.10.3|>=4,<4.0.6", "cardgate/magento2": "<2.0.33", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", "cartalyst/sentry": "<=2.1.6", @@ -3433,17 +3442,22 @@ "cesnet/simplesamlphp-module-proxystatistics": "<3.1", "codeception/codeception": "<3.1.3|>=4,<4.1.22", "codeigniter/framework": "<=3.0.6", - "codeigniter4/framework": "<4.1.8", + "codeigniter4/framework": "<4.1.9", "codiad/codiad": "<=2.8.4", - "composer/composer": "<1.10.23|>=2-alpha.1,<2.1.9", + "composer/composer": "<1.10.26|>=2-alpha.1,<2.2.12|>=2.3,<2.3.5", "concrete5/concrete5": "<9", - "concrete5/core": "<8.5.7", + "concrete5/core": "<8.5.8|>=9,<9.1", "contao-components/mediaelement": ">=2.14.2,<2.21.1", + "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3", "contao/core": ">=2,<3.5.39", - "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|= 4.10.0", + "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3|= 4.10.0", "contao/listing-bundle": ">=4,<4.4.8", - "craftcms/cms": "<3.7.14", + "contao/managed-edition": "<=1.5", + "craftcms/cms": "<3.7.36", "croogo/croogo": "<3.0.7", + "cuyz/valinor": ">=0.5,<0.7", + "czproject/git-php": "<4.0.3", + "darylldoyle/safe-svg": "<1.9.10", "datadog/dd-trace": ">=0.30,<0.30.2", "david-garcia/phpwhois": "<=4.3.1", "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1", @@ -3457,12 +3471,14 @@ "doctrine/mongodb-odm": ">=1,<1.0.2", "doctrine/mongodb-odm-bundle": ">=2,<3.0.1", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", - "dolibarr/dolibarr": "<=14.0.5|>= 3.3.beta1, < 13.0.2", - "dompdf/dompdf": ">=0.6,<0.6.2", - "drupal/core": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", + "dolibarr/dolibarr": "<16|= 12.0.5|>= 3.3.beta1, < 13.0.2", + "dompdf/dompdf": "<2", + "drupal/core": ">=7,<7.88|>=8,<9.2.13|>=9.3,<9.3.6", "drupal/drupal": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", "dweeves/magmi": "<=0.7.24", "ecodev/newsletter": "<=4", + "ectouch/ectouch": "<=2.7.2", + "elefant/cms": "<1.3.13", "elgg/elgg": "<3.3.24|>=4,<4.0.5", "endroid/qr-code-bundle": "<3.4.2", "enshrined/svg-sanitize": "<0.15", @@ -3473,37 +3489,43 @@ "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1", "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1|>=5.4,<5.4.11.1|>=2017.12,<2017.12.0.1", "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24", - "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<=1.5.25", + "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.27", "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1", - "ezsystems/ezplatform-kernel": "<=1.2.5|>=1.3,<=1.3.1", + "ezsystems/ezplatform-kernel": "<=1.2.5|>=1.3,<1.3.19", "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8", "ezsystems/ezplatform-richtext": ">=2.3,<=2.3.7", "ezsystems/ezplatform-user": ">=1,<1.0.1", - "ezsystems/ezpublish-kernel": "<=6.13.8.1|>=7,<7.5.26", + "ezsystems/ezpublish-kernel": "<=6.13.8.1|>=7,<7.5.29", "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.3.5.1", "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", "ezsystems/repository-forms": ">=2.3,<2.3.2.1", "ezyang/htmlpurifier": "<4.1.1", "facade/ignition": "<1.16.15|>=2,<2.4.2|>=2.5,<2.5.2", + "facturascripts/facturascripts": "<=2022.8", "feehi/cms": "<=2.1.1", "feehi/feehicms": "<=0.1.3", + "fenom/fenom": "<=2.12.1", + "filegator/filegator": "<7.8", "firebase/php-jwt": "<2", "flarum/core": ">=1,<=1.0.1", "flarum/sticky": ">=0.1-beta.14,<=0.1-beta.15", "flarum/tags": "<=0.1-beta.13", "fluidtypo3/vhs": "<5.1.1", + "fof/upload": "<1.2.3", "fooman/tcpdf": "<6.2.22", - "forkcms/forkcms": "<=5.9.2", + "forkcms/forkcms": "<5.11.1", "fossar/tcpdf-parser": "<6.2.22", - "francoisjacquet/rosariosis": "<8.1.1", + "francoisjacquet/rosariosis": "<9.1", "friendsofsymfony/oauth2-php": "<1.3", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", "friendsoftypo3/mediace": ">=7.6.2,<7.6.5", "froala/wysiwyg-editor": "<3.2.7", + "froxlor/froxlor": "<=0.10.22", "fuel/core": "<1.8.1", "gaoming13/wechat-php-sdk": "<=1.10.2", - "getgrav/grav": "<1.7.28", + "genix/cms": "<=1.1.11", + "getgrav/grav": "<1.7.34", "getkirby/cms": "<3.5.8", "getkirby/panel": "<2.5.14", "gilacms/gila": "<=1.11.4", @@ -3513,11 +3535,14 @@ "gree/jose": "<=2.2", "gregwar/rst": "<1.0.3", "grumpydictator/firefly-iii": "<5.6.5", - "guzzlehttp/guzzle": ">=4-rc.2,<4.2.4|>=5,<5.3.1|>=6,<6.2.1", - "helloxz/imgurl": "<=2.31", + "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5", + "guzzlehttp/psr7": "<1.8.4|>=2,<2.1.1", + "helloxz/imgurl": "= 2.31|<=2.31", "hillelcoren/invoice-ninja": "<5.3.35", "hjue/justwriting": "<=1", "hov/jobfair": "<1.0.13|>=2,<2.0.2", + "hyn/multi-tenant": ">=5.6,<5.7.2", + "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4", "ibexa/post-install": "<=1.0.4", "icecoder/icecoder": "<=8.1", "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10", @@ -3525,13 +3550,16 @@ "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40", "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75", - "impresscms/impresscms": "<=1.4.2", + "impresscms/impresscms": "<=1.4.3", "in2code/femanager": "<5.5.1|>=6,<6.3.1", "intelliants/subrion": "<=4.2.1", "ivankristianto/phpwhois": "<=4.3", "jackalope/jackalope-doctrine-dbal": "<1.7.4", "james-heinrich/getid3": "<1.9.21", - "joomla/archive": "<1.1.10", + "joomla/archive": "<1.1.12|>=2,<2.0.1", + "joomla/filesystem": "<1.6.2|>=2,<2.0.1", + "joomla/filter": "<1.4.4|>=2,<2.0.1", + "joomla/input": ">=2,<2.0.2", "joomla/session": "<1.3.1", "jsdecena/laracom": "<2.0.9", "jsmitty12/phpwhois": "<5.1", @@ -3539,11 +3567,14 @@ "kevinpapst/kimai2": "<1.16.7", "kitodo/presentation": "<3.1.2", "klaviyo/magento2-extension": ">=1,<3", + "krayin/laravel-crm": "<1.2.2", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", "laminas/laminas-http": "<2.14.2", + "laravel/fortify": "<1.11.1", "laravel/framework": "<6.20.42|>=7,<7.30.6|>=8,<8.75", + "laravel/laravel": "<=9.1.8", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "latte/latte": "<2.10.8", "lavalite/cms": "<=5.8", @@ -3551,46 +3582,52 @@ "league/commonmark": "<0.18.3", "league/flysystem": "<1.1.4|>=2,<2.1.1", "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3", - "librenms/librenms": "<22.2", + "librenms/librenms": "<22.4", "limesurvey/limesurvey": "<3.27.19", "livehelperchat/livehelperchat": "<=3.91", "livewire/livewire": ">2.2.4,<2.2.6", "lms/routes": "<2.1.1", "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2", + "luyadev/yii-helpers": "<1.2.1", "magento/community-edition": ">=2,<2.2.10|>=2.3,<2.3.3", "magento/magento1ce": "<1.9.4.3", "magento/magento1ee": ">=1,<1.14.4.3", "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2-p.2", "marcwillmann/turn": "<0.3.3", - "mautic/core": "<4|= 2.13.1", + "matyhtf/framework": "<3.0.6", + "mautic/core": "<4.3|= 2.13.1", "mediawiki/core": ">=1.27,<1.27.6|>=1.29,<1.29.3|>=1.30,<1.30.2|>=1.31,<1.31.9|>=1.32,<1.32.6|>=1.32.99,<1.33.3|>=1.33.99,<1.34.3|>=1.34.99,<1.35", - "microweber/microweber": "<1.2.11", + "microweber/microweber": "<1.3", "miniorange/miniorange-saml": "<1.4.3", "mittwald/typo3_forum": "<1.2.1", - "modx/revolution": "<2.8", + "modx/revolution": "<= 2.8.3-pl|<2.8", + "mojo42/jirafeau": "<4.4", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<3.9.11|>=3.10-beta,<3.10.8|>=3.11,<3.11.5", + "moodle/moodle": "<4.0.1", "mustache/mustache": ">=2,<2.14.1", "namshi/jose": "<2.2", "neoan3-apps/template": "<1.1.1", + "neorazorx/facturascripts": "<2022.4", "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", "neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3", - "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3", + "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2", "neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", "netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15", "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6", "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", "nilsteampassnet/teampass": "<=2.1.27.36", - "nukeviet/nukeviet": "<4.3.4", - "nystudio107/craft-seomatic": "<3.3", + "noumo/easyii": "<=0.9", + "nukeviet/nukeviet": "<4.5.2", + "nystudio107/craft-seomatic": "<3.4.12", "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", "october/backend": "<1.1.2", "october/cms": "= 1.1.1|= 1.0.471|= 1.0.469|>=1.0.319,<1.0.469", "october/october": ">=1.0.319,<1.0.466|>=2.1,<2.1.12", "october/rain": "<1.0.472|>=1.1,<1.1.2", - "october/system": "<1.0.473|>=1.1,<1.1.6|>=2.1,<2.1.12", + "october/system": "<1.0.475|>=1.1,<1.1.11|>=2,<2.1.27", "onelogin/php-saml": "<2.10.4", "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", + "open-web-analytics/open-web-analytics": "<1.7.4", "opencart/opencart": "<=3.0.3.2", "openid/php-openid": "<2.3", "openmage/magento-lts": "<19.4.15|>=20,<20.0.13", @@ -3604,24 +3641,28 @@ "passbolt/passbolt_api": "<2.11", "paypal/merchant-sdk-php": "<3.12", "pear/archive_tar": "<1.4.14", + "pear/crypt_gpg": "<1.6.7", "pegasus/google-for-jobs": "<1.5.1|>=2,<2.1.1", "personnummer/personnummer": "<3.0.2", "phanan/koel": "<5.1.4", "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7", "phpmailer/phpmailer": "<6.5", "phpmussel/phpmussel": ">=1,<1.6", - "phpmyadmin/phpmyadmin": "<4.9.8|>=5,<5.0.3|>=5.1,<5.1.2", - "phpoffice/phpexcel": "<1.8.2", + "phpmyadmin/phpmyadmin": "<5.1.3", + "phpoffice/phpexcel": "<1.8", "phpoffice/phpspreadsheet": "<1.16", "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.7", "phpservermon/phpservermon": "<=3.5.2", - "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", + "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5,<5.6.3", "phpwhois/phpwhois": "<=4.2.5", "phpxmlrpc/extras": "<0.6.1", - "pimcore/pimcore": "<10.3.1", - "pocketmine/pocketmine-mp": "<4.0.7", + "pimcore/data-hub": "<1.2.4", + "pimcore/pimcore": "<10.4.4", + "pocketmine/bedrock-protocol": "<8.0.2", + "pocketmine/pocketmine-mp": ">= 4.0.0-BETA5, < 4.4.2|<4.2.10", "pressbooks/pressbooks": "<5.18", "prestashop/autoupgrade": ">=4,<4.10.1", + "prestashop/blockwishlist": ">=2,<2.1.1", "prestashop/contactform": ">1.0.1,<4.3", "prestashop/gamification": "<2.3.2", "prestashop/prestashop": ">=1.7,<=1.7.8.2", @@ -3629,7 +3670,7 @@ "prestashop/ps_emailsubscription": "<2.6.1", "prestashop/ps_facetedsearch": "<3.4.1", "prestashop/ps_linklist": "<3.1", - "privatebin/privatebin": "<1.2.2|>=1.3,<1.3.2", + "privatebin/privatebin": "<1.4", "propel/propel": ">=2-alpha.1,<=2-alpha.7", "propel/propel1": ">=1,<=1.7.1", "pterodactyl/panel": "<1.7", @@ -3637,28 +3678,35 @@ "pusher/pusher-php-server": "<2.2.1", "pwweb/laravel-core": "<=0.3.6-beta", "rainlab/debugbar-plugin": "<3.1", - "remdex/livehelperchat": "<3.93", + "remdex/livehelperchat": "<3.99", "rmccue/requests": ">=1.6,<1.8", "robrichards/xmlseclibs": "<3.0.4", + "rudloff/alltube": "<3.0.3", + "s-cart/core": "<6.9", + "s-cart/s-cart": "<6.9", "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1", "sabre/dav": ">=1.6,<1.6.99|>=1.7,<1.7.11|>=1.8,<1.8.9", "scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11", "sensiolabs/connect": "<4.2.3", "serluck/phpwhois": "<=4.2.6", - "shopware/core": "<=6.4.6", - "shopware/platform": "<=6.4.6", + "shopware/core": "<=6.4.9", + "shopware/platform": "<=6.4.9", "shopware/production": "<=6.3.5.2", - "shopware/shopware": "<5.7.7", - "showdoc/showdoc": "<=2.10.2", + "shopware/shopware": "<5.7.12", + "shopware/storefront": "<=6.4.8.1", + "shopxo/shopxo": "<2.2.6", + "showdoc/showdoc": "<2.10.4", "silverstripe/admin": ">=1,<1.8.1", - "silverstripe/assets": ">=1,<1.4.7|>=1.5,<1.5.2", + "silverstripe/assets": ">=1,<1.10.1", "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4", "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", - "silverstripe/framework": "<4.10.1", - "silverstripe/graphql": "<3.5.2|>=4-alpha.1,<4-alpha.2", + "silverstripe/framework": "<4.10.9", + "silverstripe/graphql": "<3.5.2|>=4-alpha.1,<4-alpha.2|= 4.0.0-alpha1", + "silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1", "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4", + "silverstripe/silverstripe-omnipay": "<2.5.2|>=3,<3.0.2|>=3.1,<3.1.4|>=3.2,<3.2.1", "silverstripe/subsites": ">=2,<2.1.1", "silverstripe/taxonomy": ">=1.3,<1.3.1|>=2,<2.0.1", "silverstripe/userforms": "<3", @@ -3668,14 +3716,15 @@ "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "simplito/elliptic-php": "<1.0.6", "slim/slim": "<2.6", - "smarty/smarty": "<3.1.43|>=4,<4.0.3", - "snipe/snipe-it": "<5.3.10", + "smarty/smarty": "<3.1.45|>=4,<4.1.1", + "snipe/snipe-it": "<5.4.4|>= 6.0.0-RC-1, <= 6.0.0-RC-5", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", "spipu/html2pdf": "<5.2.4", "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", - "ssddanbrown/bookstack": "<21.12.1", + "ssddanbrown/bookstack": "<22.2.3", + "statamic/cms": "<3.2.39|>=3.3,<3.3.2", "stormpath/sdk": ">=0,<9.9.99", "studio-42/elfinder": "<2.1.59", "subrion/cms": "<=4.2.1", @@ -3683,10 +3732,10 @@ "swiftmailer/swiftmailer": ">=4,<5.4.5", "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", - "sylius/grid-bundle": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", + "sylius/grid-bundle": "<1.10.1", "sylius/paypal-plugin": ">=1,<1.2.4|>=1.3,<1.3.1", "sylius/resource-bundle": "<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4", - "sylius/sylius": "<1.6.9|>=1.7,<1.7.9|>=1.8,<1.8.3|>=1.9,<1.9.5", + "sylius/sylius": "<1.9.10|>=1.10,<1.10.11|>=1.11,<1.11.2", "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99", "symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4", "symbiote/silverstripe-versionedfiles": "<=2.0.3", @@ -3711,7 +3760,7 @@ "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9", "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", - "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8|>=5.3,<5.3.2", + "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.3.2", "symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12", "symfony/symfony": ">=2,<3.4.49|>=4,<4.4.35|>=5,<5.3.12|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3", "symfony/translation": ">=2,<2.0.17", @@ -3721,22 +3770,24 @@ "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7", "t3/dce": ">=2.2,<2.6.2", "t3g/svg-sanitizer": "<1.0.3", + "tastyigniter/tastyigniter": "<3.3", "tecnickcom/tcpdf": "<6.2.22", "terminal42/contao-tablelookupwizard": "<3.3.5", "thelia/backoffice-default-template": ">=2.1,<2.1.2", "thelia/thelia": ">=2.1-beta.1,<2.1.3", "theonedemon/phpwhois": "<=4.2.5", + "thinkcmf/thinkcmf": "<=5.1.7", "tinymce/tinymce": "<5.10", "titon/framework": ">=0,<9.9.99", - "topthink/framework": "<6.0.9", + "topthink/framework": "<6.0.12", "topthink/think": "<=6.0.9", "topthink/thinkphp": "<=3.2.3", - "tribalsystems/zenario": "<8.8.53370", + "tribalsystems/zenario": "<9.2.55826", "truckersmp/phpwhois": "<=4.3.1", "twig/twig": "<1.38|>=2,<2.14.11|>=3,<3.3.8", - "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.5", + "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.29|>=11,<11.5.11", "typo3/cms-backend": ">=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", - "typo3/cms-core": ">=6.2,<=6.2.56|>=7,<=7.6.52|>=8,<=8.7.41|>=9,<9.5.29|>=10,<10.4.19|>=11,<11.5", + "typo3/cms-core": ">=6.2,<=6.2.56|>=7,<7.6.57|>=8,<8.7.47|>=9,<9.5.35|>=10,<10.4.29|>=11,<11.5.11", "typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3", @@ -3749,7 +3800,7 @@ "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2", "vanilla/safecurl": "<0.9.2", "verot/class.upload.php": "<=1.0.3|>=2,<=2.0.4", - "vrana/adminer": "<4.7.9", + "vrana/adminer": "<4.8.1", "wallabag/tcpdf": "<6.2.22", "wanglelecc/laracms": "<=1.0.3", "web-auth/webauthn-framework": ">=3.3,<3.3.4", @@ -3757,7 +3808,11 @@ "wikimedia/parsoid": "<0.12.2", "willdurand/js-translation-bundle": "<2.1.1", "wp-cli/wp-cli": "<2.5", - "yetiforce/yetiforce-crm": "<=6.3", + "wp-graphql/wp-graphql": "<0.3.5", + "wpanel/wpanel4-cms": "<=4.3.1", + "wwbn/avideo": "<=11.6", + "yeswiki/yeswiki": "<4.1", + "yetiforce/yetiforce-crm": "<6.4", "yidashi/yii2cmf": "<=2", "yii2mod/yii2-cms": "<1.9.2", "yiisoft/yii": ">=1.1.14,<1.1.15", @@ -3776,10 +3831,10 @@ "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2", "zendframework/zend-db": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.10|>=2.3,<2.3.5", "zendframework/zend-developer-tools": ">=1.2.2,<1.2.3", - "zendframework/zend-diactoros": ">=1,<1.8.4", - "zendframework/zend-feed": ">=1,<2.10.3", + "zendframework/zend-diactoros": "<1.8.4", + "zendframework/zend-feed": "<2.10.3", "zendframework/zend-form": ">=2,<2.2.7|>=2.3,<2.3.1", - "zendframework/zend-http": ">=1,<2.8.1", + "zendframework/zend-http": "<2.8.1", "zendframework/zend-json": ">=2.1,<2.1.6|>=2.2,<2.2.6", "zendframework/zend-ldap": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.8|>=2.3,<2.3.3", "zendframework/zend-mail": ">=2,<2.4.11|>=2.5,<2.7.2", @@ -3831,7 +3886,7 @@ "type": "tidelift" } ], - "time": "2022-02-17T14:18:41+00:00" + "time": "2022-07-06T08:13:54+00:00" }, { "name": "sebastian/cli-parser", @@ -4799,32 +4854,32 @@ }, { "name": "slevomat/coding-standard", - "version": "7.0.18", + "version": "7.2.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "b81ac84f41a4797dc25c8ede1b0718e2a74be0fc" + "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b81ac84f41a4797dc25c8ede1b0718e2a74be0fc", - "reference": "b81ac84f41a4797dc25c8ede1b0718e2a74be0fc", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/aff06ae7a84e4534bf6f821dc982a93a5d477c90", + "reference": "aff06ae7a84e4534bf6f821dc982a93a5d477c90", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", - "php": "^7.1 || ^8.0", - "phpstan/phpdoc-parser": "^1.0.0", - "squizlabs/php_codesniffer": "^3.6.1" + "php": "^7.2 || ^8.0", + "phpstan/phpdoc-parser": "^1.5.1", + "squizlabs/php_codesniffer": "^3.6.2" }, "require-dev": { - "phing/phing": "2.17.0", - "php-parallel-lint/php-parallel-lint": "1.3.1", - "phpstan/phpstan": "1.2.0", + "phing/phing": "2.17.3", + "php-parallel-lint/php-parallel-lint": "1.3.2", + "phpstan/phpstan": "1.4.10|1.7.1", "phpstan/phpstan-deprecation-rules": "1.0.0", - "phpstan/phpstan-phpunit": "1.0.0", - "phpstan/phpstan-strict-rules": "1.1.0", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.10" + "phpstan/phpstan-phpunit": "1.0.0|1.1.1", + "phpstan/phpstan-strict-rules": "1.2.3", + "phpunit/phpunit": "7.5.20|8.5.21|9.5.20" }, "type": "phpcodesniffer-standard", "extra": { @@ -4844,7 +4899,7 @@ "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/7.0.18" + "source": "https://github.com/slevomat/coding-standard/tree/7.2.1" }, "funding": [ { @@ -4856,7 +4911,7 @@ "type": "tidelift" } ], - "time": "2021-12-07T17:19:06+00:00" + "time": "2022-05-25T10:58:12+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -5978,21 +6033,20 @@ }, { "name": "webmozart/glob", - "version": "4.4.0", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/webmozarts/glob.git", - "reference": "539b5dbc10021d3f9242e7a9e9b6b37843179e83" + "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/glob/zipball/539b5dbc10021d3f9242e7a9e9b6b37843179e83", - "reference": "539b5dbc10021d3f9242e7a9e9b6b37843179e83", + "url": "https://api.github.com/repos/webmozarts/glob/zipball/3c17f7dec3d9d0e87b575026011f2e75a56ed655", + "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655", "shasum": "" }, "require": { - "php": "^7.3 || ^8.0.0", - "webmozart/path-util": "^2.2" + "php": "^7.3 || ^8.0.0" }, "require-dev": { "phpunit/phpunit": "^9.5", @@ -6022,9 +6076,9 @@ "description": "A PHP implementation of Ant's glob.", "support": { "issues": "https://github.com/webmozarts/glob/issues", - "source": "https://github.com/webmozarts/glob/tree/4.4.0" + "source": "https://github.com/webmozarts/glob/tree/4.6.0" }, - "time": "2021-10-07T16:13:08+00:00" + "time": "2022-05-24T19:45:58+00:00" }, { "name": "webmozart/path-util", @@ -6086,7 +6140,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.3 || ~8.0 || ~8.1", + "php": "^7.4 || ~8.0 || ~8.1", "ext-json": "*" }, "platform-dev": { From f736ce37691f60e2220d745af8e248fe3339b9e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 14:19:35 +0000 Subject: [PATCH 26/38] Bump ridedott/merge-me-action from 2.10.12 to 2.10.15 Bumps [ridedott/merge-me-action](https://github.com/ridedott/merge-me-action) from 2.10.12 to 2.10.15. - [Release notes](https://github.com/ridedott/merge-me-action/releases) - [Changelog](https://github.com/ridedott/merge-me-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/ridedott/merge-me-action/compare/v2.10.12...v2.10.15) --- updated-dependencies: - dependency-name: ridedott/merge-me-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-dependabot-upgrades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml index 1219942..4a956c3 100644 --- a/.github/workflows/merge-dependabot-upgrades.yml +++ b/.github/workflows/merge-dependabot-upgrades.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Auto-Merge if: ${{ github.event.workflow_run.conclusion == 'success' }} - uses: ridedott/merge-me-action@v2.10.12 + uses: ridedott/merge-me-action@v2.10.15 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_METHOD: MERGE From c4f590fc2f2580719a19fd077f96d8f42847bdd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 14:01:01 +0000 Subject: [PATCH 27/38] Bump vimeo/psalm from 4.24.0 to 4.25.0 Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 4.24.0 to 4.25.0. - [Release notes](https://github.com/vimeo/psalm/releases) - [Commits](https://github.com/vimeo/psalm/compare/4.24.0...v4.25.0) --- updated-dependencies: - dependency-name: vimeo/psalm dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 294 +++++++++++++++++++++++++------------------------- 1 file changed, 147 insertions(+), 147 deletions(-) diff --git a/composer.lock b/composer.lock index 8ca9211..0868cc9 100644 --- a/composer.lock +++ b/composer.lock @@ -135,49 +135,54 @@ "time": "2022-03-08T20:15:36+00:00" }, { - "name": "php-http/curl-client", - "version": "2.2.1", + "name": "php-http/client-common", + "version": "2.5.0", "source": { "type": "git", - "url": "https://github.com/php-http/curl-client.git", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" + "url": "https://github.com/php-http/client-common.git", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", "shasum": "" }, "require": { - "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message": "^1.2", + "php-http/message": "^1.6", + "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0", - "psr/http-client-implementation": "1.0" + "psr/http-message": "^1.0", + "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", + "symfony/polyfill-php80": "^1.17" }, "require-dev": { - "guzzlehttp/psr7": "^1.0", - "laminas/laminas-diactoros": "^2.0", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^7.5 || ^9.4" + "doctrine/instantiator": "^1.1", + "guzzlehttp/psr7": "^1.4", + "nyholm/psr7": "^1.2", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", + "phpspec/prophecy": "^1.10.2", + "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + }, + "suggest": { + "ext-json": "To detect JSON responses with the ContentTypePlugin", + "ext-libxml": "To detect XML responses with the ContentTypePlugin", + "php-http/cache-plugin": "PSR-6 Cache plugin", + "php-http/logger-plugin": "PSR-3 Logger plugin", + "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { "psr-4": { - "Http\\Client\\Curl\\": "src/" + "Http\\Client\\Common\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -186,22 +191,23 @@ ], "authors": [ { - "name": "Михаил Красильников", - "email": "m.krasilnikov@yandex.ru" + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" } ], - "description": "PSR-18 and HTTPlug Async client with cURL", - "homepage": "http://php-http.org", + "description": "Common HTTP Client implementations and tools for HTTPlug", + "homepage": "http://httplug.io", "keywords": [ - "curl", + "client", + "common", "http", - "psr-18" + "httplug" ], "support": { - "issues": "https://github.com/php-http/curl-client/issues", - "source": "https://github.com/php-http/curl-client/tree/2.2.1" + "issues": "https://github.com/php-http/client-common/issues", + "source": "https://github.com/php-http/client-common/tree/2.5.0" }, - "time": "2021-12-10T18:02:07+00:00" + "time": "2021-11-26T15:01:24+00:00" }, { "name": "php-http/discovery", @@ -460,6 +466,74 @@ }, "time": "2015-12-19T14:08:53+00:00" }, + { + "name": "php-http/mock-client", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/mock-client.git", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/client-common": "^2.0", + "php-http/discovery": "^1.0", + "php-http/httplug": "^2.0", + "php-http/message-factory": "^1.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "symfony/polyfill-php80": "^1.17" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "phpspec/phpspec": "^5.1 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Mock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David de Boer", + "email": "david@ddeboer.nl" + } + ], + "description": "Mock HTTP client", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "http", + "mock", + "psr7" + ], + "support": { + "issues": "https://github.com/php-http/mock-client/issues", + "source": "https://github.com/php-http/mock-client/tree/1.5.0" + }, + "time": "2021-08-25T07:01:14+00:00" + }, { "name": "php-http/promise", "version": "1.1.0", @@ -2390,104 +2464,28 @@ "time": "2022-01-18T12:24:56+00:00" }, { - "name": "php-http/client-common", - "version": "2.5.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/client-common.git", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0", - "php-http/httplug": "^2.0", - "php-http/message": "^1.6", - "php-http/message-factory": "^1.0", - "psr/http-client": "^1.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", - "symfony/polyfill-php80": "^1.17" - }, - "require-dev": { - "doctrine/instantiator": "^1.1", - "guzzlehttp/psr7": "^1.4", - "nyholm/psr7": "^1.2", - "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", - "phpspec/prophecy": "^1.10.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" - }, - "suggest": { - "ext-json": "To detect JSON responses with the ContentTypePlugin", - "ext-libxml": "To detect XML responses with the ContentTypePlugin", - "php-http/cache-plugin": "PSR-6 Cache plugin", - "php-http/logger-plugin": "PSR-3 Logger plugin", - "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Client\\Common\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "Common HTTP Client implementations and tools for HTTPlug", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "common", - "http", - "httplug" - ], - "support": { - "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.5.0" - }, - "time": "2021-11-26T15:01:24+00:00" - }, - { - "name": "php-http/mock-client", - "version": "1.5.0", + "name": "php-http/curl-client", + "version": "2.2.1", "source": { "type": "git", - "url": "https://github.com/php-http/mock-client.git", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + "url": "https://github.com/php-http/curl-client.git", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", "shasum": "" }, "require": { + "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/client-common": "^2.0", - "php-http/discovery": "^1.0", + "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message-factory": "^1.0", + "php-http/message": "^1.2", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/polyfill-php80": "^1.17" + "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, "provide": { "php-http/async-client-implementation": "1.0", @@ -2495,17 +2493,20 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "phpspec/phpspec": "^5.1 || ^6.0" + "guzzlehttp/psr7": "^1.0", + "laminas/laminas-diactoros": "^2.0", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^7.5 || ^9.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "Http\\Mock\\": "src/" + "Http\\Client\\Curl\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2514,23 +2515,22 @@ ], "authors": [ { - "name": "David de Boer", - "email": "david@ddeboer.nl" + "name": "Михаил Красильников", + "email": "m.krasilnikov@yandex.ru" } ], - "description": "Mock HTTP client", - "homepage": "http://httplug.io", + "description": "PSR-18 and HTTPlug Async client with cURL", + "homepage": "http://php-http.org", "keywords": [ - "client", + "curl", "http", - "mock", - "psr7" + "psr-18" ], "support": { - "issues": "https://github.com/php-http/mock-client/issues", - "source": "https://github.com/php-http/mock-client/tree/1.5.0" + "issues": "https://github.com/php-http/curl-client/issues", + "source": "https://github.com/php-http/curl-client/tree/2.2.1" }, - "time": "2021-08-25T07:01:14+00:00" + "time": "2021-12-10T18:02:07+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -5147,16 +5147,16 @@ }, { "name": "symfony/console", - "version": "v5.4.10", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000" + "reference": "535846c7ee6bc4dd027ca0d93220601456734b10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4d671ab4ddac94ee439ea73649c69d9d200b5000", - "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000", + "url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10", + "reference": "535846c7ee6bc4dd027ca0d93220601456734b10", "shasum": "" }, "require": { @@ -5226,7 +5226,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.10" + "source": "https://github.com/symfony/console/tree/v5.4.11" }, "funding": [ { @@ -5242,7 +5242,7 @@ "type": "tidelift" } ], - "time": "2022-06-26T13:00:04+00:00" + "time": "2022-07-22T10:42:43+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5659,16 +5659,16 @@ }, { "name": "symfony/string", - "version": "v5.4.10", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097" + "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/4432bc7df82a554b3e413a8570ce2fea90e94097", - "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097", + "url": "https://api.github.com/repos/symfony/string/zipball/5eb661e49ad389e4ae2b6e4df8d783a8a6548322", + "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322", "shasum": "" }, "require": { @@ -5725,7 +5725,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.10" + "source": "https://github.com/symfony/string/tree/v5.4.11" }, "funding": [ { @@ -5741,7 +5741,7 @@ "type": "tidelift" } ], - "time": "2022-06-26T15:57:47+00:00" + "time": "2022-07-24T16:15:25+00:00" }, { "name": "symfony/var-exporter", @@ -5868,16 +5868,16 @@ }, { "name": "vimeo/psalm", - "version": "4.24.0", + "version": "v4.25.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "06dd975cb55d36af80f242561738f16c5f58264f" + "reference": "d7cd84c4ebca74ba3419b9601f81d177bcbe2aac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/06dd975cb55d36af80f242561738f16c5f58264f", - "reference": "06dd975cb55d36af80f242561738f16c5f58264f", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/d7cd84c4ebca74ba3419b9601f81d177bcbe2aac", + "reference": "d7cd84c4ebca74ba3419b9601f81d177bcbe2aac", "shasum": "" }, "require": { @@ -5969,9 +5969,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/4.24.0" + "source": "https://github.com/vimeo/psalm/tree/v4.25.0" }, - "time": "2022-06-26T11:47:54+00:00" + "time": "2022-07-25T17:04:37+00:00" }, { "name": "webmozart/assert", From 522914986793c1c8bbfd2d90ad1fdd69b02adcf8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 14:01:08 +0000 Subject: [PATCH 28/38] Bump symfony/cache from 5.4.10 to 5.4.11 Bumps [symfony/cache](https://github.com/symfony/cache) from 5.4.10 to 5.4.11. - [Release notes](https://github.com/symfony/cache/releases) - [Changelog](https://github.com/symfony/cache/blob/6.1/CHANGELOG.md) - [Commits](https://github.com/symfony/cache/compare/v5.4.10...v5.4.11) --- updated-dependencies: - dependency-name: symfony/cache dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 270 +++++++++++++++++++++++++------------------------- 1 file changed, 135 insertions(+), 135 deletions(-) diff --git a/composer.lock b/composer.lock index 8ca9211..50ccac6 100644 --- a/composer.lock +++ b/composer.lock @@ -135,49 +135,54 @@ "time": "2022-03-08T20:15:36+00:00" }, { - "name": "php-http/curl-client", - "version": "2.2.1", + "name": "php-http/client-common", + "version": "2.5.0", "source": { "type": "git", - "url": "https://github.com/php-http/curl-client.git", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" + "url": "https://github.com/php-http/client-common.git", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", "shasum": "" }, "require": { - "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message": "^1.2", + "php-http/message": "^1.6", + "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0", - "psr/http-client-implementation": "1.0" + "psr/http-message": "^1.0", + "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", + "symfony/polyfill-php80": "^1.17" }, "require-dev": { - "guzzlehttp/psr7": "^1.0", - "laminas/laminas-diactoros": "^2.0", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^7.5 || ^9.4" + "doctrine/instantiator": "^1.1", + "guzzlehttp/psr7": "^1.4", + "nyholm/psr7": "^1.2", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", + "phpspec/prophecy": "^1.10.2", + "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + }, + "suggest": { + "ext-json": "To detect JSON responses with the ContentTypePlugin", + "ext-libxml": "To detect XML responses with the ContentTypePlugin", + "php-http/cache-plugin": "PSR-6 Cache plugin", + "php-http/logger-plugin": "PSR-3 Logger plugin", + "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { "psr-4": { - "Http\\Client\\Curl\\": "src/" + "Http\\Client\\Common\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -186,22 +191,23 @@ ], "authors": [ { - "name": "Михаил Красильников", - "email": "m.krasilnikov@yandex.ru" + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" } ], - "description": "PSR-18 and HTTPlug Async client with cURL", - "homepage": "http://php-http.org", + "description": "Common HTTP Client implementations and tools for HTTPlug", + "homepage": "http://httplug.io", "keywords": [ - "curl", + "client", + "common", "http", - "psr-18" + "httplug" ], "support": { - "issues": "https://github.com/php-http/curl-client/issues", - "source": "https://github.com/php-http/curl-client/tree/2.2.1" + "issues": "https://github.com/php-http/client-common/issues", + "source": "https://github.com/php-http/client-common/tree/2.5.0" }, - "time": "2021-12-10T18:02:07+00:00" + "time": "2021-11-26T15:01:24+00:00" }, { "name": "php-http/discovery", @@ -460,6 +466,74 @@ }, "time": "2015-12-19T14:08:53+00:00" }, + { + "name": "php-http/mock-client", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/mock-client.git", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/client-common": "^2.0", + "php-http/discovery": "^1.0", + "php-http/httplug": "^2.0", + "php-http/message-factory": "^1.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "symfony/polyfill-php80": "^1.17" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "phpspec/phpspec": "^5.1 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Mock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David de Boer", + "email": "david@ddeboer.nl" + } + ], + "description": "Mock HTTP client", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "http", + "mock", + "psr7" + ], + "support": { + "issues": "https://github.com/php-http/mock-client/issues", + "source": "https://github.com/php-http/mock-client/tree/1.5.0" + }, + "time": "2021-08-25T07:01:14+00:00" + }, { "name": "php-http/promise", "version": "1.1.0", @@ -2390,104 +2464,28 @@ "time": "2022-01-18T12:24:56+00:00" }, { - "name": "php-http/client-common", - "version": "2.5.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/client-common.git", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0", - "php-http/httplug": "^2.0", - "php-http/message": "^1.6", - "php-http/message-factory": "^1.0", - "psr/http-client": "^1.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", - "symfony/polyfill-php80": "^1.17" - }, - "require-dev": { - "doctrine/instantiator": "^1.1", - "guzzlehttp/psr7": "^1.4", - "nyholm/psr7": "^1.2", - "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", - "phpspec/prophecy": "^1.10.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" - }, - "suggest": { - "ext-json": "To detect JSON responses with the ContentTypePlugin", - "ext-libxml": "To detect XML responses with the ContentTypePlugin", - "php-http/cache-plugin": "PSR-6 Cache plugin", - "php-http/logger-plugin": "PSR-3 Logger plugin", - "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Client\\Common\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "Common HTTP Client implementations and tools for HTTPlug", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "common", - "http", - "httplug" - ], - "support": { - "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.5.0" - }, - "time": "2021-11-26T15:01:24+00:00" - }, - { - "name": "php-http/mock-client", - "version": "1.5.0", + "name": "php-http/curl-client", + "version": "2.2.1", "source": { "type": "git", - "url": "https://github.com/php-http/mock-client.git", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + "url": "https://github.com/php-http/curl-client.git", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", "shasum": "" }, "require": { + "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/client-common": "^2.0", - "php-http/discovery": "^1.0", + "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message-factory": "^1.0", + "php-http/message": "^1.2", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/polyfill-php80": "^1.17" + "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, "provide": { "php-http/async-client-implementation": "1.0", @@ -2495,17 +2493,20 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "phpspec/phpspec": "^5.1 || ^6.0" + "guzzlehttp/psr7": "^1.0", + "laminas/laminas-diactoros": "^2.0", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^7.5 || ^9.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "Http\\Mock\\": "src/" + "Http\\Client\\Curl\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2514,23 +2515,22 @@ ], "authors": [ { - "name": "David de Boer", - "email": "david@ddeboer.nl" + "name": "Михаил Красильников", + "email": "m.krasilnikov@yandex.ru" } ], - "description": "Mock HTTP client", - "homepage": "http://httplug.io", + "description": "PSR-18 and HTTPlug Async client with cURL", + "homepage": "http://php-http.org", "keywords": [ - "client", + "curl", "http", - "mock", - "psr7" + "psr-18" ], "support": { - "issues": "https://github.com/php-http/mock-client/issues", - "source": "https://github.com/php-http/mock-client/tree/1.5.0" + "issues": "https://github.com/php-http/curl-client/issues", + "source": "https://github.com/php-http/curl-client/tree/2.2.1" }, - "time": "2021-08-25T07:01:14+00:00" + "time": "2021-12-10T18:02:07+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -4971,16 +4971,16 @@ }, { "name": "symfony/cache", - "version": "v5.4.10", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "c4e387b739022fd4b20abd8edb2143c44c5daa14" + "reference": "5a0fff46df349f0db3fe242263451fddf5277362" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/c4e387b739022fd4b20abd8edb2143c44c5daa14", - "reference": "c4e387b739022fd4b20abd8edb2143c44c5daa14", + "url": "https://api.github.com/repos/symfony/cache/zipball/5a0fff46df349f0db3fe242263451fddf5277362", + "reference": "5a0fff46df349f0db3fe242263451fddf5277362", "shasum": "" }, "require": { @@ -5048,7 +5048,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.10" + "source": "https://github.com/symfony/cache/tree/v5.4.11" }, "funding": [ { @@ -5064,7 +5064,7 @@ "type": "tidelift" } ], - "time": "2022-06-19T12:03:50+00:00" + "time": "2022-07-28T15:25:17+00:00" }, { "name": "symfony/cache-contracts", From 4503ba819772e220c934b9b1941f2b06d8cf1ab4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Aug 2022 14:04:02 +0000 Subject: [PATCH 29/38] Bump laminas/laminas-diactoros from 2.13.0 to 2.14.0 Bumps [laminas/laminas-diactoros](https://github.com/laminas/laminas-diactoros) from 2.13.0 to 2.14.0. - [Release notes](https://github.com/laminas/laminas-diactoros/releases) - [Commits](https://github.com/laminas/laminas-diactoros/compare/2.13.0...2.14.0) --- updated-dependencies: - dependency-name: laminas/laminas-diactoros dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 0868cc9..b6dca53 100644 --- a/composer.lock +++ b/composer.lock @@ -1897,16 +1897,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.13.0", + "version": "2.14.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "34ba65010be9aa74e159d168c5ecfa5c01e4d956" + "reference": "6cb35f61913f06b2c91075db00f67cfd78869e28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/34ba65010be9aa74e159d168c5ecfa5c01e4d956", - "reference": "34ba65010be9aa74e159d168c5ecfa5c01e4d956", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6cb35f61913f06b2c91075db00f67cfd78869e28", + "reference": "6cb35f61913f06b2c91075db00f67cfd78869e28", "shasum": "" }, "require": { @@ -1992,7 +1992,7 @@ "type": "community_bridge" } ], - "time": "2022-07-07T12:31:03+00:00" + "time": "2022-07-28T12:23:48+00:00" }, { "name": "maglnet/composer-require-checker", From 282559b432898934b1989f3b26f441d382758b6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 14:00:58 +0000 Subject: [PATCH 30/38] Bump vimeo/psalm from 4.25.0 to 4.26.0 Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 4.25.0 to 4.26.0. - [Release notes](https://github.com/vimeo/psalm/releases) - [Commits](https://github.com/vimeo/psalm/compare/4.25.0...4.26.0) --- updated-dependencies: - dependency-name: vimeo/psalm dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index fa6a4a3..c64c94b 100644 --- a/composer.lock +++ b/composer.lock @@ -5868,16 +5868,16 @@ }, { "name": "vimeo/psalm", - "version": "v4.25.0", + "version": "4.26.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "d7cd84c4ebca74ba3419b9601f81d177bcbe2aac" + "reference": "6998fabb2bf528b65777bf9941920888d23c03ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/d7cd84c4ebca74ba3419b9601f81d177bcbe2aac", - "reference": "d7cd84c4ebca74ba3419b9601f81d177bcbe2aac", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/6998fabb2bf528b65777bf9941920888d23c03ac", + "reference": "6998fabb2bf528b65777bf9941920888d23c03ac", "shasum": "" }, "require": { @@ -5969,9 +5969,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/v4.25.0" + "source": "https://github.com/vimeo/psalm/tree/4.26.0" }, - "time": "2022-07-25T17:04:37+00:00" + "time": "2022-07-31T13:10:26+00:00" }, { "name": "webmozart/assert", From f490dd98cd33f81ec797929118be3954f3bc4c9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 14:29:14 +0000 Subject: [PATCH 31/38] Bump ridedott/merge-me-action from 2.10.15 to 2.10.17 Bumps [ridedott/merge-me-action](https://github.com/ridedott/merge-me-action) from 2.10.15 to 2.10.17. - [Release notes](https://github.com/ridedott/merge-me-action/releases) - [Changelog](https://github.com/ridedott/merge-me-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/ridedott/merge-me-action/compare/v2.10.15...v2.10.17) --- updated-dependencies: - dependency-name: ridedott/merge-me-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-dependabot-upgrades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml index 4a956c3..0e1247a 100644 --- a/.github/workflows/merge-dependabot-upgrades.yml +++ b/.github/workflows/merge-dependabot-upgrades.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Auto-Merge if: ${{ github.event.workflow_run.conclusion == 'success' }} - uses: ridedott/merge-me-action@v2.10.15 + uses: ridedott/merge-me-action@v2.10.17 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_METHOD: MERGE From afb9d65721b2db1f367a212ba4b8936989590a0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Aug 2022 14:01:02 +0000 Subject: [PATCH 32/38] Bump phpunit/phpunit from 9.5.21 to 9.5.22 Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.21 to 9.5.22. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-9.5.md) - [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.21...9.5.22) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.lock b/composer.lock index c64c94b..d713ce9 100644 --- a/composer.lock +++ b/composer.lock @@ -2806,23 +2806,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.15", + "version": "9.2.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f" + "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2593003befdcc10db5e213f9f28814f5aa8ac073", + "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.13.0", + "nikic/php-parser": "^4.14", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -2871,7 +2871,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.16" }, "funding": [ { @@ -2879,7 +2879,7 @@ "type": "github" } ], - "time": "2022-03-07T09:28:20+00:00" + "time": "2022-08-20T05:26:47+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3124,16 +3124,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.21", + "version": "9.5.22", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1" + "reference": "e329ac6e8744f461518272612a479fde958752fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1", - "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e329ac6e8744f461518272612a479fde958752fe", + "reference": "e329ac6e8744f461518272612a479fde958752fe", "shasum": "" }, "require": { @@ -3210,7 +3210,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.22" }, "funding": [ { @@ -3222,7 +3222,7 @@ "type": "github" } ], - "time": "2022-06-19T12:14:25+00:00" + "time": "2022-08-20T08:25:46+00:00" }, { "name": "psalm/plugin-phpunit", From ca53263a3b8b8424cf9b4531e288a837f2cf9636 Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 29 Aug 2022 13:11:05 +0100 Subject: [PATCH 33/38] CS Fixes for 2.0x branch --- src/Value/RouteResolverSpec.php | 2 +- test/Unit/Document/Fragment/DocumentLinkTest.php | 2 +- test/Unit/Value/DocumentDataTest.php | 8 ++++---- test/Unit/Value/RouteResolverSpecTest.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Value/RouteResolverSpec.php b/src/Value/RouteResolverSpec.php index 2bdf317..9daf95a 100644 --- a/src/Value/RouteResolverSpec.php +++ b/src/Value/RouteResolverSpec.php @@ -50,7 +50,7 @@ public static function __set_state(array $data): self return new self( $data['type'], $data['path'], - $data['resolvers'] + $data['resolvers'], ); } } diff --git a/test/Unit/Document/Fragment/DocumentLinkTest.php b/test/Unit/Document/Fragment/DocumentLinkTest.php index 215fb5c..d5ad910 100644 --- a/test/Unit/Document/Fragment/DocumentLinkTest.php +++ b/test/Unit/Document/Fragment/DocumentLinkTest.php @@ -54,7 +54,7 @@ public function testConstructorWithUrl(): DocumentLink 'en-gb', false, ['a', 'b'], - '/some/url' + '/some/url', ); self::assertTrue(true); diff --git a/test/Unit/Value/DocumentDataTest.php b/test/Unit/Value/DocumentDataTest.php index 7ce310a..451caff 100644 --- a/test/Unit/Value/DocumentDataTest.php +++ b/test/Unit/Value/DocumentDataTest.php @@ -39,8 +39,8 @@ protected function setUp(): void $this->documentWithUrl = DocumentData::factory( Json::decodeObject( - $this->jsonFixtureByFileName('document-with-url.json') - ) + $this->jsonFixtureByFileName('document-with-url.json'), + ), ); } @@ -197,8 +197,8 @@ public function testThatADocumentWithANullUrlWillHaveANullUrl(): void { $document = DocumentData::factory( Json::decodeObject( - $this->jsonFixtureByFileName('document-with-null-url.json') - ) + $this->jsonFixtureByFileName('document-with-null-url.json'), + ), ); self::assertNull($document->url()); } diff --git a/test/Unit/Value/RouteResolverSpecTest.php b/test/Unit/Value/RouteResolverSpecTest.php index 711bd2b..983f6f6 100644 --- a/test/Unit/Value/RouteResolverSpecTest.php +++ b/test/Unit/Value/RouteResolverSpecTest.php @@ -22,7 +22,7 @@ public function testExpectedStringValueWithNonEmptyResolvers(): void self::assertEquals( $expect, - (string) (new RouteResolverSpec('mine', '/:category/:uid', ['category' => 'some-prop'])) + (string) (new RouteResolverSpec('mine', '/:category/:uid', ['category' => 'some-prop'])), ); } From 9a434b65efbd15047188c9fb90cb55ce070a9722 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Aug 2022 14:15:24 +0000 Subject: [PATCH 34/38] Bump ridedott/merge-me-action from 2.10.17 to 2.10.18 Bumps [ridedott/merge-me-action](https://github.com/ridedott/merge-me-action) from 2.10.17 to 2.10.18. - [Release notes](https://github.com/ridedott/merge-me-action/releases) - [Changelog](https://github.com/ridedott/merge-me-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/ridedott/merge-me-action/compare/v2.10.17...v2.10.18) --- updated-dependencies: - dependency-name: ridedott/merge-me-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-dependabot-upgrades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml index 0e1247a..b05c0c1 100644 --- a/.github/workflows/merge-dependabot-upgrades.yml +++ b/.github/workflows/merge-dependabot-upgrades.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Auto-Merge if: ${{ github.event.workflow_run.conclusion == 'success' }} - uses: ridedott/merge-me-action@v2.10.17 + uses: ridedott/merge-me-action@v2.10.18 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MERGE_METHOD: MERGE From 66d8a299ae10ed4d30533d917e3ea0fb8a804d26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 16:28:04 +0000 Subject: [PATCH 35/38] Bump phpunit/phpunit from 9.5.23 to 9.5.24 Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.23 to 9.5.24. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-9.5.md) - [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.23...9.5.24) --- updated-dependencies: - dependency-name: phpunit/phpunit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 296 +++++++++++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 148 deletions(-) diff --git a/composer.lock b/composer.lock index 4338215..eb37626 100644 --- a/composer.lock +++ b/composer.lock @@ -135,49 +135,54 @@ "time": "2022-03-08T20:15:36+00:00" }, { - "name": "php-http/curl-client", - "version": "2.2.1", + "name": "php-http/client-common", + "version": "2.5.0", "source": { "type": "git", - "url": "https://github.com/php-http/curl-client.git", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" + "url": "https://github.com/php-http/client-common.git", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", "shasum": "" }, "require": { - "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message": "^1.2", + "php-http/message": "^1.6", + "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0", - "psr/http-client-implementation": "1.0" + "psr/http-message": "^1.0", + "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", + "symfony/polyfill-php80": "^1.17" }, "require-dev": { - "guzzlehttp/psr7": "^1.0", - "laminas/laminas-diactoros": "^2.0", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^7.5 || ^9.4" + "doctrine/instantiator": "^1.1", + "guzzlehttp/psr7": "^1.4", + "nyholm/psr7": "^1.2", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", + "phpspec/prophecy": "^1.10.2", + "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + }, + "suggest": { + "ext-json": "To detect JSON responses with the ContentTypePlugin", + "ext-libxml": "To detect XML responses with the ContentTypePlugin", + "php-http/cache-plugin": "PSR-6 Cache plugin", + "php-http/logger-plugin": "PSR-3 Logger plugin", + "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { "psr-4": { - "Http\\Client\\Curl\\": "src/" + "Http\\Client\\Common\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -186,22 +191,23 @@ ], "authors": [ { - "name": "Михаил Красильников", - "email": "m.krasilnikov@yandex.ru" + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" } ], - "description": "PSR-18 and HTTPlug Async client with cURL", - "homepage": "http://php-http.org", + "description": "Common HTTP Client implementations and tools for HTTPlug", + "homepage": "http://httplug.io", "keywords": [ - "curl", + "client", + "common", "http", - "psr-18" + "httplug" ], "support": { - "issues": "https://github.com/php-http/curl-client/issues", - "source": "https://github.com/php-http/curl-client/tree/2.2.1" + "issues": "https://github.com/php-http/client-common/issues", + "source": "https://github.com/php-http/client-common/tree/2.5.0" }, - "time": "2021-12-10T18:02:07+00:00" + "time": "2021-11-26T15:01:24+00:00" }, { "name": "php-http/discovery", @@ -460,6 +466,74 @@ }, "time": "2015-12-19T14:08:53+00:00" }, + { + "name": "php-http/mock-client", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/mock-client.git", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/client-common": "^2.0", + "php-http/discovery": "^1.0", + "php-http/httplug": "^2.0", + "php-http/message-factory": "^1.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "symfony/polyfill-php80": "^1.17" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "phpspec/phpspec": "^5.1 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Mock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David de Boer", + "email": "david@ddeboer.nl" + } + ], + "description": "Mock HTTP client", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "http", + "mock", + "psr7" + ], + "support": { + "issues": "https://github.com/php-http/mock-client/issues", + "source": "https://github.com/php-http/mock-client/tree/1.5.0" + }, + "time": "2021-08-25T07:01:14+00:00" + }, { "name": "php-http/promise", "version": "1.1.0", @@ -2110,16 +2184,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.14.0", + "version": "v4.15.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1" + "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", + "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", "shasum": "" }, "require": { @@ -2160,9 +2234,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1" }, - "time": "2022-05-31T20:59:12+00:00" + "time": "2022-09-04T07:30:47+00:00" }, { "name": "openlss/lib-array2xml", @@ -2388,104 +2462,28 @@ "time": "2022-01-18T12:24:56+00:00" }, { - "name": "php-http/client-common", - "version": "2.5.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/client-common.git", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0", - "php-http/httplug": "^2.0", - "php-http/message": "^1.6", - "php-http/message-factory": "^1.0", - "psr/http-client": "^1.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", - "symfony/polyfill-php80": "^1.17" - }, - "require-dev": { - "doctrine/instantiator": "^1.1", - "guzzlehttp/psr7": "^1.4", - "nyholm/psr7": "^1.2", - "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", - "phpspec/prophecy": "^1.10.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" - }, - "suggest": { - "ext-json": "To detect JSON responses with the ContentTypePlugin", - "ext-libxml": "To detect XML responses with the ContentTypePlugin", - "php-http/cache-plugin": "PSR-6 Cache plugin", - "php-http/logger-plugin": "PSR-3 Logger plugin", - "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Client\\Common\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "Common HTTP Client implementations and tools for HTTPlug", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "common", - "http", - "httplug" - ], - "support": { - "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.5.0" - }, - "time": "2021-11-26T15:01:24+00:00" - }, - { - "name": "php-http/mock-client", - "version": "1.5.0", + "name": "php-http/curl-client", + "version": "2.2.1", "source": { "type": "git", - "url": "https://github.com/php-http/mock-client.git", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + "url": "https://github.com/php-http/curl-client.git", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", "shasum": "" }, "require": { + "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/client-common": "^2.0", - "php-http/discovery": "^1.0", + "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message-factory": "^1.0", + "php-http/message": "^1.2", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/polyfill-php80": "^1.17" + "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, "provide": { "php-http/async-client-implementation": "1.0", @@ -2493,17 +2491,20 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "phpspec/phpspec": "^5.1 || ^6.0" + "guzzlehttp/psr7": "^1.0", + "laminas/laminas-diactoros": "^2.0", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^7.5 || ^9.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "Http\\Mock\\": "src/" + "Http\\Client\\Curl\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2512,23 +2513,22 @@ ], "authors": [ { - "name": "David de Boer", - "email": "david@ddeboer.nl" + "name": "Михаил Красильников", + "email": "m.krasilnikov@yandex.ru" } ], - "description": "Mock HTTP client", - "homepage": "http://httplug.io", + "description": "PSR-18 and HTTPlug Async client with cURL", + "homepage": "http://php-http.org", "keywords": [ - "client", + "curl", "http", - "mock", - "psr7" + "psr-18" ], "support": { - "issues": "https://github.com/php-http/mock-client/issues", - "source": "https://github.com/php-http/mock-client/tree/1.5.0" + "issues": "https://github.com/php-http/curl-client/issues", + "source": "https://github.com/php-http/curl-client/tree/2.2.1" }, - "time": "2021-08-25T07:01:14+00:00" + "time": "2021-12-10T18:02:07+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2737,16 +2737,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.16", + "version": "9.2.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073" + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2593003befdcc10db5e213f9f28814f5aa8ac073", - "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", "shasum": "" }, "require": { @@ -2802,7 +2802,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.16" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17" }, "funding": [ { @@ -2810,7 +2810,7 @@ "type": "github" } ], - "time": "2022-08-20T05:26:47+00:00" + "time": "2022-08-30T12:24:04+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3055,16 +3055,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.23", + "version": "9.5.24", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "888556852e7e9bbeeedb9656afe46118765ade34" + "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/888556852e7e9bbeeedb9656afe46118765ade34", - "reference": "888556852e7e9bbeeedb9656afe46118765ade34", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", + "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5", "shasum": "" }, "require": { @@ -3093,7 +3093,7 @@ "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.0", + "sebastian/type": "^3.1", "sebastian/version": "^3.0.2" }, "suggest": { @@ -3137,7 +3137,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.23" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24" }, "funding": [ { @@ -3149,7 +3149,7 @@ "type": "github" } ], - "time": "2022-08-22T14:01:36+00:00" + "time": "2022-08-30T07:42:16+00:00" }, { "name": "psalm/plugin-phpunit", From 9181e0557b2f60754351426c2fa22be82901d7d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 16:28:13 +0000 Subject: [PATCH 36/38] Bump laminas/laminas-diactoros from 2.16.0 to 2.17.0 Bumps [laminas/laminas-diactoros](https://github.com/laminas/laminas-diactoros) from 2.16.0 to 2.17.0. - [Release notes](https://github.com/laminas/laminas-diactoros/releases) - [Commits](https://github.com/laminas/laminas-diactoros/compare/2.16.0...2.17.0) --- updated-dependencies: - dependency-name: laminas/laminas-diactoros dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 268 +++++++++++++++++++++++++------------------------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/composer.lock b/composer.lock index 4338215..d7d023e 100644 --- a/composer.lock +++ b/composer.lock @@ -135,49 +135,54 @@ "time": "2022-03-08T20:15:36+00:00" }, { - "name": "php-http/curl-client", - "version": "2.2.1", + "name": "php-http/client-common", + "version": "2.5.0", "source": { "type": "git", - "url": "https://github.com/php-http/curl-client.git", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" + "url": "https://github.com/php-http/client-common.git", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", - "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", + "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", "shasum": "" }, "require": { - "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message": "^1.2", + "php-http/message": "^1.6", + "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0", - "psr/http-client-implementation": "1.0" + "psr/http-message": "^1.0", + "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", + "symfony/polyfill-php80": "^1.17" }, "require-dev": { - "guzzlehttp/psr7": "^1.0", - "laminas/laminas-diactoros": "^2.0", - "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^7.5 || ^9.4" + "doctrine/instantiator": "^1.1", + "guzzlehttp/psr7": "^1.4", + "nyholm/psr7": "^1.2", + "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", + "phpspec/prophecy": "^1.10.2", + "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + }, + "suggest": { + "ext-json": "To detect JSON responses with the ContentTypePlugin", + "ext-libxml": "To detect XML responses with the ContentTypePlugin", + "php-http/cache-plugin": "PSR-6 Cache plugin", + "php-http/logger-plugin": "PSR-3 Logger plugin", + "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { "psr-4": { - "Http\\Client\\Curl\\": "src/" + "Http\\Client\\Common\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -186,22 +191,23 @@ ], "authors": [ { - "name": "Михаил Красильников", - "email": "m.krasilnikov@yandex.ru" + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" } ], - "description": "PSR-18 and HTTPlug Async client with cURL", - "homepage": "http://php-http.org", + "description": "Common HTTP Client implementations and tools for HTTPlug", + "homepage": "http://httplug.io", "keywords": [ - "curl", + "client", + "common", "http", - "psr-18" + "httplug" ], "support": { - "issues": "https://github.com/php-http/curl-client/issues", - "source": "https://github.com/php-http/curl-client/tree/2.2.1" + "issues": "https://github.com/php-http/client-common/issues", + "source": "https://github.com/php-http/client-common/tree/2.5.0" }, - "time": "2021-12-10T18:02:07+00:00" + "time": "2021-11-26T15:01:24+00:00" }, { "name": "php-http/discovery", @@ -460,6 +466,74 @@ }, "time": "2015-12-19T14:08:53+00:00" }, + { + "name": "php-http/mock-client", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/mock-client.git", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "php-http/client-common": "^2.0", + "php-http/discovery": "^1.0", + "php-http/httplug": "^2.0", + "php-http/message-factory": "^1.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "symfony/polyfill-php80": "^1.17" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "phpspec/phpspec": "^5.1 || ^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Mock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "David de Boer", + "email": "david@ddeboer.nl" + } + ], + "description": "Mock HTTP client", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "http", + "mock", + "psr7" + ], + "support": { + "issues": "https://github.com/php-http/mock-client/issues", + "source": "https://github.com/php-http/mock-client/tree/1.5.0" + }, + "time": "2021-08-25T07:01:14+00:00" + }, { "name": "php-http/promise", "version": "1.1.0", @@ -1823,16 +1897,16 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.16.0", + "version": "2.17.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "49f3f7a3b30ff5a0e62e9b5d16584451f59de65c" + "reference": "5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/49f3f7a3b30ff5a0e62e9b5d16584451f59de65c", - "reference": "49f3f7a3b30ff5a0e62e9b5d16584451f59de65c", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5", + "reference": "5b32597aa46b83c8b85bb1cf9a6ed4fe7dd980c5", "shasum": "" }, "require": { @@ -1916,7 +1990,7 @@ "type": "community_bridge" } ], - "time": "2022-08-28T21:10:44+00:00" + "time": "2022-08-30T17:01:46+00:00" }, { "name": "maglnet/composer-require-checker", @@ -2388,104 +2462,28 @@ "time": "2022-01-18T12:24:56+00:00" }, { - "name": "php-http/client-common", - "version": "2.5.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/client-common.git", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/d135751167d57e27c74de674d6a30cef2dc8e054", - "reference": "d135751167d57e27c74de674d6a30cef2dc8e054", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0", - "php-http/httplug": "^2.0", - "php-http/message": "^1.6", - "php-http/message-factory": "^1.0", - "psr/http-client": "^1.0", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", - "symfony/polyfill-php80": "^1.17" - }, - "require-dev": { - "doctrine/instantiator": "^1.1", - "guzzlehttp/psr7": "^1.4", - "nyholm/psr7": "^1.2", - "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", - "phpspec/prophecy": "^1.10.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" - }, - "suggest": { - "ext-json": "To detect JSON responses with the ContentTypePlugin", - "ext-libxml": "To detect XML responses with the ContentTypePlugin", - "php-http/cache-plugin": "PSR-6 Cache plugin", - "php-http/logger-plugin": "PSR-3 Logger plugin", - "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Client\\Common\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "Common HTTP Client implementations and tools for HTTPlug", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "common", - "http", - "httplug" - ], - "support": { - "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.5.0" - }, - "time": "2021-11-26T15:01:24+00:00" - }, - { - "name": "php-http/mock-client", - "version": "1.5.0", + "name": "php-http/curl-client", + "version": "2.2.1", "source": { "type": "git", - "url": "https://github.com/php-http/mock-client.git", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" + "url": "https://github.com/php-http/curl-client.git", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", - "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", + "url": "https://api.github.com/repos/php-http/curl-client/zipball/2ed4245a817d859dd0c1d51c7078cdb343cf5233", + "reference": "2ed4245a817d859dd0c1d51c7078cdb343cf5233", "shasum": "" }, "require": { + "ext-curl": "*", "php": "^7.1 || ^8.0", - "php-http/client-common": "^2.0", - "php-http/discovery": "^1.0", + "php-http/discovery": "^1.6", "php-http/httplug": "^2.0", - "php-http/message-factory": "^1.0", + "php-http/message": "^1.2", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", - "symfony/polyfill-php80": "^1.17" + "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, "provide": { "php-http/async-client-implementation": "1.0", @@ -2493,17 +2491,20 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "phpspec/phpspec": "^5.1 || ^6.0" + "guzzlehttp/psr7": "^1.0", + "laminas/laminas-diactoros": "^2.0", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^7.5 || ^9.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "Http\\Mock\\": "src/" + "Http\\Client\\Curl\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2512,23 +2513,22 @@ ], "authors": [ { - "name": "David de Boer", - "email": "david@ddeboer.nl" + "name": "Михаил Красильников", + "email": "m.krasilnikov@yandex.ru" } ], - "description": "Mock HTTP client", - "homepage": "http://httplug.io", + "description": "PSR-18 and HTTPlug Async client with cURL", + "homepage": "http://php-http.org", "keywords": [ - "client", + "curl", "http", - "mock", - "psr7" + "psr-18" ], "support": { - "issues": "https://github.com/php-http/mock-client/issues", - "source": "https://github.com/php-http/mock-client/tree/1.5.0" + "issues": "https://github.com/php-http/curl-client/issues", + "source": "https://github.com/php-http/curl-client/tree/2.2.1" }, - "time": "2021-08-25T07:01:14+00:00" + "time": "2021-12-10T18:02:07+00:00" }, { "name": "phpdocumentor/reflection-common", From 56692e523961f76d180e024eb93255f1c99651bb Mon Sep 17 00:00:00 2001 From: George Steel Date: Fri, 4 Nov 2022 13:58:48 +0000 Subject: [PATCH 37/38] Apply CS Fixes to 2.0.x branch --- src/Document.php | 2 +- src/Document/DocumentDataConsumer.php | 2 +- src/Document/Fragment/DocumentLink.php | 2 +- src/Value/RouteResolverSpec.php | 19 +++++-------------- test/Unit/DefaultLinkResolverTest.php | 5 ++--- test/Unit/Document/Fragment/FactoryTest.php | 5 ++--- 6 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/Document.php b/src/Document.php index a019086..2ffeb62 100644 --- a/src/Document.php +++ b/src/Document.php @@ -52,5 +52,5 @@ public function data(): DocumentData; /** * If the api has been configured with a route for this type of document, the url might be a string */ - public function url(): ?string; + public function url(): string|null; } diff --git a/src/Document/DocumentDataConsumer.php b/src/Document/DocumentDataConsumer.php index 2815baa..41fa693 100644 --- a/src/Document/DocumentDataConsumer.php +++ b/src/Document/DocumentDataConsumer.php @@ -65,7 +65,7 @@ public function data(): DocumentData return $this->data; } - public function url(): ?string + public function url(): string|null { return $this->data->url(); } diff --git a/src/Document/Fragment/DocumentLink.php b/src/Document/Fragment/DocumentLink.php index c89e6ae..16ef226 100644 --- a/src/Document/Fragment/DocumentLink.php +++ b/src/Document/Fragment/DocumentLink.php @@ -101,7 +101,7 @@ public function isEmpty(): bool return false; } - public function url(): ?string + public function url(): string|null { return $this->url; } diff --git a/src/Value/RouteResolverSpec.php b/src/Value/RouteResolverSpec.php index 9daf95a..a163e78 100644 --- a/src/Value/RouteResolverSpec.php +++ b/src/Value/RouteResolverSpec.php @@ -12,21 +12,12 @@ final class RouteResolverSpec implements JsonSerializable, Stringable { - /** @var string */ - private $type; - - /** @var string */ - private $path; - - /** @var array */ - private $resolvers; - /** @param array $resolvers */ - public function __construct(string $type, string $path, array $resolvers) - { - $this->type = $type; - $this->path = $path; - $this->resolvers = $resolvers; + public function __construct( + private string $type, + private string $path, + private array $resolvers, + ) { } public function __toString(): string diff --git a/test/Unit/DefaultLinkResolverTest.php b/test/Unit/DefaultLinkResolverTest.php index 86e6a64..58dc954 100644 --- a/test/Unit/DefaultLinkResolverTest.php +++ b/test/Unit/DefaultLinkResolverTest.php @@ -12,15 +12,14 @@ class DefaultLinkResolverTest extends TestCase { - /** @var DefaultLinkResolver */ - private $linkResolver; + private DefaultLinkResolver $linkResolver; protected function setUp(): void { parent::setUp(); $this->linkResolver = new class extends DefaultLinkResolver { - protected function resolveDocumentLink(DocumentLink $link): ?string + protected function resolveDocumentLink(DocumentLink $link): string|null { return '/some/url'; } diff --git a/test/Unit/Document/Fragment/FactoryTest.php b/test/Unit/Document/Fragment/FactoryTest.php index 86d40dd..4c7cac5 100644 --- a/test/Unit/Document/Fragment/FactoryTest.php +++ b/test/Unit/Document/Fragment/FactoryTest.php @@ -336,7 +336,7 @@ public function documentLinkProvider(): array } /** @dataProvider documentLinkProvider */ - public function testThatDocumentLinksWithReadyMadeUrlsWillHaveTheExpectedValue(string $json, ?string $expect): void + public function testThatDocumentLinksWithReadyMadeUrlsWillHaveTheExpectedValue(string $json, string|null $expect): void { $data = Json::decodeObject($json); $link = Factory::factory($data); @@ -345,12 +345,11 @@ public function testThatDocumentLinksWithReadyMadeUrlsWillHaveTheExpectedValue(s } /** - * @param scalar|null $value * @param class-string $expectedType * * @dataProvider scalarTypes */ - public function testThatTheFactoryCanBeNewedAndInvoked($value, string $expectedType): void + public function testThatTheFactoryCanBeNewedAndInvoked(string|int|float|bool|null $value, string $expectedType): void { $factory = new Factory(); $fragment = $factory($value); From deb4ff9891908d8e04bf0f6ed47ee385a130fc28 Mon Sep 17 00:00:00 2001 From: George Steel Date: Mon, 18 Sep 2023 23:35:29 +0100 Subject: [PATCH 38/38] Fix non-static data provider --- test/Unit/Document/Fragment/FactoryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Unit/Document/Fragment/FactoryTest.php b/test/Unit/Document/Fragment/FactoryTest.php index 4348e14..eef95e8 100644 --- a/test/Unit/Document/Fragment/FactoryTest.php +++ b/test/Unit/Document/Fragment/FactoryTest.php @@ -294,7 +294,7 @@ public function testAMediaLinkWithNonNumericSizeIsExceptional(): void } /** @return array */ - public function documentLinkProvider(): array + public static function documentLinkProvider(): array { return [ 'Valid String Url' => [