Rector

Author: qzminski

contao/dca/tl_cfg_tag.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Codefog\TagsBundle\Driver;
+use Contao\DataContainer;
 
 /*
  * Tags Bundle for Contao Open Source CMS.
@@ -33,9 +34,9 @@
     // List
     'list' => [
         'sorting' => [
-            'mode' => 1,
+            'mode' => DataContainer::MODE_SORTED,
             'fields' => ['name'],
-            'flag' => 1,
+            'flag' => DataContainer::SORT_INITIAL_LETTER_ASC,
             'panelLayout' => 'filter;cfg_sort,search,limit',
             'panel_callback' => [
                 'cfg_sort' => ['codefog_tags.listener.data_container.tag', 'onPanelCallback'],

src/DependencyInjection/Compiler/ManagerPass.php

@@ -12,19 +12,13 @@ class ManagerPass implements CompilerPassInterface
 {
     public const TAG_NAME = 'codefog_tags.manager';
 
-    /**
-     * @var string
-     */
-    private $registryName;
-
     /**
      * ManagerPass constructor.
      *
      * @param string $registryName
      */
-    public function __construct($registryName)
+    public function __construct(private $registryName)
     {
-        $this->registryName = $registryName;
     }
 
     public function process(ContainerBuilder $container): void

src/DependencyInjection/Configuration.php

@@ -17,7 +17,7 @@ public function getConfigTreeBuilder(): TreeBuilder
             $rootNode = $treeBuilder->getRootNode();
         } else {
             // BC layer for symfony/config 4.1 and older
-            $rootNode = $treeBuilder->root('codefog_tags');
+            $rootNode = $treeBuilder->getRootNode();
         }
 
         $rootNode

src/EventListener/DataContainer/TagListener.php

@@ -21,29 +21,14 @@
 
 class TagListener
 {
-    /**
-     * @var Connection
-     */
-    private $db;
-
-    /**
-     * @var ManagerRegistry
-     */
-    private $registry;
-
-    /**
-     * @var RequestStack
-     */
-    private $requestStack;
-
     /**
      * TagListener constructor.
      */
-    public function __construct(Connection $db, ManagerRegistry $registry, RequestStack $requestStack)
-    {
-        $this->db = $db;
-        $this->registry = $registry;
-        $this->requestStack = $requestStack;
+    public function __construct(
+        private readonly Connection $db,
+        private readonly ManagerRegistry $registry,
+        private readonly RequestStack $requestStack,
+    ) {
     }
 
     /**

src/EventListener/InsertTagsListener.php

@@ -9,17 +9,11 @@
 
 class InsertTagsListener
 {
-    /**
-     * @var ManagerRegistry
-     */
-    private $registry;
-
     /**
      * TagContainer constructor.
      */
-    public function __construct(ManagerRegistry $registry)
+    public function __construct(private readonly ManagerRegistry $registry)
     {
-        $this->registry = $registry;
     }
 
     /**

src/EventListener/TagManagerListener.php

@@ -20,26 +20,11 @@
 
 class TagManagerListener
 {
-    /**
-     * @var ManagerRegistry
-     */
-    private $registry;
-
-    /**
-     * @var RequestStack
-     */
-    private $requestStack;
-
-    /**
-     * @var ScopeMatcher
-     */
-    private $scopeMatcher;
-
-    public function __construct(ManagerRegistry $registry, RequestStack $requestStack, ScopeMatcher $scopeMatcher)
-    {
-        $this->registry = $registry;
-        $this->requestStack = $requestStack;
-        $this->scopeMatcher = $scopeMatcher;
+    public function __construct(
+        private readonly ManagerRegistry $registry,
+        private readonly RequestStack $requestStack,
+        private readonly ScopeMatcher $scopeMatcher,
+    ) {
     }
 
     /**

src/Finder/SourceFinder.php

@@ -19,8 +19,8 @@
 class SourceFinder
 {
     public function __construct(
-        private Connection $connection,
-        private DcaRelationsManager $dcaRelationsManager,
+        private readonly Connection $connection,
+        private readonly DcaRelationsManager $dcaRelationsManager,
     ) {
     }
 
@@ -47,7 +47,7 @@ public function findMultiple(SourceCriteria $criteria): array
         $values = DcaRelationsModel::getReferenceValues($criteria->getSourceTable(), $criteria->getSourceField(), $ids);
         $values = array_values(array_unique($values));
 
-        return array_map('intval', $values);
+        return array_map(intval(...), $values);
     }
 
     /**
@@ -67,7 +67,7 @@ public function findRelatedSourceRecords(SourceCriteria $criteria, int|null $lim
 
         $tagIds = DcaRelationsModel::getRelatedValues($criteria->getSourceTable(), $criteria->getSourceField(), $criteria->getIds());
         $tagIds = array_values(array_unique($tagIds));
-        $tagIds = array_map('intval', $tagIds);
+        $tagIds = array_map(intval(...), $tagIds);
 
         if (0 === \count($tagIds)) {
             return [];

src/Finder/TagFinder.php

@@ -26,7 +26,7 @@ public function count(TagCriteria $criteria): int
     {
         try {
             [$columns, $values, $options] = $this->parseCriteria($criteria);
-        } catch (NoTagsException $e) {
+        } catch (NoTagsException) {
             return 0;
         }
 
@@ -44,7 +44,7 @@ public function findSingle(TagCriteria $criteria): Tag|null
     {
         try {
             [$columns, $values, $options] = $this->parseCriteria($criteria);
-        } catch (NoTagsException $e) {
+        } catch (NoTagsException) {
             return null;
         }
 
@@ -62,7 +62,7 @@ public function findMultiple(TagCriteria $criteria): array
     {
         try {
             [$columns, $values, $options] = $this->parseCriteria($criteria);
-        } catch (NoTagsException $e) {
+        } catch (NoTagsException) {
             return [];
         }
 
@@ -115,7 +115,7 @@ public function getTopTagIds(TagCriteria $criteria, int|null $limit = null, bool
     {
         // No array_unique() here!
         $tagIds = DcaRelationsModel::getRelatedValues($criteria->getSourceTable(), $criteria->getSourceField(), $criteria->getSourceIds());
-        $tagIds = array_map('intval', $tagIds);
+        $tagIds = array_map(intval(...), $tagIds);
 
         if (0 === \count($tagIds)) {
             return [];
@@ -168,7 +168,7 @@ protected function parseCriteria(TagCriteria $criteria): array
                 $columns[] = 'id=?';
                 $values[] = (int) $ids[0];
             } else {
-                $columns[] = 'id IN ('.implode(',', array_map('intval', $ids)).')';
+                $columns[] = 'id IN ('.implode(',', array_map(intval(...), $ids)).')';
             }
         }
 
@@ -186,7 +186,7 @@ protected function parseCriteria(TagCriteria $criteria): array
         if (\count($sourceIds = $criteria->getSourceIds()) > 0) {
             $ids = DcaRelationsModel::getRelatedValues($criteria->getSourceTable(), $criteria->getSourceField(), $sourceIds);
             $ids = array_values(array_unique($ids));
-            $ids = array_map('intval', $ids);
+            $ids = array_map(intval(...), $ids);
 
             if (0 === \count($ids)) {
                 throw new NoTagsException();
@@ -202,7 +202,7 @@ protected function parseCriteria(TagCriteria $criteria): array
         if ($criteria->isUsedOnly()) {
             $ids = DcaRelationsModel::getRelatedValues($criteria->getSourceTable(), $criteria->getSourceField());
             $ids = array_values(array_unique($ids));
-            $ids = array_map('intval', $ids);
+            $ids = array_map(intval(...), $ids);
 
             if (0 === \count($ids)) {
                 throw new NoTagsException();

src/Manager/DefaultManager.php

@@ -83,7 +83,7 @@ public function getFilteredTags(array $values, string|null $source = null): arra
 
     public function updateDcaField(string $table, string $field, array &$config): void
     {
-        $config['eval']['tagsCreate'] = $config['eval']['tagsCreate'] ?? true;
+        $config['eval']['tagsCreate'] ??= true;
 
         // Set the relation
         if (!isset($config['sql'])) {

src/Tag.php

@@ -6,35 +6,23 @@
 
 class Tag
 {
-    /**
-     * Tag ID.
-     *
-     * @var string
-     */
-    private $value;
-
-    /**
-     * Tag name.
-     *
-     * @var string
-     */
-    private $name;
-
-    /**
-     * Data.
-     *
-     * @var array
-     */
-    private $data;
-
     /**
      * Tag constructor.
      */
-    public function __construct(string $value, string $name, array $data = [])
-    {
-        $this->value = $value;
-        $this->name = $name;
-        $this->data = $data;
+    public function __construct(
+        /**
+         * Tag ID.
+         */
+        private string $value,
+        /**
+         * Tag name.
+         */
+        private string $name,
+        /**
+         * Data.
+         */
+        private array $data = [],
+    ) {
     }
 
     public function getValue(): string