Skip to content

Commit f6ce4d3

Browse files
simpleadmsimpleadm
authored
Merge branch 'develop' into fix-configurable-lowest-price-provider
2 parents fd83642 + 4994418 commit f6ce4d3

File tree

2,548 files changed

+40918
-18302
lines changed

Some content is hidden

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

2,548 files changed

+40918
-18302
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ atlassian*
4848
/pub/media/favicon/*
4949
/pub/media/import/*
5050
!/pub/media/import/.htaccess
51+
/pub/media/logo/*
5152
/pub/media/theme/*
5253
/pub/media/theme_customization/*
5354
!/pub/media/theme_customization/.htaccess
@@ -65,3 +66,4 @@ atlassian*
6566
!/vendor/.htaccess
6667
/generated/*
6768
!/generated/.htaccess
69+
.DS_Store

‎.travis.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
sudo: required
22
dist: trusty
3+
group: edge
34
addons:
45
apt:
56
packages:
@@ -22,19 +23,22 @@ env:
2223
- MAGENTO_HOST_NAME="magento2.travis"
2324
matrix:
2425
- TEST_SUITE=unit
26+
- TEST_SUITE=static
27+
- TEST_SUITE=js GRUNT_COMMAND=spec
28+
- TEST_SUITE=js GRUNT_COMMAND=static
2529
- TEST_SUITE=integration INTEGRATION_INDEX=1
2630
- TEST_SUITE=integration INTEGRATION_INDEX=2
2731
- TEST_SUITE=integration INTEGRATION_INDEX=3
28-
- TEST_SUITE=static
29-
- TEST_SUITE=js
3032
- TEST_SUITE=functional ACCEPTANCE_INDEX=1
3133
- TEST_SUITE=functional ACCEPTANCE_INDEX=2
3234
matrix:
3335
exclude:
3436
- php: 7.0
3537
env: TEST_SUITE=static
3638
- php: 7.0
37-
env: TEST_SUITE=js
39+
env: TEST_SUITE=js GRUNT_COMMAND=spec
40+
- php: 7.0
41+
env: TEST_SUITE=js GRUNT_COMMAND=static
3842
- php: 7.0
3943
env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
4044
- php: 7.0
@@ -49,4 +53,11 @@ cache:
4953
before_install: ./dev/travis/before_install.sh
5054
install: composer install --no-interaction --prefer-dist
5155
before_script: ./dev/travis/before_script.sh
52-
script: ./dev/travis/script.sh
56+
script:
57+
# Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails
58+
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
59+
- test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
60+
61+
# The scripts for grunt/phpunit type tests
62+
- if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
63+
- if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi

‎CONTRIBUTING.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,8 @@ If you are a new GitHub user, we recommend that you create your own [free github
2929
3. Create and test your work.
3030
4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
3131
5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
32+
33+
## Code of Conduct
34+
35+
Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
36+
The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).

‎app/autoload.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,3 @@
3535
}
3636

3737
AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
38-
39-
// Sets default autoload mappings, may be overridden in Bootstrap::create
40-
\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);

‎app/bootstrap.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
}
2929

3030
require_once __DIR__ . '/autoload.php';
31+
// Sets default autoload mappings, may be overridden in Bootstrap::create
32+
\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
33+
3134
require_once BP . '/app/functions.php';
3235

3336
/* Custom umask value may be provided in optional mage_umask file in root */

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Controller\Adminhtml;
99

10+
/**
11+
* @api
12+
*/
1013
abstract class Notification extends \Magento\Backend\App\AbstractAction
1114
{
1215
/**

‎app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* AdminNotification update frequency source
1010
*
1111
* @codeCoverageIgnore
12+
* @api
1213
*/
1314
class Frequency implements \Magento\Framework\Option\ArrayInterface
1415
{

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*
1313
* @author Magento Core Team <core@magentocommerce.com>
1414
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
15+
* @api
1516
*/
1617
class Feed extends \Magento\Framework\Model\AbstractModel
1718
{

‎app/code/Magento/AdminNotification/Model/Inbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @method int getIsRemove()
3030
* @method \Magento\AdminNotification\Model\Inbox setIsRemove(int $value)
3131
*
32-
* @author Magento Core Team <core@magentocommerce.com>
32+
* @api
3333
*/
3434
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
3535
{

‎app/code/Magento/AdminNotification/Model/InboxInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* AdminNotification Inbox interface
1010
*
1111
* @author Magento Core Team <core@magentocommerce.com>
12+
* @api
1213
*/
1314
interface InboxInterface
1415
{

0 commit comments

Comments
 (0)