From 65b25baf294cf54b0c75fb3ac334ab335c98b4fc Mon Sep 17 00:00:00 2001 From: Erika Heidi Date: Mon, 1 May 2023 10:31:31 +0200 Subject: [PATCH 1/3] Updating dependencies --- composer.lock | 12 +++++----- src/Content.php | 22 +++++++++---------- src/ContentParser.php | 20 +++++++---------- src/CustomTagParser/AudioTagParser.php | 2 +- src/CustomTagParser/GithubCustomTagParser.php | 14 ++++++------ .../TwitterCustomTagParser.php | 8 +++---- src/CustomTagParser/VideoTagParser.php | 2 +- .../YoutubeCustomTagParser.php | 10 ++++----- src/CustomTagParserInterface.php | 2 +- tests/Feature/ContentParserTest.php | 14 ++++++------ tests/Feature/ContentTest.php | 10 ++++----- 11 files changed, 56 insertions(+), 60 deletions(-) diff --git a/composer.lock b/composer.lock index aadb0c0..ab9a14a 100644 --- a/composer.lock +++ b/composer.lock @@ -3188,16 +3188,16 @@ }, { "name": "sebastian/diff", - "version": "5.0.1", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02" + "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/aae9a0a43bff37bd5d8d0311426c87bf36153f02", - "reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b", + "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b", "shasum": "" }, "require": { @@ -3243,7 +3243,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.0.1" + "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3" }, "funding": [ { @@ -3251,7 +3251,7 @@ "type": "github" } ], - "time": "2023-03-23T05:12:41+00:00" + "time": "2023-05-01T07:48:21+00:00" }, { "name": "sebastian/environment", diff --git a/src/Content.php b/src/Content.php index 32e857f..0e3991f 100644 --- a/src/Content.php +++ b/src/Content.php @@ -8,17 +8,17 @@ */ class Content { - /** @var string Raw content */ - public $raw; + /** @var ?string Raw content */ + public ?string $raw = ""; /** @var array Front-matter key-pairs */ - public $front_matter = []; + public array $front_matter = []; /** @var string Body of content in markdown */ - public $body_markdown; + public string $body_markdown = ""; /** @var string Body of content in html */ - public $body_html; + public string $body_html = ""; /** * Content constructor. @@ -56,10 +56,10 @@ public function frontMatterHas(string $key): bool /** * @param string $key - * @param string $default_value - * @return string|null + * @param ?string $default_value + * @return ?string */ - public function frontMatterGet(string $key, $default_value = null) + public function frontMatterGet(string $key, ?string $default_value = null): ?string { if ($this->frontMatterHas($key)) { return $this->front_matter[$key] ?: $default_value; @@ -72,7 +72,7 @@ public function frontMatterGet(string $key, $default_value = null) * @param string $key * @param string $value */ - public function frontMatterSet(string $key, string $value) + public function frontMatterSet(string $key, string $value): void { $this->front_matter[$key] = $value; } @@ -81,7 +81,7 @@ public function frontMatterSet(string $key, string $value) * @param ContentParser $parser * @param bool $parse_markdown */ - public function parse(ContentParser $parser, bool $parse_markdown = false) + public function parse(ContentParser $parser, bool $parse_markdown = false): void { $parser->parse($this, $parse_markdown); } @@ -100,7 +100,7 @@ public function getFrontMatter(): string return $content; } - public function updateRaw() + public function updateRaw(): void { $raw = $this->getFrontMatter(); $raw .= $this->body_markdown; diff --git a/src/ContentParser.php b/src/ContentParser.php index d899e71..da9d57b 100644 --- a/src/ContentParser.php +++ b/src/ContentParser.php @@ -23,19 +23,19 @@ class ContentParser { /** @var string */ - protected $original_content; + protected string $original_content; /** @var array */ - protected $front_matter; + protected array $front_matter; /** @var string */ - protected $markdown; + protected string $markdown; /** @var array */ - protected $custom_tag_parsers; + protected array $custom_tag_parsers; /** @var array */ - protected $parser_params; + protected array $parser_params; /** * ContentParser constructor. @@ -51,7 +51,7 @@ public function __construct(array $parser_params = []) $this->addCustomTagParser('github', new GithubCustomTagParser()); } - public function addCustomTagParser($name, CustomTagParserInterface $tag_parser) + public function addCustomTagParser($name, CustomTagParserInterface $tag_parser): void { $this->custom_tag_parsers[$name] = $tag_parser; } @@ -98,11 +98,7 @@ public function getFrontMatter(string $front_matter): array return $vars; } - /** - * @return string|string[]|null - * @throws \Exception - */ - public function getHtmlBody($markdown) + public function getHtmlBody($markdown): string|null { $environment = new Environment(); $environment->addExtension(new CommonMarkCoreExtension()); @@ -128,7 +124,7 @@ public function getHtmlBody($markdown) * @param string $text * @return string */ - public function parseSpecial($text) + public function parseSpecial(string $text): string { return preg_replace_callback_array([ '/^\{%\s(.*)\s(.*)\s%}/m' => function ($match) { diff --git a/src/CustomTagParser/AudioTagParser.php b/src/CustomTagParser/AudioTagParser.php index 2b902d4..0faf94a 100644 --- a/src/CustomTagParser/AudioTagParser.php +++ b/src/CustomTagParser/AudioTagParser.php @@ -6,7 +6,7 @@ class AudioTagParser implements CustomTagParserInterface { - public function parse($tag_value, array $params = []) + public function parse(string $tag_value, array $params = []): string { return "