Merge tag '2.1.3'

Hotfix release 2.1.3

- Revert "Fix "allow preview" for published filter setting."

Author: stefanheimes

src/FilterSetting/FilterSettingTypeFactory.php

@@ -3,7 +3,7 @@
 /**
  * This file is part of MetaModels/attribute_checkbox.
  *
- * (c) 2012-2019 The MetaModels team.
+ * (c) 2012-2020 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,14 +15,13 @@
  * @author     Sven Baumann <baumann.sv@gmail.com>
  * @author     David Molineus <david.molineus@netzmacht.de>
  * @author     Richard Henkenjohann <richardhenkenjohann@googlemail.com>
- * @copyright  2012-2019 The MetaModels team.
+ * @copyright  2012-2020 The MetaModels team.
  * @license    https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 
 namespace MetaModels\AttributeCheckboxBundle\FilterSetting;
 
-use Contao\CoreBundle\Security\Authentication\Token\TokenChecker;
 use Doctrine\DBAL\Connection;
 use MetaModels\Filter\FilterUrlBuilder;
 use MetaModels\Filter\Setting\AbstractFilterSettingTypeFactory;
@@ -54,26 +53,17 @@ class FilterSettingTypeFactory extends AbstractFilterSettingTypeFactory
      */
     private $filterUrlBuilder;
 
-    /**
-     * The token checker.
-     *
-     * @var TokenChecker
-     */
-    private $tokenChecker;
-
     /**
      * Create a new instance.
      *
      * @param Connection                    $connection       The database connection.
      * @param EventDispatcherInterface|null $dispatcher       The event dispatcher.
      * @param FilterUrlBuilder|null         $filterUrlBuilder The filter URL builder.
-     * @param TokenChecker|null             $tokenChecker     The token checker.
      */
     public function __construct(
         Connection $connection,
         EventDispatcherInterface $dispatcher = null,
-        FilterUrlBuilder $filterUrlBuilder = null,
-        TokenChecker $tokenChecker = null
+        FilterUrlBuilder $filterUrlBuilder = null
     ) {
         parent::__construct();
 
@@ -86,7 +76,6 @@ public function __construct(
         $this->connection       = $connection;
         $this->dispatcher       = $dispatcher;
         $this->filterUrlBuilder = $filterUrlBuilder;
-        $this->tokenChecker     = $tokenChecker;
     }
 
     /**
@@ -99,8 +88,7 @@ public function createInstance($information, $filterSettings)
             $information,
             $this->connection,
             $this->dispatcher,
-            $this->filterUrlBuilder,
-            $this->tokenChecker
+            $this->filterUrlBuilder
         );
     }
 }

src/FilterSetting/Published.php

@@ -23,7 +23,6 @@
 
 namespace MetaModels\AttributeCheckboxBundle\FilterSetting;
 
-use Contao\CoreBundle\Security\Authentication\Token\TokenChecker;
 use Contao\System;
 use Doctrine\DBAL\Connection;
 use MetaModels\Filter\FilterUrlBuilder;
@@ -46,13 +45,6 @@ class Published extends Simple
      */
     private $connection;
 
-    /**
-     * The token checker.
-     *
-     * @var TokenChecker
-     */
-    private $tokenChecker;
-
     /**
      * Constructor - initialize the object and store the parameters.
      *
@@ -61,15 +53,13 @@ class Published extends Simple
      * @param Connection                    $connection       The database connection.
      * @param EventDispatcherInterface|null $dispatcher       The event dispatcher.
      * @param FilterUrlBuilder|null         $filterUrlBuilder The filter URL builder.
-     * @param TokenChecker|null             $tokenChecker     The token checker.
      */
     public function __construct(
         ICollection $collection,
         array $data,
         Connection $connection = null,
         EventDispatcherInterface $dispatcher = null,
-        FilterUrlBuilder $filterUrlBuilder = null,
-        TokenChecker $tokenChecker = null
+        FilterUrlBuilder $filterUrlBuilder = null
     ) {
         parent::__construct($collection, $data, $dispatcher, $filterUrlBuilder);
 
@@ -84,8 +74,7 @@ public function __construct(
             $connection = System::getContainer()->get('database_connection');
         }
 
-        $this->connection   = $connection;
-        $this->tokenChecker = $tokenChecker;
+        $this->connection = $connection;
     }
 
     /**
@@ -98,7 +87,7 @@ public function prepareRules(IFilter $objFilter, $arrFilterUrl)
         }
 
         // Skip filter when in front end preview.
-        if ($this->get('check_allowpreview') && ($this->tokenChecker && $this->tokenChecker->isPreviewMode())) {
+        if ($this->get('check_allowpreview') && BE_USER_LOGGED_IN) {
             return;
         }
 

src/Resources/config/services.yml

@@ -13,6 +13,5 @@ services:
           - '@database_connection'
           - '@event_dispatcher'
           - '@MetaModels\Filter\FilterUrlBuilder'
-          - '@contao.security.token_checker'
         tags:
           - { name: metamodels.filter_factory }