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

Commit bda7741

Browse files
AfreenScarletAfreenScarlet
authored
Merge pull request #1 from magento/2.3-develop
Updating the fork
2 parents 49ad674 + 8b3fd9d commit bda7741

File tree

398 files changed

+11381
-1472
lines changed

Some content is hidden

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

398 files changed

+11381
-1472
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.notification.container.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">notificationGrid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
1515
<argument name="default_dir" xsi:type="string">DESC</argument>
1616
<argument name="default_sort" xsi:type="string">date_added</argument>
1717
<argument name="save_parameters_in_session" xsi:type="string">1</argument>

‎app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\AdvancedSearch\Block\Adminhtml\Search\Grid" name="search.edit.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">catalog_search_grid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection</argument>
1515
<argument name="default_sort" xsi:type="string">name</argument>
1616
<argument name="default_dir" xsi:type="string">ASC</argument>
1717
<argument name="save_parameters_in_session" xsi:type="string">1</argument>

‎app/code/Magento/Backend/Block/Store/Switcher.php‎

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Switcher extends \Magento\Backend\Block\Template
1717
/**
1818
* URL for store switcher hint
1919
*/
20-
const HINT_URL = 'http://docs.magento.com/m2/ce/user_guide/configuration/scope.html';
20+
const HINT_URL = 'https://docs.magento.com/m2/ce/user_guide/configuration/scope.html';
2121

2222
/**
2323
* Name of website variable
@@ -86,6 +86,8 @@ class Switcher extends \Magento\Backend\Block\Template
8686
protected $_storeFactory;
8787

8888
/**
89+
* Switcher constructor.
90+
*
8991
* @param \Magento\Backend\Block\Template\Context $context
9092
* @param \Magento\Store\Model\WebsiteFactory $websiteFactory
9193
* @param \Magento\Store\Model\GroupFactory $storeGroupFactory
@@ -106,7 +108,7 @@ public function __construct(
106108
}
107109

108110
/**
109-
* @return void
111+
* @inheritdoc
110112
*/
111113
protected function _construct()
112114
{
@@ -130,6 +132,8 @@ protected function _construct()
130132
}
131133

132134
/**
135+
* Get website collection.
136+
*
133137
* @return \Magento\Store\Model\ResourceModel\Website\Collection
134138
*/
135139
public function getWebsiteCollection()
@@ -169,6 +173,8 @@ public function isWebsiteSwitchEnabled()
169173
}
170174

171175
/**
176+
* Set website variable name.
177+
*
172178
* @param string $varName
173179
* @return $this
174180
*/
@@ -179,6 +185,8 @@ public function setWebsiteVarName($varName)
179185
}
180186

181187
/**
188+
* Get website variable name.
189+
*
182190
* @return string
183191
*/
184192
public function getWebsiteVarName()
@@ -191,6 +199,8 @@ public function getWebsiteVarName()
191199
}
192200

193201
/**
202+
* Check if current website selected.
203+
*
194204
* @param \Magento\Store\Model\Website $website
195205
* @return bool
196206
*/
@@ -200,6 +210,8 @@ public function isWebsiteSelected(\Magento\Store\Model\Website $website)
200210
}
201211

202212
/**
213+
* Return website Id.
214+
*
203215
* @return int|null
204216
*/
205217
public function getWebsiteId()
@@ -211,6 +223,8 @@ public function getWebsiteId()
211223
}
212224

213225
/**
226+
* Return group collection provided website.
227+
*
214228
* @param int|\Magento\Store\Model\Website $website
215229
* @return \Magento\Store\Model\ResourceModel\Group\Collection
216230
*/
@@ -247,6 +261,8 @@ public function isStoreGroupSwitchEnabled()
247261
}
248262

249263
/**
264+
* Sets store group variable name.
265+
*
250266
* @param string $varName
251267
* @return $this
252268
*/
@@ -257,6 +273,8 @@ public function setStoreGroupVarName($varName)
257273
}
258274

259275
/**
276+
* Return store group variable name.
277+
*
260278
* @return string
261279
*/
262280
public function getStoreGroupVarName()
@@ -269,6 +287,8 @@ public function getStoreGroupVarName()
269287
}
270288

271289
/**
290+
* Is provided group selected.
291+
*
272292
* @param \Magento\Store\Model\Group $group
273293
* @return bool
274294
*/
@@ -278,6 +298,8 @@ public function isStoreGroupSelected(\Magento\Store\Model\Group $group)
278298
}
279299

280300
/**
301+
* Return store group Id.
302+
*
281303
* @return int|null
282304
*/
283305
public function getStoreGroupId()
@@ -289,6 +311,8 @@ public function getStoreGroupId()
289311
}
290312

291313
/**
314+
* Return store collection.
315+
*
292316
* @param \Magento\Store\Model\Group|int $group
293317
* @return \Magento\Store\Model\ResourceModel\Store\Collection
294318
*/
@@ -328,6 +352,8 @@ public function getStores($group)
328352
}
329353

330354
/**
355+
* Return store Id.
356+
*
331357
* @return int|null
332358
*/
333359
public function getStoreId()
@@ -339,6 +365,8 @@ public function getStoreId()
339365
}
340366

341367
/**
368+
* Check is provided store selected.
369+
*
342370
* @param \Magento\Store\Model\Store $store
343371
* @return bool
344372
*/
@@ -358,6 +386,8 @@ public function isStoreSwitchEnabled()
358386
}
359387

360388
/**
389+
* Sets store variable name.
390+
*
361391
* @param string $varName
362392
* @return $this
363393
*/
@@ -368,6 +398,8 @@ public function setStoreVarName($varName)
368398
}
369399

370400
/**
401+
* Return store variable name.
402+
*
371403
* @return mixed|string
372404
*/
373405
public function getStoreVarName()
@@ -380,6 +412,8 @@ public function getStoreVarName()
380412
}
381413

382414
/**
415+
* Return switch url.
416+
*
383417
* @return string
384418
*/
385419
public function getSwitchUrl()
@@ -399,6 +433,8 @@ public function getSwitchUrl()
399433
}
400434

401435
/**
436+
* Checks if scope selected.
437+
*
402438
* @return bool
403439
*/
404440
public function hasScopeSelected()
@@ -472,6 +508,8 @@ public function getCurrentStoreName()
472508
}
473509

474510
/**
511+
* Sets store ids.
512+
*
475513
* @param array $storeIds
476514
* @return $this
477515
*/
@@ -482,6 +520,8 @@ public function setStoreIds($storeIds)
482520
}
483521

484522
/**
523+
* Return store ids.
524+
*
485525
* @return array
486526
*/
487527
public function getStoreIds()
@@ -490,6 +530,8 @@ public function getStoreIds()
490530
}
491531

492532
/**
533+
* Check if system is run in the single store mode.
534+
*
493535
* @return bool
494536
*/
495537
public function isShow()
@@ -498,6 +540,8 @@ public function isShow()
498540
}
499541

500542
/**
543+
* Render block.
544+
*
501545
* @return string
502546
*/
503547
protected function _toHtml()

‎app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.cache.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">cache_grid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\Backend\Model\Cache\ResourceModel\Grid\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\Backend\Model\Cache\ResourceModel\Grid\Collection</argument>
1515
<argument name="pager_visibility" xsi:type="string">0</argument>
1616
</arguments>
1717
<block class="Magento\Backend\Block\Widget\Grid\Massaction" name="adminhtml.cache.massaction" as="grid.massaction">

‎app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.design.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">designGrid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\Theme\Model\ResourceModel\Design\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\Theme\Model\ResourceModel\Design\Collection</argument>
1515
<argument name="use_ajax" xsi:type="string">1</argument>
1616
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
1717
<argument name="grid_url" xsi:type="url" path="*/*/grid">

‎app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<arguments>
1313
<argument name="id" xsi:type="string">storeGrid</argument>
1414
<argument name="save_parameters_in_session" xsi:type="string">1</argument>
15-
<argument name="dataSource" xsi:type="object">Magento\Store\Model\ResourceModel\Website\Grid\Collection</argument>
15+
<argument name="dataSource" xsi:type="object" shared="false">Magento\Store\Model\ResourceModel\Website\Grid\Collection</argument>
1616
</arguments>
1717
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="adminhtml.system.store.grid.columnSet" as="grid.columnSet">
1818
<arguments>

‎app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.system.backup.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">backupsGrid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\Backup\Model\Fs\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\Backup\Model\Fs\Collection</argument>
1515
<argument name="default_sort" xsi:type="string">time</argument>
1616
<argument name="default_dir" xsi:type="string">desc</argument>
1717
</arguments>

‎app/code/Magento/Braintree/etc/adminhtml/system.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</requires>
4242
</field>
4343
<group id="configuration_details" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="4">
44-
<comment>http://docs.magento.com/m2/ce/user_guide/payment/braintree.html</comment>
44+
<comment>https://docs.magento.com/m2/ce/user_guide/payment/braintree.html</comment>
4545
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Hint</frontend_model>
4646
</group>
4747
<group id="braintree_required" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="5">

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontSelectBundleProductDropDownOptionActionGroup.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontSelectBundleProductDropDownOptionActionGroup">
12+
<arguments>
13+
<argument name="productName" type="string"/>
14+
</arguments>
15+
<click selector="{{StorefrontBundleProductActionSection.dropdownSelectOption}}" stepKey="clickOnSelectOption"/>
16+
<click selector="{{StorefrontBundleProductActionSection.dropdownProductSelection(productName)}}" stepKey="selectProduct"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup">
12+
<waitForElementVisible selector="{{StorefrontBundleProductActionSection.customizeAndAddToCartButton}}" stepKey="waitForCustomizeAndAddToCartButton"/>
13+
<click selector="{{StorefrontBundleProductActionSection.customizeAndAddToCartButton}}" stepKey="clickOnCustomizeAndAddToCartButton"/>
14+
<waitForPageLoad stepKey="waitForPageLoad"/>
15+
</actionGroup>
16+
</actionGroups>

0 commit comments

Comments
 (0)