Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Event/SEOneSpecificEvents/SEOneMicroDataEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

class SEOneMicroDataEvent extends ActionEvent
{
protected string $title = '';
protected string $data = '';
protected string $view;
protected ?int $view_id;
protected $parameters = [];
public const BETTER_SEO_MICRO_DATA = 'better.seo.page.micro.data';
public const string BETTER_SEO_MICRO_DATA = 'better.seo.page.micro.data';

public function __construct(string $view, ?int $view_id, array $parameters)
{
Expand All @@ -41,14 +41,14 @@ public function setParameters(array $parameters): self
return $this;
}

public function getTitle(): string
public function getData(): string
{
return $this->title;
return $this->data;
}

public function setTitle(string $title): self
public function setData(string $data): self
{
$this->title = $title;
$this->data = $data;

return $this;
}
Expand Down
12 changes: 6 additions & 6 deletions Event/SEOneSpecificEvents/SEOnePageDescEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@

class SEOnePageDescEvent extends ActionEvent
{
protected string $title = '';
protected string $desc = '';
protected string $view;
protected ?int $view_id;

public const BETTER_SEO_PAGE_DESC = 'better.seo.page.desc';
public const string BETTER_SEO_PAGE_DESC = 'better.seo.page.desc';

public function __construct(string $view, ?int $view_id)
{
$this->view = $view;
$this->view_id = $view_id;
}

public function getTitle(): string
public function getDesc(): string
{
return $this->title;
return $this->desc;
}

public function setTitle(string $title): self
public function setDesc(string $desc): self
{
$this->title = $title;
$this->desc = $desc;

return $this;
}
Expand Down
2 changes: 1 addition & 1 deletion Event/SEOneSpecificEvents/SEOnePageTitleEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class SEOnePageTitleEvent extends ActionEvent
protected string $view;
protected ?int $view_id;

public const BETTER_SEO_PAGE_TITLE = 'better.seo.page.title';
public const string BETTER_SEO_PAGE_TITLE = 'better.seo.page.title';

public function __construct(string $view, ?int $view_id)
{
Expand Down
8 changes: 4 additions & 4 deletions EventListeners/SeoDefaultListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public function getSeoPageH1(SEOnePageH1Event $event): void

public function getSeoMicroData(SEOneMicroDataEvent $event): void
{
$title = $this->defaultManager->getSeoMicroData($event->getViewId(), $event->getView(), $event->getParameters());
$event->setTitle($title);
$data = $this->defaultManager->getSeoMicroData($event->getViewId(), $event->getView(), $event->getParameters());
$event->setData($data);
}

public function getSeoBreadcrumb(SEOneBreadcrumbEvent $event): void
Expand All @@ -57,7 +57,7 @@ public function getSeoBreadcrumb(SEOneBreadcrumbEvent $event): void

public function getSeoPageDesc(SEOnePageDescEvent $event): void
{
$title = $this->defaultManager->getSeoPageDesc($event->getViewId(), $event->getView());
$event->setTitle($title);
$desc = $this->defaultManager->getSeoPageDesc($event->getViewId(), $event->getView());
$event->setDesc($desc);
}
}
30 changes: 30 additions & 0 deletions Hook/Theme/SEOneThemeHook.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

declare(strict_types=1);

namespace SEOne\Hook\Theme;

use Thelia\Core\Hook\Theme\ThemeHookInterface;
use Twig\Environment;

final readonly class SEOneThemeHook implements ThemeHookInterface
{
public function __construct(
private Environment $twig,
) {
}

public function supports(string $hookName): bool
{
return \in_array($hookName, ['layout.head.top', 'layout.head.bottom'], true);
}

public function render(string $hookName, array $parameters): string
{
return match ($hookName) {
'layout.head.top' => $this->twig->render('@SEOneModule/theme-hook/head-top.html.twig',$parameters),
'layout.head.bottom' => $this->twig->render('@SEOneModule/theme-hook/head-bottom.html.twig',$parameters),
default => ''
};
}
}
8 changes: 4 additions & 4 deletions SEOne.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

class SEOne extends BaseModule
{
public const DOMAIN_NAME = 'seone';
public const BETTER_SE0_LIMIT_CONFIG_KEY = 'seone_limit';
public const SEO_CANONICAL_META_KEY = 'seo_canonical_meta';
public const string DOMAIN_NAME = 'seone';
public const string BETTER_SE0_LIMIT_CONFIG_KEY = 'seone_limit';
public const string SEO_CANONICAL_META_KEY = 'seo_canonical_meta';

public function postActivation(?ConnectionInterface $con = null): void
{
Expand Down Expand Up @@ -62,7 +62,7 @@ public static function getDefaultRobotsContent(string $domainName): string
public static function configureServices(ServicesConfigurator $servicesConfigurator): void
{
$servicesConfigurator->load(self::getModuleCode().'\\', __DIR__)
->exclude([THELIA_MODULE_DIR . ucfirst(self::getModuleCode()). "/I18n/*"])
->exclude([__DIR__.'/I18n/*'])
->autowire(true)
->autoconfigure(true);
}
Expand Down
5 changes: 2 additions & 3 deletions Service/SeoToolsService.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ public function getSeoPageDesc(string $view, ?int $view_id): string
event: $pageDescEvent,
eventName: SEOnePageDescEvent::BETTER_SEO_PAGE_DESC
);

return $pageDescEvent->getTitle() ?? '';
return $pageDescEvent->getDesc() ?? '';
}

public function getSeoMicroData(string $view, ?int $view_id, array $params = []): string
Expand All @@ -84,7 +83,7 @@ public function getSeoMicroData(string $view, ?int $view_id, array $params = [])
eventName: SEOneMicroDataEvent::BETTER_SEO_MICRO_DATA
);

return $microDataEvent->getTitle() ?? '';
return $microDataEvent->getData() ?? '';
}

public function getSeoBreadcrumb(string $view, ?int $view_id, array $params = []): array
Expand Down
1 change: 1 addition & 0 deletions templates/theme-hook/head-bottom.html.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ SEOneMicroData()|raw }}
19 changes: 19 additions & 0 deletions templates/theme-hook/head-top.html.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{% set pageTitle = title|default(SEOnePageTitle()) %}
{% set pageDesc = description|default(SEOnePageDesc()) %}
{% set pageOgType = og_type|default('website') %}
{% set canonical = SEOnePageCanonical() %}

<title>{{ pageTitle }}</title>

<meta name="description" content="{{ pageDesc }}">
<link rel="canonical" href="{{ canonical }}"/>

{{ SEOneBreadcrumbJsonLd(breadcrumb)|raw }}

<meta property="og:type" content="{{ pageOgType }}">
<meta property="og:url" content="{{ canonical }}">
<meta property="og:title" content="{{ pageTitle }}">
<meta property="og:description" content="{{ pageDesc }}">
<meta name="twitter:title" content="{{ pageTitle }}">
<meta name="twitter:description" content="{{ pageDesc }}">
{{ SEOneHreflang()|raw }}