Merge branch '1.2' into develop

.gitignore

 /.idea
-/Test/*/phpunit.local.*
\ No newline at end of file
+/Test/*/phpunit.local.*
+/Test/*/phpunit.dev.*
\ No newline at end of file

.travis.yml

@@ -15,6 +15,7 @@ language: php
 php:
   - 7.1
   - 7.2
+  - 7.3
 
 env:
   matrix:
@@ -22,6 +23,11 @@ env:
   - MAGENTO_VERSION=2.3
   - MAGENTO_VERSION=2.3-develop
 
+matrix:
+  exclude:
+    - php: 7.3
+      env: MAGENTO_VERSION=2.2
+
 before_install:
   - git clone --depth=50 --branch=$MAGENTO_VERSION https://github.com/magento/magento2.git /tmp/magento
   - mysql -uroot -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;'

Test/Integration/Model/PageInstaller/TestCase.php

@@ -103,7 +103,7 @@ class TestCase extends \PHPUnit\Framework\TestCase
             PageEntryInterface::META_KEYWORDS => 'Some, seo, keywords',
             PageEntryInterface::META_TITLE => 'Seo title',
             PageEntryInterface::PAGE_LAYOUT => '3columns',
-            PageEntryInterface::LAYOUT_UPDATE_XML => '<foo>bar</foo>',
+            PageEntryInterface::LAYOUT_UPDATE_XML => '',
             PageEntryInterface::CUSTOM_THEME => 3,
             PageEntryInterface::CUSTOM_THEME_FROM => '2019-03-29',
             PageEntryInterface::CUSTOM_THEME_TO => '2019-05-29',
@@ -134,7 +134,7 @@ class TestCase extends \PHPUnit\Framework\TestCase
             PageEntryInterface::META_KEYWORDS => 'Some, seo, keywords',
             PageEntryInterface::META_TITLE => 'Seo title',
             PageEntryInterface::PAGE_LAYOUT => '3columns',
-            PageEntryInterface::LAYOUT_UPDATE_XML => '<foo>bar</foo>'
+            PageEntryInterface::LAYOUT_UPDATE_XML => ''
         ]]);
 
         $this->getPageEntryListMock->method('get')->willReturn($this->pageEntries);

Test/Integration/_files/content_provisioning.xml

@@ -18,7 +18,7 @@
         </seo>
         <design>
             <layout>3columns</layout>
-            <layout_xml><![CDATA[<foo>bar</foo>]]></layout_xml>
+            <layout_xml><![CDATA[]]></layout_xml>
         </design>
         <custom_design>
             <from>2019-03-03</from>

Test/Integration/_files/result.php

@@ -30,7 +30,7 @@ return [
             PageEntryInterface::META_KEYWORDS => 'Some, SEO, keywords',
             PageEntryInterface::META_DESCRIPTION => 'SEO description',
             PageEntryInterface::PAGE_LAYOUT => '3columns',
-            PageEntryInterface::LAYOUT_UPDATE_XML => '<foo>bar</foo>',
+            PageEntryInterface::LAYOUT_UPDATE_XML => '',
             PageEntryInterface::CUSTOM_THEME_FROM => '2019-03-03',
             PageEntryInterface::CUSTOM_THEME_TO => '2019-03-29',
             PageEntryInterface::CUSTOM_THEME => '3',

Test/Integration/phpunit.dev.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
+         colors="true"
+         columns="max"
+         beStrictAboutTestsThatDoNotTestAnything="false"
+         bootstrap="../../../../../../dev/tests/integration/framework/bootstrap.php"
+         stderr="true"
+>
+    <!-- Test suites definition -->
+    <testsuites>
+        <testsuite name="Magento Integration Tests">
+            <directory suffix="Test.php">.</directory>
+        </testsuite>
+    </testsuites>
+    <!-- PHP INI settings and constants definition -->
+    <php>
+        <includePath>.</includePath>
+        <includePath>../../../../../../dev/tests/integration/</includePath>
+        <ini name="date.timezone" value="America/Los_Angeles"/>
+        <ini name="xdebug.max_nesting_level" value="200"/>
+        <!-- Local XML configuration file ('.dist' extension will be added, if the specified file doesn't exist) -->
+        <const name="TESTS_INSTALL_CONFIG_FILE" value="etc/install-config-mysql.php"/>
+        <!-- Local XML configuration file ('.dist' extension will be added, if the specified file doesn't exist) -->
+        <const name="TESTS_GLOBAL_CONFIG_FILE" value="etc/config-global.php"/>
+        <!-- Semicolon-separated 'glob' patterns, that match global XML configuration files -->
+        <const name="TESTS_GLOBAL_CONFIG_DIR" value="../../../app/etc"/>
+        <!-- Whether to cleanup the application before running tests or not -->
+        <const name="TESTS_CLEANUP" value="disabled"/>
+        <!-- Memory usage and estimated leaks thresholds -->
+        <!--<const name="TESTS_MEM_USAGE_LIMIT" value="1024M"/>-->
+        <const name="TESTS_MEM_LEAK_LIMIT" value=""/>
+        <!-- Path to Percona Toolkit bin directory -->
+        <!--<const name="PERCONA_TOOLKIT_BIN_DIR" value=""/>-->
+        <!-- CSV Profiler Output file -->
+        <!--<const name="TESTS_PROFILER_FILE" value="profiler.csv"/>-->
+        <!-- Bamboo compatible CSV Profiler Output file name -->
+        <!--<const name="TESTS_BAMBOO_PROFILER_FILE" value="profiler.csv"/>-->
+        <!-- Metrics for Bamboo Profiler Output in PHP file that returns array -->
+        <!--<const name="TESTS_BAMBOO_PROFILER_METRICS_FILE" value="../../build/profiler_metrics.php"/>-->
+        <!-- Whether to output all CLI commands executed by the bootstrap and tests -->
+        <const name="TESTS_EXTRA_VERBOSE_LOG" value="1"/>
+        <!-- Magento mode for tests execution. Possible values are "default", "developer" and "production". -->
+        <const name="TESTS_MAGENTO_MODE" value="developer"/>
+        <!-- Minimum error log level to listen for. Possible values: -1 ignore all errors, and level constants form http://tools.ietf.org/html/rfc5424 standard -->
+        <const name="TESTS_ERROR_LOG_LISTENER_LEVEL" value="-1"/>
+        <!-- Connection parameters for MongoDB library tests -->
+        <!--<const name="MONGODB_CONNECTION_STRING" value="mongodb://localhost:27017"/>-->
+        <!--<const name="MONGODB_DATABASE_NAME" value="magento_integration_tests"/>-->
+    </php>
+    <!-- Test listeners -->
+    <listeners>
+        <listener class="Magento\TestFramework\Event\PhpUnit"/>
+        <listener class="Magento\TestFramework\ErrorLog\Listener"/>
+    </listeners>
+</phpunit>