Merge pull request #2 from magento/2.3-develop

update

Author: swnsma

.github/ISSUE_TEMPLATE.md

@@ -5,19 +5,20 @@
      - Information on your environment,
      - Steps to reproduce,
      - Expected and actual results,
+    Fields marked with (*) are required. Please don't remove the template.
 
     Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
 -->
 
-### Preconditions
+### Preconditions (*)
 <!---
     Please provide as detailed information about your environment as possible.
     For example Magento version, tag, HEAD, PHP & MySQL version, etc..
 -->
 1. 
 2. 
 
-### Steps to reproduce
+### Steps to reproduce (*)
 <!---
     It is important to provide a set of clear steps to reproduce this bug.
     If relevant please include code samples
@@ -26,10 +27,10 @@
 2. 
 3. 
 
-### Expected result
+### Expected result (*)
 <!--- Tell us what should happen -->
 1. [Screenshots, logs or description]
 
-### Actual result
+### Actual result (*)
 <!--- Tell us what happens instead -->
 1. [Screenshots, logs or description]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Technical issue with the Magento 2 core components
+
+---
+
+<!---
+Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+Fields marked with (*) are required. Please don't remove the template.
+-->
+
+### Preconditions (*)
+<!---
+Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
+-->
+1.
+2.
+
+### Steps to reproduce (*)
+<!---
+Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
+-->
+1.
+2.
+
+### Expected result (*)
+<!--- Tell us what do you expect to happen. -->
+1. [Screenshots, logs or description]
+2.
+
+### Actual result (*)
+<!--- Tell us what happened instead. Include error messages and issues. -->
+1. [Screenshots, logs or description]
+2.

.github/ISSUE_TEMPLATE/developer-experience-issue.md

@@ -0,0 +1,19 @@
+---
+name: Developer experience issue
+about: Issues related to customization, extensibility, modularity
+
+---
+
+<!---
+Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+Fields marked with (*) are required. Please don't remove the template.
+-->
+
+### Summary (*)
+<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
+
+### Examples (*)
+<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
+
+### Proposed solution
+<!--- Suggest your potential solutions for this issue. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Please consider reporting directly to https://github.com/magento/community-features
+
+---
+
+<!---
+Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum. Fields marked with (*) are required. Please don't remove the template.
+-->
+
+### Description (*)
+<!--- Describe the feature you would like to add. -->
+
+### Expected behavior (*)
+<!--- What is the expected behavior of this feature? How is it going to work? -->
+
+### Benefits
+<!--- How do you think this feature would improve Magento? -->
+
+### Additional information
+<!--- What other information can you provide about the desired feature? -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,12 +3,13 @@
     To help us process this pull request we recommend that you add the following information:
      - Summary of the pull request,
      - Issue(s) related to the changes made,
-     - Manual testing scenarios,
+     - Manual testing scenarios
+    Fields marked with (*) are required. Please don't remove the template.
 -->
 
 <!--- Please provide a general summary of the Pull Request in the Title above -->
 
-### Description
+### Description (*)
 <!---
     Please provide a description of the changes proposed in the pull request.
     Letting us know what has changed and why it needed changing will help us validate this pull request.
@@ -22,15 +23,15 @@
 1. magento/magento2#<issue_number>: Issue title
 2. ...
 
-### Manual testing scenarios
+### Manual testing scenarios (*)
 <!---
     Please provide a set of unambiguous steps to test the proposed code change.
     Giving us manual testing scenarios will help with the processing and validation process.
 -->
 1. ...
 2. ...
 
-### Contribution checklist
+### Contribution checklist (*)
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
  - [ ] All new or changed code is covered with unit/integration tests (if applicable)

CHANGELOG.md

@@ -1,3 +1,7 @@
+2.3.0
+=============
+To get detailed information about changes in Magento 2.3.0, see the [Release Notes](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html)
+
 2.1.0
 =============
 To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
@@ -1977,7 +1981,7 @@ Tests:
     * [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay
     * [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found
     * [#652](https://github.com/magento/magento2/issues/652) -- Multishipping checkout not to change the Billing address js issue
-    * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to to break the tabs functionality
+    * [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to break the tabs functionality
 * Service Contracts:
     * Refactored usage of new API of the Customer module
     * Implemented Service Contracts for the Sales module

README.md

@@ -1,17 +1,16 @@
 [![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)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
-[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html)
+[Magento system requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
 
 ## Install Magento
-To install Magento, see either:
 
-*	[Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html)
+*	[Installation guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
 
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -22,10 +21,10 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
-[2]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
+[1]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
+[2]: <https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
 [3]: <https://github.com/magento/magento2/issues>
-[4]: <http://devdocs.magento.com>
+[4]: <https://devdocs.magento.com>
 
 <h3>Community Maintainers</h3>
 The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
@@ -41,34 +40,22 @@ Magento is thankful for any contribution that can improve our code base, documen
 </a>
 
 <h3>Labels applied by the Magento team</h3>
-
-| Label        | Description           | 
-| ------------- |-------------|
-| ![DOC](http://devdocs.magento.com/common/images/github_DOC.png) | Affects Documentation domain. |
-| ![PROD](http://devdocs.magento.com/common/images/github_PROD.png) | Affects the Product team (mostly feature requests or business logic change). |
-| ![TECH](http://devdocs.magento.com/common/images/github_TECH.png) | Affects Architect Group (mostly to make decisions around technology changes). |
-| ![accept](http://devdocs.magento.com/common/images/github_accept.png) | The pull request has been accepted and will be merged into mainline code. |
-| ![reject](http://devdocs.magento.com/common/images/github_reject.png) | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. |
-| ![bug report](http://devdocs.magento.com/common/images/github_bug.png) | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. |
-| ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. |
-| ![in progress](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
-| ![needs update](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
-
-To learn more about issue gate labels click [here](https://github.com/magento/magento2/wiki/Magento-Issue-Gates)
+We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more. 
+Please review the <a href="https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels">Code Contributions guide</a> for detailed information on labels used in Magento 2 repositories.
 
 <h2>Reporting security issues</h2>
 
-To report security vulnerabilities in Magento software or web sites, please e-mail <a href="mailto:[email protected]">[email protected]</a>. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our <a href="https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc">encryption key</a> if it includes sensitive information. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
+To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account <a href="https://bugcrowd.com/magento">there</a> to submit and follow-up your issue. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
 
 Stay up-to-date on the latest security news and patches for Magento by signing up for <a href="https://magento.com/security/sign-up">Security Alert Notifications</a>.
 
 <h2>License</h2>
 
-Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
+Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license.
 
-http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-Please see LICENSE.txt for the full text of the OSL 3.0 license or contact [email protected] for a copy.
+[Open Software License (OSL 3.0)](https://opensource.org/licenses/osl-3.0.php).
+Please see [LICENSE.txt](https://github.com/magento/magento2/blob/2.3-develop/LICENSE.txt) for the full text of the OSL 3.0 license or contact [email protected] for a copy.
 
 Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
-Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.
+Please see LICENSE_EE.txt for the full text of the MEE License or visit https://magento.com/legal/terms/enterprise.
 

app/bootstrap.php

@@ -31,8 +31,6 @@
 // Sets default autoload mappings, may be overridden in Bootstrap::create
 \Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
 
-require_once BP . '/app/functions.php';
-
 /* Custom umask value may be provided in optional mage_umask file in root */
 $umaskFile = BP . '/magento_umask';
 $mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
@@ -54,8 +52,16 @@
     && isset($_SERVER['HTTP_ACCEPT'])
     && strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
 ) {
-    \Magento\Framework\Profiler::applyConfig(
-        (isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])) ? $_SERVER['MAGE_PROFILER'] : trim(file_get_contents(BP . '/var/profiler.flag')),
+    $profilerConfig = isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])
+        ? $_SERVER['MAGE_PROFILER']
+        : trim(file_get_contents(BP . '/var/profiler.flag'));
+
+    if ($profilerConfig) {
+        $profilerConfig = json_decode($profilerConfig, true) ?: $profilerConfig;
+    }
+
+    Magento\Framework\Profiler::applyConfig(
+        $profilerConfig,
         BP,
         !empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
     );

app/code/Magento/AdminNotification/Block/Window.php

@@ -8,6 +8,8 @@
 namespace Magento\AdminNotification\Block;
 
 /**
+ * Admin notification window block
+ *
  * @api
  * @since 100.0.2
  */
@@ -40,7 +42,7 @@ class Window extends \Magento\Backend\Block\Template
     protected $_criticalCollection;
 
     /**
-     * @var \Magento\Adminnotification\Model\Inbox
+     * @var \Magento\AdminNotification\Model\Inbox
      */
     protected $_latestItem;
 
@@ -92,7 +94,7 @@ protected function _toHtml()
     /**
      * Retrieve latest critical item
      *
-     * @return bool|\Magento\Adminnotification\Model\Inbox
+     * @return bool|\Magento\AdminNotification\Model\Inbox
      */
     protected function _getLatestItem()
     {

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php

@@ -6,7 +6,9 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
-class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+
+class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification implements HttpGetActionInterface
 {
     /**
      * @return void

app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php

@@ -37,7 +37,7 @@ public function __construct(
     }
 
     /**
-     * Predispath admin action controller
+     * Predispatch admin action controller
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void

dev/tests/acceptance/LICENSE.txt renamed to app/code/Magento/AdminNotification/Test/Mftf/LICENSE.txt

@@ -0,0 +1,3 @@
+# Admin Notification Functional Tests
+
+The Functional Test Module for **Magento Admin Notification** module.

dev/tests/acceptance/LICENSE_AFL.txt renamed to app/code/Magento/AdminNotification/Test/Mftf/LICENSE_AFL.txt

@@ -62,6 +62,9 @@ public function testGetIdentity($expectedSum, $cacheTypes)
         $this->assertEquals($expectedSum, $this->_messageModel->getIdentity());
     }
 
+    /**
+     * @return array
+     */
     public function getIdentityDataProvider()
     {
         $cacheTypeMock1 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
@@ -95,6 +98,9 @@ public function testIsDisplayed($expected, $allowed, $cacheTypes)
         $this->assertEquals($expected, $this->_messageModel->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         $cacheTypesMock = $this->createPartialMock(\stdClass::class, ['getCacheType']);

app/code/Magento/AdminNotification/Test/Mftf/README.md

@@ -72,6 +72,9 @@ public function testIsDisplayed($expectedFirstRun, $data)
         $this->assertEquals($expectedFirstRun, $model->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         return [

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php

@@ -76,6 +76,9 @@ public function testIsDisplayed($expectedResult, $cached, $response)
         $this->assertEquals($expectedResult, $this->_messageModel->isDisplayed());
     }
 
+    /**
+     * @return array
+     */
     public function isDisplayedDataProvider()
     {
         return [

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_AdminNotification::system_adminnotification"      title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
+        <add id="Magento_AdminNotification::system_adminnotification" title="Notifications" translate="title" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
     </menu>
 </config>

app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php

@@ -21,16 +21,16 @@
                 default="0" comment="Flag if notification read"/>
         <column xsi:type="smallint" name="is_remove" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Flag if notification might be removed"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="notification_id"/>
         </constraint>
-        <index name="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
+        <index referenceId="ADMINNOTIFICATION_INBOX_SEVERITY" indexType="btree">
             <column name="severity"/>
         </index>
-        <index name="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
+        <index referenceId="ADMINNOTIFICATION_INBOX_IS_READ" indexType="btree">
             <column name="is_read"/>
         </index>
-        <index name="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
+        <index referenceId="ADMINNOTIFICATION_INBOX_IS_REMOVE" indexType="btree">
             <column name="is_remove"/>
         </index>
     </table>
@@ -40,7 +40,7 @@
                 default="0" comment="Problem type"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Create date"/>
-        <constraint xsi:type="primary" name="PRIMARY">
+        <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="identity"/>
         </constraint>
     </table>