Skip to content

Commit 083a96f

Browse files
author
Dale Sikkema
committed
Merge remote-tracking branch 'mainline/develop' into develop
2 parents 4829eaf + 774f7c3 commit 083a96f

File tree

439 files changed

+5949
-2709
lines changed

Some content is hidden

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

439 files changed

+5949
-2709
lines changed

‎.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ php:
44
- 5.6
55
env:
66
- TEST_SUITE=unit
7-
- TEST_SUITE=integration
7+
- TEST_SUITE=integration_part_1
8+
- TEST_SUITE=integration_part_2
89
- TEST_SUITE=integration_integrity
910
- TEST_SUITE=static_phpcs
1011
- TEST_SUITE=static_annotation
@@ -32,7 +33,7 @@ before_script:
3233
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
3334
# Install MySQL 5.6, create DB for integration tests
3435
- >
35-
sh -c "if [ '$TEST_SUITE' = 'integration' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
36+
sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
3637
sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
3738
sudo apt-get autoremove;
3839
sudo apt-get autoclean;
@@ -50,10 +51,12 @@ script:
5051
# Unit tests
5152
- sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
5253
# Integration tests
53-
- sh -c "if [ '$TEST_SUITE' = 'integration' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist; fi"
54+
- sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi"
55+
- sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi"
56+
- sh -c "if [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi"
5457
# Integration integrity tests
5558
- sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi"
5659
# Static tests [Code Style]
5760
- 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"
5861
# Static tests [Code Style]
59-
- 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"
62+
- 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"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
7373
* @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
7474
* @param \Magento\Framework\UrlInterface $urlBuilder
7575
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
76-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
76+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
7777
* @param array $data
7878
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
7979
*/
@@ -87,7 +87,7 @@ public function __construct(
8787
\Magento\Framework\App\ProductMetadataInterface $productMetadata,
8888
\Magento\Framework\UrlInterface $urlBuilder,
8989
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
90-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
90+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
9191
array $data = []
9292
) {
9393
parent::__construct($context, $registry, $resource, $resourceCollection, $data);

‎app/code/Magento/Backend/Block/Menu.php

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -455,28 +455,14 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
455455
}
456456

457457
$id = $this->getJsId($menuItem->getId());
458-
if (count($menu) > 1 || $level != 1) {
459-
$output .= '<li ' . $this->getUiId(
460-
$menuItem->getId()
461-
) . ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass(
462-
$menuItem,
463-
$level
464-
) . ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
465-
. '" role="menu-item">' . $this->_renderAnchor(
466-
$menuItem,
467-
$level
468-
) . $this->_addSubMenu(
469-
$menuItem,
470-
$level,
471-
$limit,
472-
$id
473-
) . '</li>';
458+
$subMenu = $this->_addSubMenu($menuItem, $level, $limit, $id);
459+
if (count($menu) > 1 || $level != 1 || $menuItem->getUrl() !== '#') {
460+
$output .= '<li ' . $this->getUiId($menuItem->getId())
461+
. ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass($menuItem, $level)
462+
. ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
463+
. '" role="menu-item">' . $this->_renderAnchor($menuItem, $level) . $subMenu . '</li>';
474464
} else {
475-
$output .= $this->_addSubMenu(
476-
$menuItem,
477-
$level,
478-
$limit,
479-
$id);
465+
$output .= $subMenu;
480466
}
481467

482468
$itemPosition++;

‎app/code/Magento/Backend/Block/Widget/Button/Item.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,25 @@
1616
*/
1717
class Item extends \Magento\Framework\Object
1818
{
19+
/**
20+
* Object delete flag
21+
*
22+
* @var bool
23+
*/
24+
protected $_isDeleted = false;
25+
26+
/**
27+
* Set _isDeleted flag value (if $isDeleted parameter is defined) and return current flag value
28+
*
29+
* @param boolean $isDeleted
30+
* @return bool
31+
*/
32+
public function isDeleted($isDeleted = null)
33+
{
34+
$result = $this->_isDeleted;
35+
if ($isDeleted !== null) {
36+
$this->_isDeleted = $isDeleted;
37+
}
38+
return $result;
39+
}
1940
}

‎app/code/Magento/Backend/Helper/Dashboard/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class Data extends \Magento\Framework\App\Helper\AbstractHelper
1515
{
1616
/**
17-
* @var \Magento\Framework\Data\Collection\Db
17+
* @var \MagentoFrameworkDataCollectionAbstractDb
1818
*/
1919
protected $_stores;
2020

@@ -48,7 +48,7 @@ public function __construct(
4848
/**
4949
* Retrieve stores configured in system.
5050
*
51-
* @return \Magento\Framework\Data\Collection\Db
51+
* @return \MagentoFrameworkDataCollectionAbstractDb
5252
*/
5353
public function getStores()
5454
{

‎app/code/Magento/Backup/Model/Config/Backend/Cron.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Cron extends \Magento\Framework\App\Config\Value
3434
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
3535
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
3636
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
37-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
37+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
3838
* @param string $runModelPath
3939
* @param array $data
4040
*/
@@ -44,7 +44,7 @@ public function __construct(
4444
\Magento\Framework\App\Config\ScopeConfigInterface $config,
4545
\Magento\Framework\App\Config\ValueFactory $configValueFactory,
4646
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
47-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
47+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
4848
$runModelPath = '',
4949
array $data = []
5050
) {

‎app/code/Magento/Backup/Model/Resource/Db.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ public function getTableStatus($tableName)
124124

125125
if ($row) {
126126
$statusObject = new \Magento\Framework\Object();
127-
$statusObject->setIdFieldName('name');
128127
foreach ($row as $field => $value) {
129128
$statusObject->setData(strtolower($field), $value);
130129
}

‎app/code/Magento/Bundle/Model/Option.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ protected function _construct()
5353
*/
5454
public function addSelection(\Magento\Catalog\Model\Product $selection)
5555
{
56-
$selections = $this->getDataSetDefault('selections', []);
56+
if (!$this->hasData('selections')) {
57+
$this->setData('selections', []);
58+
}
59+
$selections = $this->getData('selections');
5760
$selections[] = $selection;
5861
$this->setSelections($selections);
5962
}

‎app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Creditmemo extends AbstractItems
2525
* @param \Magento\Framework\Filter\FilterManager $filterManager
2626
* @param \Magento\Framework\Stdlib\String $string
2727
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
28-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
28+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
2929
* @param array $data
3030
*/
3131
public function __construct(
@@ -36,7 +36,7 @@ public function __construct(
3636
\Magento\Framework\Filter\FilterManager $filterManager,
3737
\Magento\Framework\Stdlib\String $string,
3838
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
39-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
39+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
4040
array $data = []
4141
) {
4242
$this->string = $string;

‎app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Invoice extends AbstractItems
2626
* @param \Magento\Framework\Filter\FilterManager $filterManager
2727
* @param \Magento\Framework\Stdlib\String $coreString
2828
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
29-
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
29+
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
3030
* @param array $data
3131
*/
3232
public function __construct(
@@ -37,7 +37,7 @@ public function __construct(
3737
\Magento\Framework\Filter\FilterManager $filterManager,
3838
\Magento\Framework\Stdlib\String $coreString,
3939
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
40-
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
40+
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
4141
array $data = []
4242
) {
4343
$this->string = $coreString;

0 commit comments

Comments
 (0)