From caecb97d98b95b7b33290a00476ecd857158fc69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 20:12:00 +0000 Subject: [PATCH 1/4] build(deps): bump rize/uri-template from 0.3.6 to 0.3.7 Bumps [rize/uri-template](https://github.com/rize/UriTemplate) from 0.3.6 to 0.3.7. - [Release notes](https://github.com/rize/UriTemplate/releases) - [Commits](https://github.com/rize/UriTemplate/compare/0.3.6...0.3.7) --- updated-dependencies: - dependency-name: rize/uri-template dependency-type: direct:production 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 baf7ab5..2dee9cb 100644 --- a/composer.lock +++ b/composer.lock @@ -296,16 +296,16 @@ }, { "name": "rize/uri-template", - "version": "0.3.6", + "version": "0.3.7", "source": { "type": "git", "url": "https://github.com/rize/UriTemplate.git", - "reference": "34efe65c79710eed0883884f2285ae6d4a0aad19" + "reference": "0c78eaa2e5241faf6c9f246beb53ef3fb31057fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rize/UriTemplate/zipball/34efe65c79710eed0883884f2285ae6d4a0aad19", - "reference": "34efe65c79710eed0883884f2285ae6d4a0aad19", + "url": "https://api.github.com/repos/rize/UriTemplate/zipball/0c78eaa2e5241faf6c9f246beb53ef3fb31057fd", + "reference": "0c78eaa2e5241faf6c9f246beb53ef3fb31057fd", "shasum": "" }, "require": { @@ -338,7 +338,7 @@ ], "support": { "issues": "https://github.com/rize/UriTemplate/issues", - "source": "https://github.com/rize/UriTemplate/tree/0.3.6" + "source": "https://github.com/rize/UriTemplate/tree/0.3.7" }, "funding": [ { @@ -354,7 +354,7 @@ "type": "open_collective" } ], - "time": "2024-03-10T08:07:49+00:00" + "time": "2024-08-29T15:43:27+00:00" }, { "name": "symfony/deprecation-contracts", From 17c7710d79b9e9334c50abcbd37cfbfb3aa7ff8d Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Fri, 30 Aug 2024 07:45:38 -0400 Subject: [PATCH 2/4] fix: use correct type in category structure --- src/PHPDraft/Model/Category.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PHPDraft/Model/Category.php b/src/PHPDraft/Model/Category.php index 7355798..03a04e2 100644 --- a/src/PHPDraft/Model/Category.php +++ b/src/PHPDraft/Model/Category.php @@ -12,7 +12,7 @@ namespace PHPDraft\Model; -use PHPDraft\Model\Elements\ObjectStructureElement; +use PHPDraft\Model\Elements\BasicStructureElement; /** * Class Category. @@ -22,7 +22,7 @@ class Category extends HierarchyElement /** * API Structure element. * - * @var ObjectStructureElement[] + * @var BasicStructureElement[] */ public array $structures = []; From 48573a5d9c67922d7baebd7079d9eb97540bfa6b Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Fri, 30 Aug 2024 13:48:44 +0200 Subject: [PATCH 3/4] fix: restore ObjectStructureElement import in Category --- src/PHPDraft/Model/Category.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PHPDraft/Model/Category.php b/src/PHPDraft/Model/Category.php index 03a04e2..1875c44 100644 --- a/src/PHPDraft/Model/Category.php +++ b/src/PHPDraft/Model/Category.php @@ -13,6 +13,7 @@ namespace PHPDraft\Model; use PHPDraft\Model\Elements\BasicStructureElement; +use PHPDraft\Model\Elements\ObjectStructureElement; /** * Class Category. From 5fd2f5cd971af5e40e192d03148ba71adac9f19e Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Fri, 30 Aug 2024 07:51:23 -0400 Subject: [PATCH 4/4] fix: allow BasicStructureElement in BaseTemplateRenderer --- src/PHPDraft/Out/BaseTemplateRenderer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PHPDraft/Out/BaseTemplateRenderer.php b/src/PHPDraft/Out/BaseTemplateRenderer.php index b8052ca..765e5ec 100644 --- a/src/PHPDraft/Out/BaseTemplateRenderer.php +++ b/src/PHPDraft/Out/BaseTemplateRenderer.php @@ -14,7 +14,7 @@ use Lukasoppermann\Httpstatus\Httpstatus; use PHPDraft\Model\Category; -use PHPDraft\Model\Elements\ObjectStructureElement; +use PHPDraft\Model\Elements\BasicStructureElement; abstract class BaseTemplateRenderer { @@ -63,7 +63,7 @@ abstract class BaseTemplateRenderer /** * Structures used in all data. * - * @var ObjectStructureElement[] + * @var BasicStructureElement[] */ protected array $base_structures = []; }