Skip to content

Commit 9b977b0

Browse files
vrannvrann
authored
Merge pull request #966 from magento-engcom/develop-prs
[EngCom] Public Pull Requests
2 parents 46eaf40 + 3fab2f0 commit 9b977b0

File tree

15 files changed

+23
-42
lines changed

15 files changed

+23
-42
lines changed

‎app/code/Magento/Backend/etc/di.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
</argument>
2727
</arguments>
2828
</type>
29-
<type name="Magento\Backend\App\Router">
30-
<arguments>
31-
<argument name="routerId" xsi:type="string">admin</argument>
32-
</arguments>
33-
</type>
3429
<type name="Magento\Backend\Model\Menu\Config">
3530
<arguments>
3631
<argument name="menuDirector" xsi:type="object">Magento\Backend\Model\Menu\Director\Director</argument>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ public function getSpecifyOptionMessage()
576576
*/
577577
protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $product, $processMode)
578578
{
579-
$transport = new \StdClass();
579+
$transport = new \stdClass();
580580
$transport->options = [];
581581
$options = null;
582582
if ($product->getHasOptions()) {

‎app/code/Magento/CatalogInventory/Observer/ReindexQuoteInventoryObserver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function execute(EventObserver $observer)
7777
$this->priceIndexer->reindexList($productIds);
7878
}
7979

80-
$this->itemsForReindex ->clear();
80+
$this->itemsForReindex->clear();
8181
// Clear list of remembered items - we don't need it anymore
8282
}
8383
}

‎app/code/Magento/Cms/Controller/Router.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
namespace Magento\Cms\Controller;
77

88
/**
9-
* Cms Controller Router
10-
*
11-
* @author Magento Core Team <[email protected]>
9+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1210
*/
1311
class Router implements \Magento\Framework\App\RouterInterface
1412
{
@@ -87,7 +85,7 @@ public function __construct(
8785
* Validate and Match Cms Page and modify request
8886
*
8987
* @param \Magento\Framework\App\RequestInterface $request
90-
* @return bool
88+
* @return \Magento\Framework\App\ActionInterface|null
9189
*/
9290
public function match(\Magento\Framework\App\RequestInterface $request)
9391
{

‎app/code/Magento/Cms/view/frontend/layout/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<referenceBlock name="footer_links">
1414
<block class="Magento\Framework\View\Element\Html\Link\Current" name="privacy-policy-link">
1515
<arguments>
16-
<argument name="label" xsi:type="string">Privacy and Cookie Policy</argument>
16+
<argument name="label" xsi:type="string" translate="true">Privacy and Cookie Policy</argument>
1717
<argument name="path" xsi:type="string">privacy-policy-cookie-restriction-mode</argument>
1818
</arguments>
1919
</block>

‎app/code/Magento/ConfigurableProduct/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Summary,Summary
3535
"This attribute is used in configurable products. You cannot remove it from the attribute set.","This attribute is used in configurable products. You cannot remove it from the attribute set."
3636
"Associated Products","Associated Products"
3737
"Step 2: Attribute Values","Step 2: Attribute Values"
38-
"Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU.","Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU."
38+
"Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU.","Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU."
3939
"Sort Variations","Sort Variations"
4040
Options,Options
4141
"Select All","Select All"

‎app/code/Magento/Directory/etc/zip_codes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
</zip>
320320
<zip countryCode="NL">
321321
<codes>
322-
<code id="pattern_1" active="true" example="1234 AB">^[0-9]{4}\s[a-zA-Z]{2}$</code>
322+
<code id="pattern_1" active="true" example="1234 AB">^[0-9]{4}\s?[a-zA-Z]{2}$</code>
323323
</codes>
324324
</zip>
325325
<zip countryCode="NO">

‎app/code/Magento/Store/etc/di.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,6 @@
276276
<argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
277277
</arguments>
278278
</type>
279-
<type name="Magento\Framework\App\Router\Base">
280-
<arguments>
281-
<argument name="routerId" xsi:type="string">standard</argument>
282-
</arguments>
283-
</type>
284279
<type name="Magento\Framework\Stdlib\DateTime\Timezone">
285280
<arguments>
286281
<argument name="defaultTimezonePath" xsi:type="const">Magento\Directory\Helper\Data::XML_PATH_DEFAULT_TIMEZONE</argument>

‎app/code/Magento/Swatches/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Delete,Delete
1515
"Upload a file","Upload a file"
1616
Clear,Clear
1717
"Step 2: Attribute Values","Step 2: Attribute Values"
18-
"Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU.","Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU."
18+
"Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU.","Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU."
1919
"Sort Variations","Sort Variations"
2020
Options,Options
2121
"Select All","Select All"

‎app/code/Magento/Theme/etc/config.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
</invalid_caches>
1616
<head translate="default_description">
1717
<default_title>Magento Commerce</default_title>
18-
<default_description>Default Description</default_description>
19-
<default_keywords>Magento, Varien, E-commerce</default_keywords>
2018
<default_media_type>text/html</default_media_type>
2119
<default_charset>utf-8</default_charset>
2220
<demonotice>0</demonotice>
@@ -44,7 +42,6 @@ Disallow: /*SID=
4442
</default_custom_instructions>
4543
</search_engine_robots>
4644
<header translate="welcome">
47-
<logo_alt>Magento Commerce</logo_alt>
4845
<welcome>Default welcome msg!</welcome>
4946
</header>
5047
<footer translate="copyright">

‎app/code/Magento/Theme/i18n/en_US.csv

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ Configuration,Configuration
133133
"Edit custom instruction of robots.txt File","Edit custom instruction of robots.txt File"
134134
"Reset to Defaults","Reset to Defaults"
135135
"This action will delete your custom instructions and reset robots.txt file to system's default settings.","This action will delete your custom instructions and reset robots.txt file to system's default settings."
136-
"Default Description","Default Description"
137136
"Default welcome msg!","Default welcome msg!"
138137
"Copyright © 2013-2017 Magento, Inc. All rights reserved.","Copyright © 2013-2017 Magento, Inc. All rights reserved."
139138
"Design Config Grid","Design Config Grid"
@@ -145,11 +144,12 @@ Configuration,Configuration
145144
"HTML Head","HTML Head"
146145
"Favicon Icon","Favicon Icon"
147146
"Allowed file types: ico, png, gif, jpg, jpeg, apng, svg. Not all browsers support all these formats!","Allowed file types: ico, png, gif, jpg, jpeg, apng, svg. Not all browsers support all these formats!"
148-
"Default Title","Default Title"
149-
"Title Prefix","Title Prefix"
150-
"Title Suffix","Title Suffix"
151-
"Default Keywords","Default Keywords"
152147
"Miscellaneous Scripts","Miscellaneous Scripts"
148+
"Default Page Title","Default Page Title"
149+
"Page Title Prefix","Page Title Prefix"
150+
"Page Title Suffix","Page Title Suffix"
151+
"Default Meta Description","Default Meta Description"
152+
"Default Meta Keywords","Default Meta Keywords"
153153
"Display Demo Store Notice","Display Demo Store Notice"
154154
Header,Header
155155
"Logo Image","Logo Image"

‎app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<field name="head_default_title">
7878
<argument name="data" xsi:type="array">
7979
<item name="config" xsi:type="array">
80-
<item name="label" xsi:type="string" translate="true">Default Title</item>
80+
<item name="label" xsi:type="string" translate="true">Default Page Title</item>
8181
<item name="dataType" xsi:type="string">text</item>
8282
<item name="formElement" xsi:type="string">input</item>
8383
<item name="dataScope" xsi:type="string">head_default_title</item>
@@ -90,7 +90,7 @@
9090
<field name="head_title_prefix">
9191
<argument name="data" xsi:type="array">
9292
<item name="config" xsi:type="array">
93-
<item name="label" xsi:type="string" translate="true">Title Prefix</item>
93+
<item name="label" xsi:type="string" translate="true">Page Title Prefix</item>
9494
<item name="dataType" xsi:type="string">text</item>
9595
<item name="formElement" xsi:type="string">input</item>
9696
<item name="dataScope" xsi:type="string">head_title_prefix</item>
@@ -103,7 +103,7 @@
103103
<field name="head_title_suffix">
104104
<argument name="data" xsi:type="array">
105105
<item name="config" xsi:type="array">
106-
<item name="label" xsi:type="string" translate="true">Title Suffix</item>
106+
<item name="label" xsi:type="string" translate="true">Page Title Suffix</item>
107107
<item name="dataType" xsi:type="string">text</item>
108108
<item name="formElement" xsi:type="string">input</item>
109109
<item name="dataScope" xsi:type="string">head_title_suffix</item>
@@ -116,7 +116,7 @@
116116
<field name="head_default_description">
117117
<argument name="data" xsi:type="array">
118118
<item name="config" xsi:type="array">
119-
<item name="label" xsi:type="string" translate="true">Default Description</item>
119+
<item name="label" xsi:type="string" translate="true">Default Meta Description</item>
120120
<item name="dataType" xsi:type="string">text</item>
121121
<item name="formElement" xsi:type="string">textarea</item>
122122
<item name="dataScope" xsi:type="string">head_default_description</item>
@@ -129,7 +129,7 @@
129129
<field name="head_default_keywords">
130130
<argument name="data" xsi:type="array">
131131
<item name="config" xsi:type="array">
132-
<item name="label" xsi:type="string" translate="true">Default Keywords</item>
132+
<item name="label" xsi:type="string" translate="true">Default Meta Keywords</item>
133133
<item name="dataType" xsi:type="string">text</item>
134134
<item name="formElement" xsi:type="string">textarea</item>
135135
<item name="dataScope" xsi:type="string">head_default_keywords</item>

‎lib/internal/Magento/Framework/App/Router/Base.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ class Base implements \Magento\Framework\App\RouterInterface
116116
* @param \Magento\Framework\App\ResponseFactory $responseFactory
117117
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
118118
* @param \Magento\Framework\UrlInterface $url
119-
* @param string $routerId
120119
* @param \Magento\Framework\Code\NameBuilder $nameBuilder
121120
* @param \Magento\Framework\App\Router\PathConfigInterface $pathConfig
122121
*
@@ -131,7 +130,6 @@ public function __construct(
131130
\Magento\Framework\App\ResponseFactory $responseFactory,
132131
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
133132
\Magento\Framework\UrlInterface $url,
134-
$routerId,
135133
\Magento\Framework\Code\NameBuilder $nameBuilder,
136134
\Magento\Framework\App\Router\PathConfigInterface $pathConfig
137135
) {

‎lib/internal/Magento/Framework/Css/PreProcessor/Adapter/Less/Processor.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,11 @@ public function processContent(File $asset)
8888
gc_enable();
8989

9090
if (trim($content) === '') {
91-
$errorMessage = PHP_EOL . self::ERROR_MESSAGE_PREFIX . PHP_EOL . $path;
92-
$this->logger->critical($errorMessage);
93-
94-
throw new ContentProcessorException(new Phrase($errorMessage));
91+
$this->logger->warning('Parsed less file is empty: ' . $path);
92+
return '';
93+
} else {
94+
return $content;
9595
}
96-
97-
return $content;
9896
} catch (\Exception $e) {
9997
throw new ContentProcessorException(new Phrase($e->getMessage()));
10098
}

‎lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ public function getQueryValue($name = null, $default = null)
533533
}
534534

535535
/**
536-
* Retrieve GET parameters
536+
* Set GET parameters
537537
*
538538
* @param string $name
539539
* @param mixed $value

0 commit comments

Comments
 (0)