[Forwardport] ISSUE-14109: Allow modification of cookies via extension

.htaccess

@@ -355,6 +355,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files auth.json>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
 
 # For 404s and 403s that aren't handled by the application, show plain 404 response
 ErrorDocument 404 /pub/errors/404.php

.htaccess.sample

@@ -332,6 +332,15 @@
             Require all denied
         </IfVersion>
     </Files>
+    <Files auth.json>
+        <IfVersion < 2.4>
+            order allow,deny
+            deny from all
+        </IfVersion>
+        <IfVersion >= 2.4>
+            Require all denied
+        </IfVersion>
+    </Files>
 
 # For 404s and 403s that aren't handled by the application, show plain 404 response
 ErrorDocument 404 /pub/errors/404.php

.php_cs.dist

@@ -5,9 +5,9 @@
  */
 
 /**
- * Pre-commit hook installation:
- * vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
+ * PHP Coding Standards fixer configuration
  */
+
 $finder = PhpCsFixer\Finder::create()
     ->name('*.phtml')
     ->exclude('dev/tests/functional/generated')

.travis.yml

@@ -11,6 +11,8 @@ addons:
   firefox: "46.0"
   hosts:
       - magento2.travis
+services:
+  - rabbitmq
 language: php
 php:
   - 7.0

README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=develop)](https://travis-ci.org/magento/magento2)
+[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
+[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>

app/code/Magento/AdminNotification/etc/db_schema.xml

@@ -6,7 +6,7 @@
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
         <column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Notification id"/>

app/code/Magento/AdminNotification/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_AdminNotification" setup_version="2.0.0">
+    <module name="Magento_AdminNotification" >
         <sequence>
             <module name="Magento_Store"/>
         </sequence>

app/code/Magento/AdvancedPricingImportExport/etc/module.xml

@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_AdvancedPricingImportExport" setup_version="2.0.0">
+    <module name="Magento_AdvancedPricingImportExport" >
     </module>
 </config>

app/code/Magento/Amqp/Model/Config.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+/**
+ * {@inheritdoc}
+ *
+ * @deprecated 100.2.0
+ */
+class Config extends \Magento\Framework\Amqp\Config
+{
+
+}

app/code/Magento/Amqp/Model/Exchange.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfigInterface;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\MessageQueue\Rpc\ResponseQueueNameBuilder;
+
+/**
+ * {@inheritdoc}
+ *
+ * @deprecated 100.2.0
+ */
+class Exchange extends \Magento\Framework\Amqp\Exchange
+{
+    /**
+     * Initialize dependencies.
+     *
+     * @param Config $amqpConfig
+     * @param QueueConfig $queueConfig
+     * @param CommunicationConfigInterface $communicationConfig
+     * @param int $rpcConnectionTimeout
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        Config $amqpConfig,
+        QueueConfig $queueConfig,
+        CommunicationConfigInterface $communicationConfig,
+        $rpcConnectionTimeout = self::RPC_CONNECTION_TIMEOUT
+    ) {
+        parent::__construct(
+            $amqpConfig,
+            $this->getPublisherConfig(),
+            $this->getResponseQueueNameBuilder(),
+            $communicationConfig,
+            $rpcConnectionTimeout
+        );
+    }
+
+    /**
+     * Get publisher config.
+     *
+     * @return PublisherConfig
+     *
+     * @deprecated 100.2.0
+     */
+    private function getPublisherConfig()
+    {
+        return \Magento\Framework\App\ObjectManager::getInstance()->get(PublisherConfig::class);
+    }
+
+    /**
+     * Get response queue name builder.
+     *
+     * @return ResponseQueueNameBuilder
+     *
+     * @deprecated 100.2.0
+     */
+    private function getResponseQueueNameBuilder()
+    {
+        return \Magento\Framework\App\ObjectManager::getInstance()->get(ResponseQueueNameBuilder::class);
+    }
+}

app/code/Magento/Amqp/Model/Queue.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+/**
+ * {@inheritdoc}
+ *
+ * @deprecated 100.2.0
+ */
+class Queue extends \Magento\Framework\Amqp\Queue
+{
+
+}

app/code/Magento/Amqp/Model/Topology.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Amqp\Model;
+
+use Magento\Framework\Amqp\Topology\ExchangeInstaller;
+use Magento\Framework\Amqp\Topology\QueueInstaller;
+use Magento\Framework\MessageQueue\ConfigInterface as QueueConfig;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\Framework\MessageQueue\Topology\ConfigInterface as TopologyConfig;
+use Magento\Framework\Amqp\ConfigPool;
+use Magento\Framework\Amqp\ConnectionTypeResolver;
+use Magento\Framework\Amqp\TopologyInstaller;
+
+/**
+ * Class Topology creates topology for Amqp messaging
+ *
+ * @deprecated 100.2.0
+ */
+class Topology extends TopologyInstaller
+{
+    /**
+     * Type of exchange
+     *
+     * @deprecated
+     */
+    const TOPIC_EXCHANGE = 'topic';
+
+    /**
+     * Amqp connection
+     */
+    const AMQP_CONNECTION = 'amqp';
+
+    /**
+     * Durability for exchange and queue
+     *
+     * @deprecated
+     */
+    const IS_DURABLE = true;
+
+    /**
+     * Initialize dependencies
+     *
+     * @param Config $amqpConfig
+     * @param QueueConfig $queueConfig
+     * @param CommunicationConfig $communicationConfig
+     * @param \Psr\Log\LoggerInterface $logger
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function __construct(
+        Config $amqpConfig,
+        QueueConfig $queueConfig,
+        CommunicationConfig $communicationConfig,
+        \Psr\Log\LoggerInterface $logger
+    ) {
+        parent::__construct(
+            \Magento\Framework\App\ObjectManager::getInstance()->get(TopologyConfig::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ExchangeInstaller::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ConfigPool::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(QueueInstaller::class),
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ConnectionTypeResolver::class),
+            $logger
+        );
+    }
+}

app/code/Magento/Amqp/README.md

@@ -0,0 +1,3 @@
+# Amqp
+
+**Amqp** provides functionality to publish/consume messages with Amqp.