MAGETWO-99418: Deliver critical PR for 2.3.2

Author: vzabaznov

app/code/Magento/Config/composer.json

@@ -7,7 +7,6 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-message-queue": "*",
         "magento/module-backend": "*",
         "magento/module-cron": "*",
         "magento/module-deploy": "*",

app/code/Magento/MessageQueue/Model/ResourceModel/PoisonPill.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\MessageQueue\PoisonPill\PoisonPillPutInterface;
 use Magento\Framework\MessageQueue\PoisonPill\PoisonPillReadInterface;
-use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 /**
@@ -22,19 +21,6 @@ class PoisonPill extends AbstractDb implements PoisonPillPutInterface, PoisonPil
      */
     const QUEUE_POISON_PILL_TABLE = 'queue_poison_pill';
 
-    /**
-     * PoisonPill constructor.
-     *
-     * @param Context $context
-     * @param string|null $connectionName
-     */
-    public function __construct(
-        Context $context,
-        string $connectionName = null
-    ) {
-        parent::__construct($context, $connectionName);
-    }
-
     /**
      * @inheritdoc
      */

app/code/Magento/Store/composer.json

@@ -7,7 +7,6 @@
     "require": {
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
-        "magento/module-message-queue": "*",
         "magento/module-catalog": "*",
         "magento/module-config": "*",
         "magento/module-directory": "*",

app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php

@@ -40,11 +40,10 @@ public function beforeSendResponse(Http $subject)
         $content = $subject->getContent();
         $script = [];
         if (strpos($content, '</body') !== false) {
-            if (
-                $this->scopeConfig->isSetFlag(
+            if ($this->scopeConfig->isSetFlag(
                 self::XML_PATH_DEV_MOVE_JS_TO_BOTTOM,
                 ScopeInterface::SCOPE_STORE
-                )
+            )
             ) {
                 $pattern = '#<script[^>]*+(?<!text/x-magento-template.)>.*?</script>#is';
                 $content = preg_replace_callback(