-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into exception-when-attribute-does-not-exist
- Loading branch information
Showing
26,347 changed files
with
342,769 additions
and
118,006 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| /** | ||
| * Pre-commit hook installation: | ||
| * vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit | ||
| */ | ||
| $finder = PhpCsFixer\Finder::create() | ||
| ->name('*.phtml') | ||
| ->exclude('dev/tests/functional/generated') | ||
| ->exclude('dev/tests/functional/var') | ||
| ->exclude('dev/tests/functional/vendor') | ||
| ->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'); | ||
|
|
||
| return PhpCsFixer\Config::create() | ||
| ->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_consecutive_blank_lines' => true, | ||
| 'no_leading_import_slash' => true, | ||
| 'no_leading_namespace_whitespace' => true, | ||
| 'no_multiline_whitespace_around_double_arrow' => true, | ||
| 'no_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, | ||
| ]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| Copyright © 2013-2017 Magento, Inc. | ||
|
|
||
| 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 license@magentocommerce.com 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 <insert file name of the MEE license> 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 http://magento.com/legal/terms/enterprise. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <!--- Provide a general summary of the Pull Request in the Title above --> | ||
|
|
||
| ### Description | ||
| <!--- Provide a description of the changes proposed in the pull request --> | ||
|
|
||
| ### Fixed Issues (if relevant) | ||
| <!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant --> | ||
| 1. magento/magento2#<issue_number>: Issue title | ||
| 2. ... | ||
|
|
||
| ### Manual testing scenarios | ||
| <!--- Provide a set of unambiguous steps to test the proposed code change --> | ||
| 1. ... | ||
| 2. ... | ||
|
|
||
| ### 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) | ||
| - [ ] All automated tests passed successfully (all builds on Travis CI are green) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.