Skip to content

Commit 252529f

Browse files
avstudnitzavstudnitz
committed
Merge branch '2.2-develop' into 7241
2 parents 7800e5d + dbcc3c4 commit 252529f

File tree

410 files changed

+7562
-1105
lines changed

Some content is hidden

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

410 files changed

+7562
-1105
lines changed

‎.htaccess‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
############################################
3737
## adjust memory limit
3838

39-
php_value memory_limit 768M
39+
php_value memory_limit 756M
4040
php_value max_execution_time 18000
4141

4242
############################################
@@ -59,7 +59,7 @@
5959
############################################
6060
## adjust memory limit
6161

62-
php_value memory_limit 768M
62+
php_value memory_limit 756M
6363
php_value max_execution_time 18000
6464

6565
############################################

‎.htaccess.sample‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
############################################
3636
## adjust memory limit
3737

38-
php_value memory_limit 768M
38+
php_value memory_limit 756M
3939
php_value max_execution_time 18000
4040

4141
############################################

‎.travis.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ env:
2929
- TEST_SUITE=integration INTEGRATION_INDEX=1
3030
- TEST_SUITE=integration INTEGRATION_INDEX=2
3131
- TEST_SUITE=integration INTEGRATION_INDEX=3
32-
- TEST_SUITE=functional ACCEPTANCE_INDEX=1
33-
- TEST_SUITE=functional ACCEPTANCE_INDEX=2
32+
- TEST_SUITE=functional
3433
matrix:
3534
exclude:
3635
- php: 7.0
@@ -40,9 +39,7 @@ matrix:
4039
- php: 7.0
4140
env: TEST_SUITE=js GRUNT_COMMAND=static
4241
- php: 7.0
43-
env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
44-
- php: 7.0
45-
env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
42+
env: TEST_SUITE=functional
4643
cache:
4744
apt: true
4845
directories:
@@ -55,7 +52,6 @@ install: composer install --no-interaction --prefer-dist
5552
before_script: ./dev/travis/before_script.sh
5653
script:
5754
# Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails
58-
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
5955
- test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
6056

6157
# The scripts for grunt/phpunit type tests

‎.user.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
memory_limit = 768M
1+
memory_limit = 756M
22
max_execution_time = 18000
33
session.auto_start = off
44
suhosin.session.cryptua = off

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
<arguments>
2121
<argument name="filter_visibility" xsi:type="string">0</argument>
2222
</arguments>
23-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="severity">
23+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.severity" as="severity">
2424
<arguments>
2525
<argument name="header" xsi:type="string" translate="true">Severity</argument>
2626
<argument name="index" xsi:type="string">severity</argument>
2727
<argument name="renderer" xsi:type="string">Magento\AdminNotification\Block\Grid\Renderer\Severity</argument>
2828
</arguments>
2929
</block>
30-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="date_added">
30+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.date_added" as="date_added">
3131
<arguments>
3232
<argument name="header" xsi:type="string" translate="true">Date Added</argument>
3333
<argument name="id" xsi:type="string">date_added</argument>
@@ -37,14 +37,14 @@
3737
<argument name="header_css_class" xsi:type="string">col-date</argument>
3838
</arguments>
3939
</block>
40-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="title">
40+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.title" as="title">
4141
<arguments>
4242
<argument name="header" xsi:type="string" translate="true">Message</argument>
4343
<argument name="index" xsi:type="string">title</argument>
4444
<argument name="renderer" xsi:type="string">Magento\AdminNotification\Block\Grid\Renderer\Notice</argument>
4545
</arguments>
4646
</block>
47-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="actions">
47+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.actions" as="actions">
4848
<arguments>
4949
<argument name="header" xsi:type="string" translate="true">Actions</argument>
5050
<argument name="sortable" xsi:type="string">0</argument>

‎app/code/Magento/Backend/Block/Dashboard/Graph.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,8 @@ public function getChartUrl($directUrl = true)
421421
$tmpstring = implode('|', $this->_axisLabels[$idx]);
422422

423423
$valueBuffer[] = $indexid . ":|" . $tmpstring;
424+
} elseif ($idx == 'y') {
425+
$valueBuffer[] = $indexid . ":|" . implode('|', $yLabels);
424426
}
425427
$indexid++;
426428
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<arguments>
4343
<argument name="filter_visibility" xsi:type="string">0</argument>
4444
</arguments>
45-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="cache_type">
45+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.cache.grid.columnSet.cache_type" as="cache_type">
4646
<arguments>
4747
<argument name="header" xsi:type="string" translate="true">Cache Type</argument>
4848
<argument name="index" xsi:type="string">cache_type</argument>
@@ -53,7 +53,7 @@
5353
<argument name="translate" xsi:type="boolean">true</argument>
5454
</arguments>
5555
</block>
56-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="description">
56+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.cache.grid.columnSet.description" as="description">
5757
<arguments>
5858
<argument name="header" xsi:type="string" translate="true">Description</argument>
5959
<argument name="index" xsi:type="string">description</argument>
@@ -63,7 +63,7 @@
6363
<argument name="translate" xsi:type="boolean">true</argument>
6464
</arguments>
6565
</block>
66-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="tags">
66+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.cache.grid.columnSet.tags" as="tags">
6767
<arguments>
6868
<argument name="header" xsi:type="string" translate="true">Tags</argument>
6969
<argument name="index" xsi:type="string">tags</argument>
@@ -73,7 +73,7 @@
7373
<argument name="sortable" xsi:type="string">0</argument>
7474
</arguments>
7575
</block>
76-
<block class="Magento\Backend\Block\Cache\Grid\Column\Statuses" as="status">
76+
<block class="Magento\Backend\Block\Cache\Grid\Column\Statuses" name="adminhtml.cache.grid.columnSet.status" as="status">
7777
<arguments>
7878
<argument name="header" xsi:type="string" translate="true">Status</argument>
7979
<argument name="index" xsi:type="string">status</argument>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</item>
2929
</argument>
3030
</arguments>
31-
<block class="Magento\Backend\Block\Widget\Grid\Column\Multistore" as="store_id">
31+
<block class="Magento\Backend\Block\Widget\Grid\Column\Multistore" name="adminhtml.system.design.grid.columnSet.store_id" as="store_id">
3232
<arguments>
3333
<argument name="header" xsi:type="string" translate="true">Store</argument>
3434
<argument name="width" xsi:type="string">100px</argument>
@@ -38,7 +38,7 @@
3838
<argument name="index" xsi:type="string">store_id</argument>
3939
</arguments>
4040
</block>
41-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="package">
41+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.design.grid.columnSet.package" as="package">
4242
<arguments>
4343
<argument name="header" xsi:type="string" translate="true">Design</argument>
4444
<argument name="type" xsi:type="string">options</argument>
@@ -47,7 +47,7 @@
4747
<argument name="index" xsi:type="string">design</argument>
4848
</arguments>
4949
</block>
50-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="date_from">
50+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.design.grid.columnSet.date_from" as="date_from">
5151
<arguments>
5252
<argument name="header" xsi:type="string" translate="true">Date From</argument>
5353
<argument name="align" xsi:type="string">left</argument>
@@ -57,7 +57,7 @@
5757
<argument name="index" xsi:type="string">date_from</argument>
5858
</arguments>
5959
</block>
60-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="date_to">
60+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.design.grid.columnSet.date_to" as="date_to">
6161
<arguments>
6262
<argument name="header" xsi:type="string" translate="true">Date To</argument>
6363
<argument name="align" xsi:type="string">left</argument>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<arguments>
1919
<argument name="id" xsi:type="string">storeGrid</argument>
2020
</arguments>
21-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="website_title">
21+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.store.grid.columnSet.website_title" as="website_title">
2222
<arguments>
2323
<argument name="header" xsi:type="string" translate="true">Web Site</argument>
2424
<argument name="align" xsi:type="string">left</argument>
@@ -27,7 +27,7 @@
2727
<argument name="renderer" xsi:type="string">Magento\Backend\Block\System\Store\Grid\Render\Website</argument>
2828
</arguments>
2929
</block>
30-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="group_title">
30+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.store.grid.columnSet.group_title" as="group_title">
3131
<arguments>
3232
<argument name="header" xsi:type="string" translate="true">Store</argument>
3333
<argument name="align" xsi:type="string">left</argument>
@@ -36,7 +36,7 @@
3636
<argument name="renderer" xsi:type="string">Magento\Backend\Block\System\Store\Grid\Render\Group</argument>
3737
</arguments>
3838
</block>
39-
<block class="Magento\Backend\Block\Widget\Grid\Column" as="store_title">
39+
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.store.grid.columnSet.store_title" as="store_title">
4040
<arguments>
4141
<argument name="header" xsi:type="string" translate="true">Store View</argument>
4242
<argument name="align" xsi:type="string">left</argument>

‎app/code/Magento/Backup/Model/BackupFactory.php‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,20 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
3939
*/
4040
public function create($timestamp, $type)
4141
{
42-
$backupId = $timestamp . '_' . $type;
4342
$fsCollection = $this->_objectManager->get(\Magento\Backup\Model\Fs\Collection::class);
4443
$backupInstance = $this->_objectManager->get(\Magento\Backup\Model\Backup::class);
44+
4545
foreach ($fsCollection as $backup) {
46-
if ($backup->getId() == $backupId) {
47-
$backupInstance->setType(
48-
$backup->getType()
49-
)->setTime(
50-
$backup->getTime()
51-
)->setName(
52-
$backup->getName()
53-
)->setPath(
54-
$backup->getPath()
55-
);
46+
if ($backup->getTime() === (int) $timestamp && $backup->getType() === $type) {
47+
$backupInstance->setData(['id' => $backup->getId()])
48+
->setType($backup->getType())
49+
->setTime($backup->getTime())
50+
->setName($backup->getName())
51+
->setPath($backup->getPath());
5652
break;
5753
}
5854
}
55+
5956
return $backupInstance;
6057
}
6158
}

0 commit comments

Comments
 (0)