Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 200d0ab

Browse files
vrannvrann
committed
Merge remote-tracking branch 'mainline/2.3-develop' into elasticsearch5
2 parents 54fd1aa + c33674d commit 200d0ab

File tree

818 files changed

+1092
-1016
lines changed

Some content is hidden

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

818 files changed

+1092
-1016
lines changed

‎.htaccess

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,15 @@
355355
Require all denied
356356
</IfVersion>
357357
</Files>
358+
<Files auth.json>
359+
<IfVersion < 2.4>
360+
order allow,deny
361+
deny from all
362+
</IfVersion>
363+
<IfVersion >= 2.4>
364+
Require all denied
365+
</IfVersion>
366+
</Files>
358367

359368
# For 404s and 403s that aren't handled by the application, show plain 404 response
360369
ErrorDocument 404 /pub/errors/404.php

‎.htaccess.sample

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,15 @@
332332
Require all denied
333333
</IfVersion>
334334
</Files>
335+
<Files auth.json>
336+
<IfVersion < 2.4>
337+
order allow,deny
338+
deny from all
339+
</IfVersion>
340+
<IfVersion >= 2.4>
341+
Require all denied
342+
</IfVersion>
343+
</Files>
335344

336345
# For 404s and 403s that aren't handled by the application, show plain 404 response
337346
ErrorDocument 404 /pub/errors/404.php

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.3-develop)](https://travis-ci.org/magento/magento2)
2+
[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
23
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
34
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
45
<h2>Welcome</h2>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ public function save(
201201

202202
/** @var \Magento\Bundle\Model\Option $existingOption */
203203
$existingOption = $optionCollection->getFirstItem();
204-
if (!$optionId) {
205-
$option->setOptionId(null);
206-
}
207204
if (!$optionId || $existingOption->getParentId() != $parentId) {
205+
//If option ID is empty or existing option's parent ID is different
206+
//we'd need a new ID for the option.
207+
$option->setOptionId(null);
208208
$option->setDefaultTitle($option->getTitle());
209209
if (is_array($option->getProductLinks())) {
210210
$linksToAdd = $option->getProductLinks();

‎app/code/Magento/Bundle/Model/Product/SaveHandler.php

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace Magento\Bundle\Model\Product;
77

8+
use Magento\Bundle\Api\Data\OptionInterface;
89
use Magento\Catalog\Api\Data\ProductInterface;
910
use Magento\Bundle\Api\ProductOptionRepositoryInterface as OptionRepository;
1011
use Magento\Bundle\Api\ProductLinkManagementInterface;
@@ -49,42 +50,58 @@ public function __construct(
4950
?: ObjectManager::getInstance()->get(MetadataPool::class);
5051
}
5152

53+
/**
54+
* @param ProductInterface $bundle
55+
* @param OptionInterface[] $currentOptions
56+
*
57+
* @return void
58+
*/
59+
private function removeOldOptions(
60+
ProductInterface $bundle,
61+
array $currentOptions
62+
) {
63+
$oldOptions = $this->optionRepository->getList($bundle->getSku());
64+
if ($oldOptions) {
65+
$remainingOptions = [];
66+
$metadata
67+
= $this->metadataPool->getMetadata(ProductInterface::class);
68+
$productId = $bundle->getData($metadata->getLinkField());
69+
70+
foreach ($currentOptions as $option) {
71+
$remainingOptions[] = $option->getOptionId();
72+
}
73+
foreach ($oldOptions as $option) {
74+
if (!in_array($option->getOptionId(), $remainingOptions)) {
75+
$option->setParentId($productId);
76+
$this->removeOptionLinks($bundle->getSku(), $option);
77+
$this->optionRepository->delete($option);
78+
}
79+
}
80+
}
81+
}
82+
5283
/**
5384
* @param object $entity
5485
* @param array $arguments
55-
* @return \Magento\Catalog\Api\Data\ProductInterface|object
86+
*
87+
* @return ProductInterface|object
88+
*
5689
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
5790
*/
5891
public function execute($entity, $arguments = [])
5992
{
6093
/** @var \Magento\Bundle\Api\Data\OptionInterface[] $options */
6194
$options = $entity->getExtensionAttributes()->getBundleProductOptions() ?: [];
62-
95+
//Only processing bundle products.
6396
if ($entity->getTypeId() !== 'bundle' || empty($options)) {
6497
return $entity;
6598
}
66-
99+
/** @var ProductInterface $entity */
100+
//Removing old options
67101
if (!$entity->getCopyFromView()) {
68-
$updatedOptions = [];
69-
$oldOptions = $this->optionRepository->getList($entity->getSku());
70-
71-
$metadata = $this->metadataPool->getMetadata(ProductInterface::class);
72-
73-
$productId = $entity->getData($metadata->getLinkField());
74-
75-
foreach ($options as $option) {
76-
$updatedOptions[$option->getOptionId()][$productId] = (bool)$option->getOptionId();
77-
}
78-
79-
foreach ($oldOptions as $option) {
80-
if (!isset($updatedOptions[$option->getOptionId()][$productId])) {
81-
$option->setParentId($productId);
82-
$this->removeOptionLinks($entity->getSku(), $option);
83-
$this->optionRepository->delete($option);
84-
}
85-
}
102+
$this->removeOldOptions($entity, $options);
86103
}
87-
104+
//Saving active options.
88105
foreach ($options as $option) {
89106
$this->optionRepository->save($entity, $option);
90107
}

‎app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,29 @@ public function __construct(
8787
$this->activeTableSwitcher = $activeTableSwitcher ?: $objectManager->get(ActiveTableSwitcher::class);
8888
}
8989

90+
/**
91+
*
92+
* Clear the table we'll be writing de-normalized data into
93+
* to prevent archived data getting in the way of actual data.
94+
*
95+
* @return void
96+
*/
97+
private function clearCurrentTable()
98+
{
99+
$this->connection->delete(
100+
$this->activeTableSwitcher
101+
->getAdditionalTableName($this->getMainTable())
102+
);
103+
}
104+
90105
/**
91106
* Refresh entities index
92107
*
93108
* @return $this
94109
*/
95110
public function execute()
96111
{
112+
$this->clearCurrentTable();
97113
$this->reindex();
98114
$this->activeTableSwitcher->switchTable($this->connection, [$this->getMainTable()]);
99115
return $this;
@@ -103,6 +119,9 @@ public function execute()
103119
* Return select for remove unnecessary data
104120
*
105121
* @return \Magento\Framework\DB\Select
122+
*
123+
* @deprecated Not used anymore.
124+
* @see clearCurrentTable()
106125
*/
107126
protected function getSelectUnnecessaryData()
108127
{
@@ -127,12 +146,14 @@ protected function getSelectUnnecessaryData()
127146
* Remove unnecessary data
128147
*
129148
* @return void
149+
*
150+
* @deprecated Not used anymore.
151+
* @see clearCurrentTable()
130152
*/
131153
protected function removeUnnecessaryData()
132154
{
133-
$this->connection->query(
134-
$this->connection->deleteFromSelect($this->getSelectUnnecessaryData(), $this->getMainTable())
135-
);
155+
//Called for backward compatibility.
156+
$this->getSelectUnnecessaryData();
136157
}
137158

138159
/**
@@ -233,6 +254,7 @@ private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSe
233254
)
234255
);
235256
$this->publishData();
257+
//Called for backward compatibility.
236258
$this->removeUnnecessaryData();
237259
}
238260
}

‎app/code/Magento/Rss/Model/Rss.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Magento\Framework\App\ObjectManager;
99
use Magento\Framework\App\Rss\DataProviderInterface;
1010
use Magento\Framework\Serialize\SerializerInterface;
11+
use Zend\Feed\Writer\FeedFactory;
1112

1213
/**
1314
* Provides functionality to work with RSS feeds
@@ -92,7 +93,7 @@ public function setDataProvider(DataProviderInterface $dataProvider)
9293
*/
9394
public function createRssXml()
9495
{
95-
$rssFeedFromArray = \Zend_Feed::importArray($this->getFeeds(), 'rss');
96-
return $rssFeedFromArray->saveXML();
96+
$feed = FeedFactory::factory($this->getFeeds());
97+
return $feed->export('rss');
9798
}
9899
}

‎app/code/Magento/Rss/Test/Unit/Controller/Adminhtml/Feed/IndexTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\Rss\Test\Unit\Controller\Adminhtml\Feed;
77

88
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
9+
use Zend\Feed\Writer\Exception\InvalidArgumentException;
910

1011
/**
1112
* Class IndexTest
@@ -110,7 +111,7 @@ public function testExecuteWithException()
110111
$this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel));
111112
$this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider));
112113

113-
$this->expectException('\Zend_Feed_Builder_Exception');
114+
$this->expectException(InvalidArgumentException::class);
114115
$this->controller->execute();
115116
}
116117
}

‎app/code/Magento/Rss/Test/Unit/Controller/Feed/IndexTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\Rss\Test\Unit\Controller\Feed;
77

88
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
9+
use Zend\Feed\Writer\Exception\InvalidArgumentException;
910

1011
/**
1112
* Class IndexTest
@@ -97,7 +98,7 @@ public function testExecuteWithException()
9798
$this->rssFactory->expects($this->once())->method('create')->will($this->returnValue($rssModel));
9899
$this->rssManager->expects($this->once())->method('getProvider')->will($this->returnValue($dataProvider));
99100

100-
$this->expectException('\Zend_Feed_Builder_Exception');
101+
$this->expectException(InvalidArgumentException::class);
101102
$this->controller->execute();
102103
}
103104
}

‎app/code/Magento/Rss/Test/Unit/Model/RssTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ public function testCreateRssXml()
119119
$this->rss->setDataProvider($dataProvider);
120120
$result = $this->rss->createRssXml();
121121
$this->assertContains('<?xml version="1.0" encoding="UTF-8"?>', $result);
122-
$this->assertContains('<title><![CDATA[Feed Title]]></title>', $result);
123-
$this->assertContains('<title><![CDATA[Feed 1 Title]]></title>', $result);
122+
$this->assertContains('<title>Feed Title</title>', $result);
123+
$this->assertContains('<title>Feed 1 Title</title>', $result);
124124
$this->assertContains('<link>http://magento.com/rss/link</link>', $result);
125125
$this->assertContains('<link>http://magento.com/rss/link/id/1</link>', $result);
126-
$this->assertContains('<description><![CDATA[Feed Description]]></description>', $result);
126+
$this->assertContains('<description>Feed Description</description>', $result);
127127
$this->assertContains('<description><![CDATA[Feed 1 Description]]></description>', $result);
128128
}
129129
}

0 commit comments

Comments
 (0)