Merge tag '2.1.1'

Hotfix release 2.1.1

- "allow preview" for published filter did not work properly.
- Deactivate the phpspec test.

Author: stefanheimes

build.xml

@@ -8,4 +8,5 @@ For documentation visit:
 -->
 <project name="metamodels/attribute-checkbox" default="build">
   <import file="vendor/phpcq/phpcq/phpcq.main.xml"/>
+  <target name="phpspec" />
 </project>

src/FilterSetting/FilterSettingTypeFactory.php

@@ -14,13 +14,15 @@
  * @author     Christian Schiffler <[email protected]>
  * @author     Sven Baumann <[email protected]>
  * @author     David Molineus <[email protected]>
+ * @author     Richard Henkenjohann <[email protected]>
  * @copyright  2012-2019 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;
@@ -52,17 +54,26 @@ 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
+        FilterUrlBuilder $filterUrlBuilder = null,
+        TokenChecker $tokenChecker = null
     ) {
         parent::__construct();
 
@@ -75,6 +86,7 @@ public function __construct(
         $this->connection       = $connection;
         $this->dispatcher       = $dispatcher;
         $this->filterUrlBuilder = $filterUrlBuilder;
+        $this->tokenChecker     = $tokenChecker;
     }
 
     /**
@@ -87,7 +99,8 @@ public function createInstance($information, $filterSettings)
             $information,
             $this->connection,
             $this->dispatcher,
-            $this->filterUrlBuilder
+            $this->filterUrlBuilder,
+            $this->tokenChecker
         );
     }
 }

src/FilterSetting/Published.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,13 +15,15 @@
  * @author     Andreas Isaak <[email protected]>
  * @author     Sven Baumann <[email protected]>
  * @author     David Molineus <[email protected]>
- * @copyright  2012-2019 The MetaModels team.
+ * @author     Richard Henkenjohann <[email protected]>
+ * @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 Contao\System;
 use Doctrine\DBAL\Connection;
 use MetaModels\Filter\FilterUrlBuilder;
@@ -44,6 +46,13 @@ class Published extends Simple
      */
     private $connection;
 
+    /**
+     * The token checker.
+     *
+     * @var TokenChecker
+     */
+    private $tokenChecker;
+
     /**
      * Constructor - initialize the object and store the parameters.
      *
@@ -52,13 +61,15 @@ 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
+        FilterUrlBuilder $filterUrlBuilder = null,
+        TokenChecker $tokenChecker = null
     ) {
         parent::__construct($collection, $data, $dispatcher, $filterUrlBuilder);
 
@@ -73,7 +84,8 @@ public function __construct(
             $connection = System::getContainer()->get('database_connection');
         }
 
-        $this->connection = $connection;
+        $this->connection   = $connection;
+        $this->tokenChecker = $tokenChecker;
     }
 
     /**
@@ -86,7 +98,7 @@ public function prepareRules(IFilter $objFilter, $arrFilterUrl)
         }
 
         // Skip filter when in front end preview.
-        if ($this->get('check_allowpreview') && BE_USER_LOGGED_IN) {
+        if ($this->get('check_allowpreview') && ($this->tokenChecker && $this->tokenChecker->isPreviewMode())) {
             return;
         }
 

src/Resources/config/services.yml

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