From 59d3c912b4cec5eed274384196c18a4f69ecba9e Mon Sep 17 00:00:00 2001 From: ARCANEDEV Date: Wed, 20 Mar 2024 23:41:33 +0000 Subject: [PATCH] Adding Laravel 10 support --- README.md | 2 +- _docs/1-Installation-and-Setup.md | 35 +++++++++++++++++-------------- composer.json | 12 +++++------ phpunit.xml.dist | 12 ++++++----- src/Entities/Title.php | 4 ++-- src/Helpers/Meta.php | 4 ++-- 6 files changed, 37 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index fa8ca44..a821f83 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/SEO-Helper/re * Easy setup & configuration. * Well documented & IDE Friendly. * Well tested with maximum code quality. - * Laravel `5.x` to `9.x` are supported. + * Laravel `5.x` to `10.x` are supported. * Made with :heart: & :coffee:. ## Table of contents diff --git a/_docs/1-Installation-and-Setup.md b/_docs/1-Installation-and-Setup.md index 72f0528..6d7ed46 100644 --- a/_docs/1-Installation-and-Setup.md +++ b/_docs/1-Installation-and-Setup.md @@ -10,22 +10,24 @@ ## Version Compatibility -| Laravel | SEO-Helper | -|:-----------------------------|:---------------------------------------| -| ![Laravel v9.x][laravel_9_x] | ![SEO-Helper v5.x][seo_helper_5_x] | -| ![Laravel v8.x][laravel_8_x] | ![SEO-Helper v4.x][seo_helper_4_x] | -| ![Laravel v7.x][laravel_7_x] | ![SEO-Helper v3.x][seo_helper_3_x] | -| ![Laravel v6.x][laravel_6_x] | ![SEO-Helper v2.x][seo_helper_2_x] | -| ![Laravel v5.8][laravel_5_8] | ![SEO-Helper v1.7.x][seo_helper_1_7_x] | -| ![Laravel v5.7][laravel_5_7] | ![SEO-Helper v1.6.x][seo_helper_1_6_x] | -| ![Laravel v5.6][laravel_5_6] | ![SEO-Helper v1.5.x][seo_helper_1_5_x] | -| ![Laravel v5.5][laravel_5_5] | ![SEO-Helper v1.4.x][seo_helper_1_4_x] | -| ![Laravel v5.4][laravel_5_4] | ![SEO-Helper v1.3.x][seo_helper_1_3_x] | -| ![Laravel v5.3][laravel_5_3] | ![SEO-Helper v1.2.x][seo_helper_1_2_x] | -| ![Laravel v5.2][laravel_5_2] | ![SEO-Helper v1.2.x][seo_helper_1_2_x] | -| ![Laravel v5.1][laravel_5_1] | ![SEO-Helper v1.2.x][seo_helper_1_2_x] | -| ![Laravel v5.0][laravel_5_0] | ![SEO-Helper v1.1.x][seo_helper_1_1_x] | - +| Laravel | SEO-Helper | +|:-------------------------------|:---------------------------------------| +| ![Laravel v10.x][laravel_10_x] | ![SEO-Helper v6.x][seo_helper_6_x] | +| ![Laravel v9.x][laravel_9_x] | ![SEO-Helper v5.x][seo_helper_5_x] | +| ![Laravel v8.x][laravel_8_x] | ![SEO-Helper v4.x][seo_helper_4_x] | +| ![Laravel v7.x][laravel_7_x] | ![SEO-Helper v3.x][seo_helper_3_x] | +| ![Laravel v6.x][laravel_6_x] | ![SEO-Helper v2.x][seo_helper_2_x] | +| ![Laravel v5.8][laravel_5_8] | ![SEO-Helper v1.7.x][seo_helper_1_7_x] | +| ![Laravel v5.7][laravel_5_7] | ![SEO-Helper v1.6.x][seo_helper_1_6_x] | +| ![Laravel v5.6][laravel_5_6] | ![SEO-Helper v1.5.x][seo_helper_1_5_x] | +| ![Laravel v5.5][laravel_5_5] | ![SEO-Helper v1.4.x][seo_helper_1_4_x] | +| ![Laravel v5.4][laravel_5_4] | ![SEO-Helper v1.3.x][seo_helper_1_3_x] | +| ![Laravel v5.3][laravel_5_3] | ![SEO-Helper v1.2.x][seo_helper_1_2_x] | +| ![Laravel v5.2][laravel_5_2] | ![SEO-Helper v1.2.x][seo_helper_1_2_x] | +| ![Laravel v5.1][laravel_5_1] | ![SEO-Helper v1.2.x][seo_helper_1_2_x] | +| ![Laravel v5.0][laravel_5_0] | ![SEO-Helper v1.1.x][seo_helper_1_1_x] | + +[laravel_10_x]: https://img.shields.io/badge/v10.x-supported-brightgreen.svg?style=flat-square "Laravel v10.x" [laravel_9_x]: https://img.shields.io/badge/v9.x-supported-brightgreen.svg?style=flat-square "Laravel v9.x" [laravel_8_x]: https://img.shields.io/badge/v8.x-supported-brightgreen.svg?style=flat-square "Laravel v8.x" [laravel_7_x]: https://img.shields.io/badge/v7.x-supported-brightgreen.svg?style=flat-square "Laravel v7.x" @@ -40,6 +42,7 @@ [laravel_5_1]: https://img.shields.io/badge/v5.1-supported-brightgreen.svg?style=flat-square "Laravel v5.1" [laravel_5_0]: https://img.shields.io/badge/v5.0-supported-brightgreen.svg?style=flat-square "Laravel v5.0" +[seo_helper_6_x]: https://img.shields.io/badge/version-6.x-blue.svg?style=flat-square "SEO-Helper v6.x" [seo_helper_5_x]: https://img.shields.io/badge/version-5.x-blue.svg?style=flat-square "SEO-Helper v5.x" [seo_helper_4_x]: https://img.shields.io/badge/version-4.x-blue.svg?style=flat-square "SEO-Helper v4.x" [seo_helper_3_x]: https://img.shields.io/badge/version-3.x-blue.svg?style=flat-square "SEO-Helper v3.x" diff --git a/composer.json b/composer.json index fd85564..d198d6f 100644 --- a/composer.json +++ b/composer.json @@ -18,15 +18,15 @@ "license": "MIT", "require": { "php": "^8.1", - "arcanedev/php-html": "^6.0", - "arcanedev/support": "^9.0" + "arcanedev/php-html": "^7.0", + "arcanedev/support": "^10.0" }, "require-dev": { "ext-dom": "*", - "laravel/framework": "^9.0", + "laravel/framework": "^10.0", "laravel/pint": "^1.14", - "orchestra/testbench-core": "^7.0", - "phpunit/phpunit": "^9.5.10" + "orchestra/testbench-core": "^8.23.4", + "phpunit/phpunit": "^10.0.7" }, "autoload": { "psr-4": { @@ -48,7 +48,7 @@ }, "extra": { "branch-alias": { - "dev-develop": "5.x-dev" + "dev-develop": "6.x-dev" }, "laravel": { "providers": [ diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 8da88de..900b09f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -4,15 +4,17 @@ bootstrap="vendor/autoload.php" colors="true" > + + + ./src + + - ./tests/ + ./tests/ - - - ./src - + diff --git a/src/Entities/Title.php b/src/Entities/Title.php index 9d2d6cc..8991205 100644 --- a/src/Entities/Title.php +++ b/src/Entities/Title.php @@ -4,7 +4,7 @@ namespace Arcanedev\SeoHelper\Entities; -use Arcanedev\Html\Elements\Element; +use Arcanedev\Html\Elements\HtmlElement; use Arcanedev\SeoHelper\Contracts\Entities\Title as TitleContract; use Arcanedev\SeoHelper\Exceptions\InvalidArgumentException; use Arcanedev\SeoHelper\Traits\Configurable; @@ -268,7 +268,7 @@ public function render(): string $this->isTitleFirst() ? $this->renderTitleFirst() : $this->renderTitleLast() ); - return Element::withTag('title')->html($title)->toHtml(); + return HtmlElement::withTag('title')->html($title)->toHtml(); } /** diff --git a/src/Helpers/Meta.php b/src/Helpers/Meta.php index 79c2075..23211d7 100644 --- a/src/Helpers/Meta.php +++ b/src/Helpers/Meta.php @@ -4,7 +4,7 @@ namespace Arcanedev\SeoHelper\Helpers; -use Arcanedev\Html\Elements\Element; +use Arcanedev\Html\Elements\HtmlElement; use Arcanedev\Html\Elements\Meta as HtmlMeta; use Arcanedev\SeoHelper\Contracts\Helpers\Meta as MetaContract; use Arcanedev\SeoHelper\Exceptions\InvalidArgumentException; @@ -222,7 +222,7 @@ private function setContent(array|string $content): static */ private function renderLink(): string { - return Element::withTag('link')->attributes([ + return HtmlElement::withTag('link')->attributes([ 'rel' => $this->getName(false), 'href' => $this->getContent(), ])->toHtml();