Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ install: composer install --no-interaction
before_script: ./dev/travis/before_script.sh
script:
# Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
- test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true

# The scripts for grunt/phpunit type tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
<arguments>
<argument name="filter_visibility" xsi:type="string">0</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="severity">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.severity" as="severity">
<arguments>
<argument name="header" xsi:type="string" translate="true">Severity</argument>
<argument name="index" xsi:type="string">severity</argument>
<argument name="renderer" xsi:type="string">Magento\AdminNotification\Block\Grid\Renderer\Severity</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="date_added">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.date_added" as="date_added">
<arguments>
<argument name="header" xsi:type="string" translate="true">Date Added</argument>
<argument name="id" xsi:type="string">date_added</argument>
Expand All @@ -37,14 +37,14 @@
<argument name="header_css_class" xsi:type="string">col-date</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="title">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.title" as="title">
<arguments>
<argument name="header" xsi:type="string" translate="true">Message</argument>
<argument name="index" xsi:type="string">title</argument>
<argument name="renderer" xsi:type="string">Magento\AdminNotification\Block\Grid\Renderer\Notice</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="actions">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.actions" as="actions">
<arguments>
<argument name="header" xsi:type="string" translate="true">Actions</argument>
<argument name="sortable" xsi:type="string">0</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<arguments>
<argument name="filter_visibility" xsi:type="string">0</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="cache_type">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.cache.grid.columnSet.cache_type" as="cache_type">
<arguments>
<argument name="header" xsi:type="string" translate="true">Cache Type</argument>
<argument name="index" xsi:type="string">cache_type</argument>
Expand All @@ -53,7 +53,7 @@
<argument name="translate" xsi:type="boolean">true</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="description">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.cache.grid.columnSet.description" as="description">
<arguments>
<argument name="header" xsi:type="string" translate="true">Description</argument>
<argument name="index" xsi:type="string">description</argument>
Expand All @@ -63,7 +63,7 @@
<argument name="translate" xsi:type="boolean">true</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="tags">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.cache.grid.columnSet.tags" as="tags">
<arguments>
<argument name="header" xsi:type="string" translate="true">Tags</argument>
<argument name="index" xsi:type="string">tags</argument>
Expand All @@ -73,7 +73,7 @@
<argument name="sortable" xsi:type="string">0</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Cache\Grid\Column\Statuses" as="status">
<block class="Magento\Backend\Block\Cache\Grid\Column\Statuses" name="adminhtml.cache.grid.columnSet.status" as="status">
<arguments>
<argument name="header" xsi:type="string" translate="true">Status</argument>
<argument name="index" xsi:type="string">status</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</item>
</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Column\Multistore" as="store_id">
<block class="Magento\Backend\Block\Widget\Grid\Column\Multistore" name="adminhtml.system.design.grid.columnSet.store_id" as="store_id">
<arguments>
<argument name="header" xsi:type="string" translate="true">Store</argument>
<argument name="width" xsi:type="string">100px</argument>
Expand All @@ -38,7 +38,7 @@
<argument name="index" xsi:type="string">store_id</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="package">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.design.grid.columnSet.package" as="package">
<arguments>
<argument name="header" xsi:type="string" translate="true">Design</argument>
<argument name="type" xsi:type="string">options</argument>
Expand All @@ -47,7 +47,7 @@
<argument name="index" xsi:type="string">design</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="date_from">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.design.grid.columnSet.date_from" as="date_from">
<arguments>
<argument name="header" xsi:type="string" translate="true">Date From</argument>
<argument name="align" xsi:type="string">left</argument>
Expand All @@ -57,7 +57,7 @@
<argument name="index" xsi:type="string">date_from</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="date_to">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.design.grid.columnSet.date_to" as="date_to">
<arguments>
<argument name="header" xsi:type="string" translate="true">Date To</argument>
<argument name="align" xsi:type="string">left</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<arguments>
<argument name="id" xsi:type="string">storeGrid</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="website_title">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.store.grid.columnSet.website_title" as="website_title">
<arguments>
<argument name="header" xsi:type="string" translate="true">Web Site</argument>
<argument name="align" xsi:type="string">left</argument>
Expand All @@ -27,7 +27,7 @@
<argument name="renderer" xsi:type="string">Magento\Backend\Block\System\Store\Grid\Render\Website</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="group_title">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.store.grid.columnSet.group_title" as="group_title">
<arguments>
<argument name="header" xsi:type="string" translate="true">Store</argument>
<argument name="align" xsi:type="string">left</argument>
Expand All @@ -36,7 +36,7 @@
<argument name="renderer" xsi:type="string">Magento\Backend\Block\System\Store\Grid\Render\Group</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="store_title">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.system.store.grid.columnSet.store_title" as="store_title">
<arguments>
<argument name="header" xsi:type="string" translate="true">Store View</argument>
<argument name="align" xsi:type="string">left</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<arguments>
<argument name="id" xsi:type="string">backupsGrid</argument>
</arguments>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="time">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.catalog.product.set.grid.columnSet.time" as="time">
<arguments>
<argument name="header" xsi:type="string" translate="true">Time</argument>
<argument name="index" xsi:type="string">date_object</argument>
Expand All @@ -42,7 +42,7 @@
<argument name="header_css_class" xsi:type="string">col-date</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="display_name">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.catalog.product.set.grid.columnSet.display_name" as="display_name">
<arguments>
<argument name="header" xsi:type="string" translate="true">Name</argument>
<argument name="index" xsi:type="string">display_name</argument>
Expand All @@ -51,7 +51,7 @@
<argument name="header_css_class" xsi:type="string">col-name</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="size">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.catalog.product.set.grid.columnSet.size" as="size">
<arguments>
<argument name="header" xsi:type="string" translate="true">Size(bytes)</argument>
<argument name="index" xsi:type="string">size</argument>
Expand All @@ -60,15 +60,15 @@
<argument name="sortable" xsi:type="string">1</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="type">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.catalog.product.set.grid.columnSet.type" as="type">
<arguments>
<argument name="header" xsi:type="string" translate="true">Type</argument>
<argument name="index" xsi:type="string">type</argument>
<argument name="type" xsi:type="string">options</argument>
<argument name="options" xsi:type="options" model="Magento\Backup\Model\Grid\Options"/>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="download">
<block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.catalog.product.set.grid.columnSet.download" as="download">
<arguments>
<argument name="header" xsi:type="string" translate="true">Download</argument>
<argument name="index" xsi:type="string">type</argument>
Expand All @@ -78,7 +78,7 @@
<argument name="renderer" xsi:type="string">Magento\Backup\Block\Adminhtml\Grid\Column\Renderer\Download</argument>
</arguments>
</block>
<block class="Magento\Backup\Block\Adminhtml\Grid\Column\Rollback" as="action">
<block class="Magento\Backup\Block\Adminhtml\Grid\Column\Rollback" name="adminhtml.catalog.product.set.grid.columnSet.action" as="action">
<arguments>
<argument name="header" xsi:type="string" translate="true">Action</argument>
<argument name="index" xsi:type="string">type</argument>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="order_items">
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/shipment/create/items/renderer.phtml"/>
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="order_items.bundle" as="bundle" template="Magento_Bundle::sales/shipment/create/items/renderer.phtml"/>
</referenceBlock>
</body>
</page>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceContainer name="js">
<block class="Magento\Framework\View\Element\Template" template="Magento_Bundle::product/stock/disabler.phtml"/>
<block class="Magento\Framework\View\Element\Template" name="js.bundle_stock_disabler" template="Magento_Bundle::product/stock/disabler.phtml"/>
</referenceContainer>
</body>
</page>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="order_items">
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/creditmemo/create/items/renderer.phtml"/>
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="order_items.bundle" as="bundle" template="Magento_Bundle::sales/creditmemo/create/items/renderer.phtml"/>
</referenceBlock>
</body>
</page>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="order_items">
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/creditmemo/create/items/renderer.phtml"/>
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="order_items.bundle" as="bundle" template="Magento_Bundle::sales/creditmemo/create/items/renderer.phtml"/>
</referenceBlock>
</body>
</page>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="creditmemo_items">
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/creditmemo/view/items/renderer.phtml"/>
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="creditmemo_items.bundle" as="bundle" template="Magento_Bundle::sales/creditmemo/view/items/renderer.phtml"/>
</referenceBlock>
</body>
</page>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="order_items">
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/invoice/create/items/renderer.phtml"/>
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="order_items.bundle" as="bundle" template="Magento_Bundle::sales/invoice/create/items/renderer.phtml"/>
</referenceBlock>
</body>
</page>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="order_items">
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/invoice/create/items/renderer.phtml"/>
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="order_items.bundle" as="bundle" template="Magento_Bundle::sales/invoice/create/items/renderer.phtml"/>
</referenceBlock>
</body>
</page>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="invoice_items">
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" as="bundle" template="Magento_Bundle::sales/invoice/view/items/renderer.phtml"/>
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="invoice_items.bundle" as="bundle" template="Magento_Bundle::sales/invoice/view/items/renderer.phtml"/>
</referenceBlock>
</body>
</page>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="order_items">
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items\Renderer" as="bundle" template="Magento_Bundle::sales/order/view/items/renderer.phtml"/>
<block class="Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items\Renderer" name="order_items.bundle" as="bundle" template="Magento_Bundle::sales/order/view/items/renderer.phtml"/>
</referenceBlock>
</body>
</page>
Loading