Merge branch '2.4-develop' into select-first-shipping-adress

Author: Stanislav Idolov

.editorconfig

@@ -16,3 +16,7 @@ indent_size = 2
 
 [{composer, auth}.json]
 indent_size = 4
+
+[db_schema_whitelist.json]
+indent_size = 4
+trim_trailing_whitespace = false

.github/CONTRIBUTING.md

@@ -15,9 +15,9 @@ For more detailed information on contribution please read our [beginners guide](
 
 ## Contribution requirements
 
-1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.3/coding-standards/bk-coding-standards.html).
+1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.4/coding-standards/bk-coding-standards.html).
 2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
-3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.3-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
+3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/HEAD/.github/PULL_REQUEST_TEMPLATE.md) for more information.
 4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
 3. PRs which include new logic or new features must be submitted along with:
 * Unit/integration test coverage
@@ -33,7 +33,7 @@ This will allow you to collaborate with the Magento 2 development team, fork the
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
 2. Review the [Contributor License Agreement](https://opensource.adobe.com/cla.html) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#pull_request).
+4. Follow the [Forks And Pull Requests Instructions](https://devdocs.magento.com/contributor-guide/contributing.html#forks-and-pull-requests) to fork the Magento 2 repository and send us a pull request.
 5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
 
 ## Code of Conduct
@@ -43,6 +43,6 @@ The full text is available in the repository [Wiki](https://github.com/magento/m
 
 ## Connecting with Community!
 
-If you have any questions, join us in [#beginners](https://magentocommeng.slack.com/messages/CH8BGFX9D) Slack chat. If you are not on our slack, [click here](http://tinyurl.com/engcom-slack) to join.
+If you have any questions, join us in [#beginners](https://magentocommeng.slack.com/archives/CH8BGFX9D) Slack chat. If you are not on our slack, [click here](http://tinyurl.com/engcom-slack) to join.
 
 Need to find a project? Check out the [Slack Channels](https://github.com/magento/magento2/wiki/Slack-Channels) (with listed project info) and the [Magento Community Portal](https://opensource.magento.com/).

.github/ISSUE_TEMPLATE/bug_report.md

@@ -34,7 +34,7 @@ Important: Provide a set of clear steps to reproduce this bug. We can not provid
 2.
 
 ---
-Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+Please provide [Severity](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
 
 - [ ] Severity: **S0** _- Affects critical data or functionality and leaves users without workaround._
 - [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._

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

@@ -20,7 +20,7 @@ Fields marked with (*) are required. Please don't remove the template.
 <!--- Suggest your potential solutions for this issue. -->
 
 ---
-Please provide [Severity](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
+Please provide [Severity](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.
 
 - [ ] Severity: **S0** _- Affects critical data or functionality and leaves users with no workaround._
 - [ ] Severity: **S1** _- Affects critical data or functionality and forces users to employ a workaround._

.github/PULL_REQUEST_TEMPLATE.md

@@ -43,4 +43,5 @@
  - [ ] 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)
+ - [ ] README.md files for modified modules are updated and included in the pull request if any [README.md predefined sections](https://github.com/magento/devdocs/wiki/Magento-module-README.md) require an update
  - [ ] All automated tests passed successfully (all builds are green)

.github/stale.yml

@@ -1,11 +1,11 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 76
+daysUntilStale: 152
 
 # Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 14
+daysUntilClose: 28
 
 # Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
 onlyLabels: []
@@ -15,6 +15,8 @@ exemptLabels:
   - "Priority: P0"
   - "Priority: P1"
   - "Priority: P2"
+  - "Severity: S0"
+  - "Severity: S1"
   - "Progress: dev in progress"
   - "Progress: PR in progress"
   - "Progress: done"
@@ -39,8 +41,9 @@ staleLabel: "stale issue"
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed after 14 days if no further activity occurs. Thank you
-  for your contributions.
+  recent activity. It will be closed after 28 days if no further activity occurs.
+  Is this issue still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?
+  Thank you for your contributions!
 # Comment to post when removing the stale label.
 # unmarkComment: >
 #   Your comment here.

.gitignore

@@ -32,6 +32,8 @@ atlassian*
 /package.json
 /.php_cs
 /.php_cs.cache
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
 /grunt-config.json
 /pub/media/*.*
 !/pub/media/.htaccess

.php-cs-fixer.dist.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * PHP Coding Standards fixer configuration
+ */
+
+$finder = PhpCsFixer\Finder::create()
+    ->name('*.phtml')
+    ->exclude('dev/tests/integration/tmp')
+    ->exclude('dev/tests/integration/var')
+    ->exclude('lib/internal/Cm')
+    ->exclude('lib/internal/Credis')
+    ->exclude('lib/internal/Less')
+    ->exclude('lib/internal/LinLibertineFont')
+    ->exclude('pub/media')
+    ->exclude('pub/static')
+    ->exclude('setup/vendor')
+    ->exclude('var');
+
+$config = new PhpCsFixer\Config();
+$config->setFinder($finder)
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'concat_space' => ['spacing' => 'one'],
+        'include' => true,
+        'new_with_braces' => true,
+        'no_empty_statement' => true,
+        'no_extra_blank_lines' => true,
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'multiline_whitespace_before_semicolons' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_unused_imports' => true,
+        'no_whitespace_in_blank_line' => true,
+        'object_operator_without_whitespace' => true,
+        'ordered_imports' => true,
+        'standardize_not_equals' => true,
+        'ternary_operator_spaces' => true,
+    ]);
+return $config;

.php_cs.dist

@@ -16,10 +16,12 @@ module.exports = function (grunt) {
         tasks = grunt.file.expand('./dev/tools/grunt/tasks/*'),
         themes;
 
-        filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
-        themes = filesRouter.get('themes');
+    filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
+    themes = filesRouter.get('themes');
 
-    tasks = _.map(tasks, function(task){ return task.replace('.js', '') });
+    tasks = _.map(tasks, function (task) {
+        return task.replace('.js', '');
+    });
     tasks.push('time-grunt');
     tasks.forEach(function (task) {
         require(task)(grunt);
@@ -50,10 +52,9 @@ module.exports = function (grunt) {
         prod: function (component) {
             var tasks = [
                 'less',
-                'autoprefixer',
                 'cssmin',
                 'usebanner'
-            ].map(function(task){
+            ].map(function (task) {
                 return task + ':' + component;
             });
 
@@ -72,7 +73,7 @@ module.exports = function (grunt) {
                 'clean',
                 'exec:all'
             ];
-            _.each(themes, function(theme, name) {
+            _.each(themes, function (theme, name) {
                 tasks.push('less:' + name);
             });
             grunt.task.run(tasks);