Use attributes instead of service annotations

hofff · Feb 28, 2024 · c65f456 · c65f456
1 parent 8f7dabb
commit c65f456
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/src/EventListener/Dca/Page/RootInheritListener.php b/src/EventListener/Dca/Page/RootInheritListener.php
@@ -4,7 +4,7 @@
 
 namespace Hofff\Contao\TrueUrl\EventListener\Dca\Page;
 
-use Contao\CoreBundle\ServiceAnnotation\Callback;
+use Contao\CoreBundle\DependencyInjection\Attribute\AsCallback;
 use Contao\DataContainer;
 use Contao\PageModel;
 use Doctrine\DBAL\Connection;
@@ -20,11 +20,8 @@ public function __construct(private readonly Connection $connection)
     {
     }
 
-    /**
-     * @param array<string,mixed> $set
-     *
-     * @Callback(table="tl_page", target="config.oncreate", priority=128)
-     */
+    /** @param array<string,mixed> $set */
+    #[AsCallback('tl_page', 'config.oncreate', priority:128)]
     public function onCreate(string $table, string|int $recordId, array $set): void
     {
         if (! $set['pid']) {
@@ -54,10 +51,8 @@ public function onCreate(string $table, string|int $recordId, array $set): void
         );
     }
 
-    /**
-     * @Callback(table="tl_page", target="fields.bbit_turl_rootInheritProxy.load")
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
+    /** @SuppressWarnings(PHPMD.UnusedFormalParameter) */
+    #[AsCallback('tl_page', 'fields.bbit_turl_rootInheritProxy.load')]
     public function onLoad(mixed $varValue, DataContainer $dataContainer): mixed
     {
         if (! $dataContainer->activeRecord) {
@@ -67,7 +62,7 @@ public function onLoad(mixed $varValue, DataContainer $dataContainer): mixed
         return $dataContainer->activeRecord->bbit_turl_rootInherit ?: 'normal';
     }
 
-    /** @Callback(table="tl_page", target="fields.bbit_turl_rootInheritProxy.save") */
+    #[AsCallback('tl_page', 'fields.bbit_turl_rootInheritProxy.save')]
     public function onSave(mixed $newValue, DataContainer $dataContainer): mixed
     {
         if (! $dataContainer->activeRecord) {
@@ -83,7 +78,7 @@ public function onSave(mixed $newValue, DataContainer $dataContainer): mixed
         return null;
     }
 
-    /** @Callback(table="tl_page", target="config.onsubmit", priority=-1) */
+    #[AsCallback('tl_page', 'config.onsubmit', priority: -1)]
     public function onSubmit(DataContainer $dataContainer): void
     {
         if (! isset($this->changedValues[$dataContainer->id]) || ! $dataContainer->activeRecord) {

diff --git a/src/EventListener/Hook/CustomRegularExpressionListener.php b/src/EventListener/Hook/CustomRegularExpressionListener.php
@@ -4,13 +4,13 @@
 
 namespace Hofff\Contao\TrueUrl\EventListener\Hook;
 
-use Contao\CoreBundle\ServiceAnnotation\Hook;
+use Contao\CoreBundle\DependencyInjection\Attribute\AsHook;
 use Contao\Widget;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function preg_match;
 
-/** @Hook("addCustomRegexp") */
+#[AsHook('addCustomRegexp')]
 final class CustomRegularExpressionListener
 {
     public function __construct(private readonly TranslatorInterface $translator)

diff --git a/src/EventListener/Hook/LoadDataContainerListener.php b/src/EventListener/Hook/LoadDataContainerListener.php
@@ -4,10 +4,10 @@
 
 namespace Hofff\Contao\TrueUrl\EventListener\Hook;
 
-use Contao\CoreBundle\ServiceAnnotation\Hook;
+use Contao\CoreBundle\DependencyInjection\Attribute\AsHook;
 use Hofff\Contao\TrueUrl\EventListener\Dca\Page\GenerateLabelListener;
 
-/** @Hook("loadDataContainer") */
+#[AsHook('loadDataContainer')]
 final class LoadDataContainerListener
 {
     /** @SuppressWarnings(PHPMD.Superglobals) */

diff --git a/src/EventListener/Hook/PageDetailsListener.php b/src/EventListener/Hook/PageDetailsListener.php
@@ -4,11 +4,11 @@
 
 namespace Hofff\Contao\TrueUrl\EventListener\Hook;
 
-use Contao\CoreBundle\ServiceAnnotation\Hook;
+use Contao\CoreBundle\DependencyInjection\Attribute\AsHook;
 use Contao\PageModel;
 use Hofff\Contao\TrueUrl\TrueURL;
 
-/** @Hook("loadPageDetails") */
+#[AsHook('loadPageDetails')]
 final class PageDetailsListener
 {
     public function __construct(private readonly TrueURL $trueUrl)