[EngCom] Public Pull Requests - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml

@@ -53,9 +53,6 @@
             <testCaseId value="MC-10930"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MSI-2110"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
@@ -93,10 +90,6 @@
             <useCaseId value="MAGETWO-44165"/>
             <testCaseId value="MAGETWO-29398"/>
             <group value="catalog"/>
-            <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MSI-2110"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
@@ -139,9 +132,6 @@
             <testCaseId value="MAGETWO-29398"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MSI-2110"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>

dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php

@@ -22,11 +22,6 @@ class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
      */
     private $dependencyProvider;
 
-    /**
-     * @var array
-     */
-    private $blacklistedDependencies = [];
-
     /**
      * Sets up data
      *
@@ -50,14 +45,6 @@ protected function setUp()
      */
     public function testUndeclaredDependencies()
     {
-        /** TODO: Remove this temporary solution after MC-15534 is closed */
-        $filePattern = __DIR__ . '/_files/dependency_test/blacklisted_dependencies_*.php';
-        $blacklistedDependencies = [];
-        foreach (glob($filePattern) as $fileName) {
-            $blacklistedDependencies = array_merge($blacklistedDependencies, require $fileName);
-        }
-        $this->blacklistedDependencies = $blacklistedDependencies;
-
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
             /**
@@ -84,9 +71,7 @@ function ($file) {
                 $result = [];
                 foreach ($undeclaredDependency as $name => $modules) {
                     $modules = array_unique($modules);
-                    if ($this->filterBlacklistedDependencies($foundModuleName, $modules)) {
-                        $result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules) . "\n";
-                    }
+                    $result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules) . "\n";
                 }
                 if (!empty($result)) {
                     $this->fail(
@@ -98,24 +83,6 @@ function ($file) {
         );
     }
 
-    /**
-     * Filter blacklisted dependencies.
-     *
-     * @todo Remove this temporary solution after MC-15534 is closed
-     *
-     * @param string $moduleName
-     * @param array $dependencies
-     * @return array
-     */
-    private function filterBlacklistedDependencies(string $moduleName, array $dependencies): array
-    {
-        if (!empty($this->blacklistedDependencies[$moduleName])) {
-            $dependencies = array_diff($dependencies, $this->blacklistedDependencies[$moduleName]);
-        }
-
-        return $dependencies;
-    }
-
     /**
      * Convert file list to data provider structure.
      *

dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/blacklisted_dependencies_ce.php

@@ -214,3 +214,4 @@ Magento/Elasticsearch/Model/Layer/Search
 Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver
 Magento/Elasticsearch6/Model/Client
 Magento/Config/App/Config/Type
+Magento/InventoryReservationCli/Test/Integration