CHANGELOG.md

@@ -1,9 +1,14 @@
 # Contao core bundle change log
 
+### 4.4.2 (2017-07-25)
+
+ * Adjust the command scheduler listener so it does not rely on request parameters (see #955).
+ * Rewrite the DCA picker (see #950).
+
 ### 4.4.1 (2017-07-12)
 
  * Prevent arbitrary PHP file inclusions in the back end (see CVE-2017-10993).
- * Correctly handle subpalettes in "edit multiple" mode (see #946). 
+ * Correctly handle subpalettes in "edit multiple" mode (see #946).
  * Correctly show the DCA picker in the site structure (see #906).
  * Correctly update the style sheets if a format definition is enabled/disabled (see #893).
  * Always show the "show from" and "show until" fields (see #908).

composer.json

@@ -18,7 +18,7 @@
         "symfony/filesystem": "^3.3",
         "symfony/finder": "^3.3",
         "symfony/framework-bundle": "^3.3",
-        "symfony/http-foundation": "^3.3",
+        "symfony/http-foundation": "^3.3.5",
         "symfony/security": "^3.3",
         "symfony/yaml": "^3.3",
         "sensio/framework-extra-bundle": "^3.0.2",
@@ -123,6 +123,12 @@
     "config": {
         "preferred-install": "dist"
     },
+    "support": {
+        "docs": "https://docs.contao.org",
+        "forum": "https://community.contao.org",
+        "issues": "https://github.com/contao/core-bundle/issues",
+        "source": "https://github.com/contao/core-bundle"
+    },
     "extra": {
         "branch-alias": {
             "dev-release/4.4.0": "4.4.x-dev"

src/ContaoCoreBundle.php

@@ -15,7 +15,7 @@
 use Contao\CoreBundle\DependencyInjection\Compiler\AddResourcesPathsPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\AddSessionBagsPass;
 use Contao\CoreBundle\DependencyInjection\Compiler\DoctrineMigrationsPass;
-use Contao\CoreBundle\DependencyInjection\Compiler\PickerMenuProviderPass;
+use Contao\CoreBundle\DependencyInjection\Compiler\PickerProviderPass;
 use Contao\CoreBundle\DependencyInjection\ContaoCoreExtension;
 use Symfony\Component\Console\Application;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -63,6 +63,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new AddResourcesPathsPass());
         $container->addCompilerPass(new AddImagineClassPass());
         $container->addCompilerPass(new DoctrineMigrationsPass());
-        $container->addCompilerPass(new PickerMenuProviderPass());
+        $container->addCompilerPass(new PickerProviderPass());
     }
 }

src/Controller/BackendController.php

@@ -21,11 +21,13 @@
 use Contao\BackendPopup;
 use Contao\BackendPreview;
 use Contao\BackendSwitch;
+use Contao\CoreBundle\Picker\PickerConfig;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 /**
  * Handles the Contao backend routes.
@@ -214,18 +216,36 @@ public function alertsAction()
     }
 
     /**
-     * Handles the picker redirect.
+     * Redirects the user to the Contao back end and includes the picker query parameter. It will determine
+     * the current provider URL based on the value (usually read dynamically via JavaScript).
      *
      * @param Request $request
      *
+     * @throws BadRequestHttpException
+     *
      * @return RedirectResponse
      *
      * @Route("/_contao/picker", name="contao_backend_picker")
      */
     public function pickerAction(Request $request)
     {
-        $pickerBuilder = $this->container->get('contao.menu.picker_menu_builder');
+        $extras = [];
+
+        if ($request->query->has('extras')) {
+            $extras = $request->query->get('extras');
+
+            if (!is_array($extras)) {
+                throw new BadRequestHttpException('Invalid picker extras');
+            }
+        }
+
+        $config = new PickerConfig($request->query->get('context'), $extras, $request->query->get('value'));
+        $picker = $this->container->get('contao.picker.builder')->create($config);
+
+        if (null === $picker) {
+            throw new BadRequestHttpException('Unsupported picker context');
+        }
 
-        return new RedirectResponse($pickerBuilder->getPickerUrl($request));
+        return new RedirectResponse($picker->getCurrentUrl());
     }
 }

src/DependencyInjection/Compiler/PickerMenuProviderPass.php → src/DependencyInjection/Compiler/PickerProviderPass.php

@@ -15,11 +15,12 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * Registers the picker menu providers.
+ * Registers the picker providers.
  *
  * @author Leo Feyer <https://github.com/leofeyer>
+ * @author Andreas Schempp <https://github.com/aschempp>
  */
-class PickerMenuProviderPass implements CompilerPassInterface
+class PickerProviderPass implements CompilerPassInterface
 {
     use PriorityTaggedServiceTrait;
 
@@ -28,12 +29,12 @@ class PickerMenuProviderPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->has('contao.menu.picker_menu_builder')) {
+        if (!$container->has('contao.picker.builder')) {
             return;
         }
 
-        $definition = $container->findDefinition('contao.menu.picker_menu_builder');
-        $references = $this->findAndSortTaggedServices('contao.picker_menu_provider', $container);
+        $definition = $container->findDefinition('contao.picker.builder');
+        $references = $this->findAndSortTaggedServices('contao.picker_provider', $container);
 
         foreach ($references as $reference) {
             $definition->addMethodCall('addProvider', [$reference]);

src/DependencyInjection/ContaoCoreExtension.php

@@ -10,7 +10,7 @@
 
 namespace Contao\CoreBundle\DependencyInjection;
 
-use Contao\CoreBundle\Menu\PickerMenuProviderInterface;
+use Contao\CoreBundle\Picker\PickerProviderInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
@@ -90,8 +90,8 @@ protected function loadInternal(array $mergedConfig, ContainerBuilder $container
         $this->overwriteImageTargetDir($mergedConfig, $container);
 
         $container
-            ->registerForAutoconfiguration(PickerMenuProviderInterface::class)
-            ->addTag('contao.picker_menu_provider')
+            ->registerForAutoconfiguration(PickerProviderInterface::class)
+            ->addTag('contao.picker_provider')
         ;
     }
 

src/EventListener/CommandSchedulerListener.php

@@ -35,16 +35,23 @@ class CommandSchedulerListener
      */
     private $connection;
 
+    /**
+     * @var string
+     */
+    private $fragmentPath;
+
     /**
      * Constructor.
      *
      * @param ContaoFrameworkInterface $framework
      * @param Connection               $connection
+     * @param string                   $fragmentPath
      */
-    public function __construct(ContaoFrameworkInterface $framework, Connection $connection)
+    public function __construct(ContaoFrameworkInterface $framework, Connection $connection, $fragmentPath = '_fragment')
     {
         $this->framework = $framework;
         $this->connection = $connection;
+        $this->fragmentPath = $fragmentPath;
     }
 
     /**
@@ -72,14 +79,17 @@ public function onKernelTerminate(PostResponseEvent $event)
      */
     private function canRunController(Request $request)
     {
+        $pathInfo = $request->getPathInfo();
+
+        // Skip the listener in the install tool and upon fragment URLs
+        if (preg_match('~(?:^|/)(?:contao/install$|'.preg_quote($this->fragmentPath, '~').'/)~', $pathInfo)) {
+            return false;
+        }
+
         /** @var Config $config */
         $config = $this->framework->getAdapter(Config::class);
 
-        return $config->isComplete()
-            && !$config->get('disableCron')
-            && in_array($request->attributes->get('_route'), ['contao_backend', 'contao_frontend'], true)
-            && $this->canRunDbQuery()
-        ;
+        return $config->isComplete() && !$config->get('disableCron') && $this->canRunDbQuery();
     }
 
     /**

src/EventListener/MergeHttpHeadersListener.php

@@ -27,9 +27,9 @@ class MergeHttpHeadersListener
     private $framework;
 
     /**
-     * @var array
+     * @var array|null
      */
-    private $headers = [];
+    private $headers;
 
     /**
      * @var array
@@ -46,30 +46,11 @@ class MergeHttpHeadersListener
      * Constructor.
      *
      * @param ContaoFrameworkInterface $framework
+     * @param array|null               $headers   Meant for unit testing only!
      */
-    public function __construct(ContaoFrameworkInterface $framework)
+    public function __construct(ContaoFrameworkInterface $framework, array $headers = null)
     {
         $this->framework = $framework;
-        $this->setHeaders(headers_list());
-    }
-
-    /**
-     * Returns the headers.
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Sets the headers.
-     *
-     * @param array $headers
-     */
-    public function setHeaders(array $headers)
-    {
         $this->headers = $headers;
     }
 
@@ -161,6 +142,16 @@ private function mergeHttpHeaders(Response $response)
         return $response;
     }
 
+    /**
+     * Returns the headers.
+     *
+     * @return array
+     */
+    private function getHeaders()
+    {
+        return $this->headers ?: headers_list();
+    }
+
     /**
      * Returns the unique header key.
      *

src/EventListener/PrettyErrorScreenListener.php

@@ -19,7 +19,7 @@
 use Contao\CoreBundle\Exception\NoActivePageFoundException;
 use Contao\CoreBundle\Exception\NoLayoutSpecifiedException;
 use Contao\CoreBundle\Exception\NoRootPageFoundException;
-use Contao\CoreBundle\Exception\RedirectResponseException;
+use Contao\CoreBundle\Exception\ResponseException;
 use Contao\CoreBundle\Framework\ContaoFrameworkInterface;
 use Contao\PageError404;
 use Contao\StringUtil;
@@ -200,7 +200,7 @@ private function getResponseFromPageHandler($type)
 
         try {
             return $pageHandler->getResponse();
-        } catch (RedirectResponseException $e) {
+        } catch (ResponseException $e) {
             return $e->getResponse();
         } catch (\Exception $e) {
             return null;