Skip to content

Commit d1a0ce0

Browse files
dkvashninbaydkvashninbay
committed
Merge remote-tracking branch 'main/develop' into MAGETWO-50309
2 parents 9773b56 + 03033d3 commit d1a0ce0

File tree

22,416 files changed

+46907
-30262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

22,416 files changed

+46907
-30262
lines changed

‎.php_cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2015 Magento. All rights reserved.
3+
* Copyright © 2016 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

‎.travis.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ env:
1111
- TEST_SUITE=integration_part_1
1212
- TEST_SUITE=integration_part_2
1313
- TEST_SUITE=integration_integrity
14-
- TEST_SUITE=static_phpcs
15-
- TEST_SUITE=static_annotation
14+
- TEST_SUITE=static
1615
cache:
1716
apt: true
1817
directories:
@@ -21,9 +20,9 @@ cache:
2120
matrix:
2221
exclude:
2322
- php: 5.6
24-
env: TEST_SUITE=static_phpcs
25-
- php: 5.6
26-
env: TEST_SUITE=static_annotation
23+
env: TEST_SUITE=static
24+
- php: 7.0
25+
env: TEST_SUITE=static
2726
before_install:
2827
- sudo apt-get update -qq
2928
- sudo apt-get install -y -qq postfix
@@ -68,6 +67,4 @@ script:
6867
# Integration integrity tests
6968
- sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi"
7069
# Static tests [Code Style]
71-
- sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testCodeStyle'; fi"
72-
# Static tests [Code Style]
73-
- sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"
70+
- sh -c "if [ '$TEST_SUITE' = 'static' ]; then cd dev/tests/static/; php get_github_changes.php --output-file='$TRAVIS_BUILD_DIR/dev/tests/static/testsuite/Magento/Test/_files/changed_files_ce.txt' --base-path='$TRAVIS_BUILD_DIR' --repo='https://github.com/magento/magento2.git' --branch='develop'; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest'; fi"

‎Gruntfile.js.sample

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/**
2-
* @copyright Copyright (c) 2015 X.commerce, Inc. (http://www.magentocommerce.com)
2+
* Copyright © 2016 Magento. All rights reserved.
3+
* See COPYING.txt for license details.
34
*/
45

56
// For performance use one level down: 'name/{,*/}*.js'

‎LICENSE_AFL.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ Licensed under the Academic Free License version 3.0
4545

4646
15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
4747

48-
16. Modification of This License. This License is Copyright � 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
48+
16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.

‎README.md

Lines changed: 2 additions & 2 deletions

‎app/autoload.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Register basic autoloader that uses include path
44
*
5-
* Copyright © 2015 Magento. All rights reserved.
5+
* Copyright © 2016 Magento. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
use Magento\Framework\Autoload\AutoloaderRegistry;

‎app/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2015 Magento. All rights reserved.
3+
* Copyright © 2016 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* Copyright © 2015 Magento. All rights reserved.
5+
* Copyright © 2016 Magento. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* Copyright © 2015 Magento. All rights reserved.
5+
* Copyright © 2016 Magento. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
namespace Magento\AdminNotification\Block\Grid\Renderer;

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* Copyright © 2015 Magento. All rights reserved.
5+
* Copyright © 2016 Magento. All rights reserved.
66
* See COPYING.txt for license details.
77
*/
88
namespace Magento\AdminNotification\Block\Grid\Renderer;

0 commit comments

Comments
 (0)