Merge branch 'hotfix/fix_phpcq' into 'release/2.3.0'

Fix PHPCQ See merge request metamodels/core!342
MetaModels · Sep 25, 2024 · 6a278bf · 6a278bf
2 parents 2d1daf7 + 0ddc2db
commit 6a278bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 76 deletions.
diff --git a/src/CoreBundle/EventListener/DcGeneral/Table/DcaSetting/AddAllButtonListener.php b/src/CoreBundle/EventListener/DcGeneral/Table/DcaSetting/AddAllButtonListener.php
@@ -35,34 +35,6 @@
  */
 class AddAllButtonListener
 {
-    /**
-     * The database.
-     *
-     * @var Connection
-     */
-    private Connection $connection;
-
-    /**
-     * The MetaModels factory.
-     *
-     * @var IFactory
-     */
-    private IFactory $factory;
-
-    /**
-     * The URL generator.
-     *
-     * @var UrlGeneratorInterface
-     */
-    private UrlGeneratorInterface $urlGenerator;
-
-    /**
-     * The request stack.
-     *
-     * @var RequestStack
-     */
-    private RequestStack $requestStack;
-
     /**
      * Create a new instance.
      *
@@ -72,15 +44,11 @@ class AddAllButtonListener
      * @param RequestStack          $requestStack The session.
      */
     public function __construct(
-        Connection $connection,
-        IFactory $factory,
-        UrlGeneratorInterface $urlGenerator,
-        RequestStack $requestStack
+        private readonly Connection $connection,
+        private readonly IFactory $factory,
+        private readonly UrlGeneratorInterface $urlGenerator,
+        private readonly RequestStack $requestStack
     ) {
-        $this->connection   = $connection;
-        $this->factory      = $factory;
-        $this->urlGenerator = $urlGenerator;
-        $this->requestStack = $requestStack;
     }
 
     /**

diff --git a/src/CoreBundle/EventListener/DcGeneral/Table/RenderSetting/AddAllButtonListener.php b/src/CoreBundle/EventListener/DcGeneral/Table/RenderSetting/AddAllButtonListener.php
@@ -35,34 +35,6 @@
  */
 class AddAllButtonListener
 {
-    /**
-     * The database.
-     *
-     * @var Connection
-     */
-    private Connection $connection;
-
-    /**
-     * The MetaModels factory.
-     *
-     * @var IFactory
-     */
-    private IFactory $factory;
-
-    /**
-     * The URL generator.
-     *
-     * @var UrlGeneratorInterface
-     */
-    private UrlGeneratorInterface $urlGenerator;
-
-    /**
-     * The request stack.
-     *
-     * @var RequestStack
-     */
-    private RequestStack $requestStack;
-
     /**
      * Create a new instance.
      *
@@ -72,15 +44,11 @@ class AddAllButtonListener
      * @param RequestStack          $requestStack The session.
      */
     public function __construct(
-        Connection $connection,
-        IFactory $factory,
-        UrlGeneratorInterface $urlGenerator,
-        RequestStack $requestStack
+        private readonly Connection $connection,
+        private readonly IFactory $factory,
+        private readonly UrlGeneratorInterface $urlGenerator,
+        private readonly RequestStack $requestStack
     ) {
-        $this->connection = $connection;
-        $this->factory = $factory;
-        $this->urlGenerator = $urlGenerator;
-        $this->requestStack = $requestStack;
     }
 
     /**

diff --git a/src/Filter/Setting/SimpleLookupFilterSettingTypeFactory.php b/src/Filter/Setting/SimpleLookupFilterSettingTypeFactory.php
@@ -3,7 +3,7 @@
 /**
  * This file is part of MetaModels/core.
  *
- * (c) 2012-2019 The MetaModels team.
+ * (c) 2012-2024 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,7 +13,8 @@
  * @package    MetaModels/core
  * @author     Christian Schiffler <[email protected]>
  * @author     Sven Baumann <[email protected]>
- * @copyright  2012-2019 The MetaModels team.
+ * @author     Ingolf Steinhardt <[email protected]>
+ * @copyright  2012-2024 The MetaModels team.
  * @license    https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
@@ -36,8 +37,7 @@ public function __construct(
         private readonly EventDispatcherInterface $dispatcher,
         private readonly FilterUrlBuilder $filterUrlBuilder,
         private readonly TranslatorInterface $translator,
-    )
-    {
+    ) {
         parent::__construct();
 
         $this