Skip to content

Commit 6422081

Browse files
author
Joan He
committed
Merge remote-tracking branch 'upstream/develop' into MAGETWO-44681-fpc-not-refreshed
2 parents 34f54c5 + 9272b2f commit 6422081

File tree

176 files changed

+6609
-1778
lines changed

Some content is hidden

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

176 files changed

+6609
-1778
lines changed

‎.htaccess

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,32 @@
5858

5959
</IfModule>
6060

61+
<IfModule mod_php7.c>
62+
63+
############################################
64+
## adjust memory limit
65+
66+
php_value memory_limit 768M
67+
php_value max_execution_time 18000
68+
69+
############################################
70+
## disable automatic session start
71+
## before autoload was initialized
72+
73+
php_flag session.auto_start off
74+
75+
############################################
76+
## enable resulting html compression
77+
78+
#php_flag zlib.output_compression on
79+
80+
###########################################
81+
## disable user agent verification to not break multiple image upload
82+
83+
php_flag suhosin.session.cryptua off
84+
85+
</IfModule>
86+
6187
<IfModule mod_security.c>
6288
###########################################
6389
## disable POST processing to not break multiple image upload

‎app/code/Magento/Backend/Block/Widget/Tabs.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ public function addTabAfter($tabId, $tab, $afterTabId)
111111
*/
112112
public function addTab($tabId, $tab)
113113
{
114+
if (empty($tabId)) {
115+
throw new \Exception(__('Please correct the tab configuration and try again. Tab Id should be not empry'));
116+
}
114117
if (is_array($tab)) {
115118
$this->_tabs[$tabId] = new \Magento\Framework\DataObject($tab);
116119
} elseif ($tab instanceof \Magento\Framework\DataObject) {

‎app/code/Magento/Catalog/Block/Product/View.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ public function getJsonConfig()
219219
/* @var $product \Magento\Catalog\Model\Product */
220220
$product = $this->getProduct();
221221

222-
$config = [];
223222
if (!$this->hasOptions()) {
224223
$config = [
225224
'productId' => $product->getId(),

‎app/code/Magento/Catalog/Block/Product/View/Options.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ protected function _getPriceConfiguration($option)
162162
$data = [
163163
'prices' => [
164164
'oldPrice' => [
165-
'amount' => $optionPrice,
165+
'amount' => $this->pricingHelper->currency($option->getRegularPrice(), false, false),
166166
'adjustments' => [],
167167
],
168168
'basePrice' => [
@@ -208,7 +208,6 @@ public function getJsonConfig()
208208
$config = [];
209209
foreach ($this->getOptions() as $option) {
210210
/* @var $option \Magento\Catalog\Model\Product\Option */
211-
$priceValue = 0;
212211
if ($option->getGroupByType() == \Magento\Catalog\Model\Product\Option::OPTION_GROUP_SELECT) {
213212
$tmpPriceValues = [];
214213
foreach ($option->getValues() as $value) {

‎app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public function filter(
6363
->addTaxPercents()
6464
->addStoreFilter()
6565
->addUrlRewrite()
66-
->setVisibility($this->productVisibility->getVisibleInSearchIds())
67-
->setOrder('relevance', Select::SQL_DESC);
66+
->setVisibility($this->productVisibility->getVisibleInSearchIds());
6867
}
6968
}

‎app/code/Magento/Catalog/Model/Product.php

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,19 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
117117
*/
118118
protected $_errors = [];
119119

120+
/**
121+
* Product option factory
122+
*
123+
* @var Product\OptionFactory
124+
*/
125+
protected $optionFactory;
126+
120127
/**
121128
* Product option
122129
*
123130
* @var Product\Option
124131
*/
125-
protected $_optionInstance;
132+
protected $optionInstance;
126133

127134
/**
128135
* @var array
@@ -337,7 +344,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
337344
* @param Product\Link $productLink
338345
* @param Product\Configuration\Item\OptionFactory $itemOptionFactory
339346
* @param \Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory
340-
* @param Product\Option $catalogProductOption
347+
* @param Product\OptionFactory $catalogProductOptionFactory
341348
* @param Product\Visibility $catalogProductVisibility
342349
* @param Product\Attribute\Source\Status $catalogProductStatus
343350
* @param Product\Media\Config $catalogProductMediaConfig
@@ -376,7 +383,7 @@ public function __construct(
376383
Product\Link $productLink,
377384
\Magento\Catalog\Model\Product\Configuration\Item\OptionFactory $itemOptionFactory,
378385
\Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory $stockItemFactory,
379-
\Magento\Catalog\Model\Product\Option $catalogProductOption,
386+
\Magento\Catalog\Model\Product\OptionFactory $catalogProductOptionFactory,
380387
\Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
381388
\Magento\Catalog\Model\Product\Attribute\Source\Status $catalogProductStatus,
382389
\Magento\Catalog\Model\Product\Media\Config $catalogProductMediaConfig,
@@ -405,7 +412,7 @@ public function __construct(
405412
$this->metadataService = $metadataService;
406413
$this->_itemOptionFactory = $itemOptionFactory;
407414
$this->_stockItemFactory = $stockItemFactory;
408-
$this->_optionInstance = $catalogProductOption;
415+
$this->optionFactory = $catalogProductOptionFactory;
409416
$this->_catalogProductVisibility = $catalogProductVisibility;
410417
$this->_catalogProductStatus = $catalogProductStatus;
411418
$this->_catalogProductMediaConfig = $catalogProductMediaConfig;
@@ -1889,7 +1896,11 @@ public function getWeight()
18891896
*/
18901897
public function getOptionInstance()
18911898
{
1892-
return $this->_optionInstance;
1899+
if (!isset($this->optionInstance)) {
1900+
$this->optionInstance = $this->optionFactory->create();
1901+
$this->optionInstance->setProduct($this);
1902+
}
1903+
return $this->optionInstance;
18931904
}
18941905

18951906
/**

‎app/code/Magento/Catalog/Model/Product/Attribute/Group.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,23 @@ class Group extends \Magento\Eav\Model\Entity\Attribute\Group
1818
protected $_attributeCollectionFactory;
1919

2020
/**
21+
* Group constructor.
2122
* @param \Magento\Framework\Model\Context $context
2223
* @param \Magento\Framework\Registry $registry
2324
* @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
2425
* @param AttributeValueFactory $customAttributeFactory
26+
* @param \Magento\Framework\Filter\Translit $translitFilter
2527
* @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory
26-
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
27-
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
28+
* @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
29+
* @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
2830
* @param array $data
2931
*/
3032
public function __construct(
3133
\Magento\Framework\Model\Context $context,
3234
\Magento\Framework\Registry $registry,
3335
\Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory,
3436
AttributeValueFactory $customAttributeFactory,
37+
\Magento\Framework\Filter\Translit $translitFilter,
3538
\Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory,
3639
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
3740
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
@@ -43,6 +46,7 @@ public function __construct(
4346
$registry,
4447
$extensionFactory,
4548
$customAttributeFactory,
49+
$translitFilter,
4650
$resource,
4751
$resourceCollection,
4852
$data

0 commit comments

Comments
 (0)