[Magento Community Engineering] Community Contributions - 2.4-develop-expedited-prs

magento-engcom-team · web-flow · commit fe95cca8af0f · 2020-03-11T13:58:57.000-05:00
- merged with '2.4-develop-prs' branch
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php
@@ -155,6 +155,40 @@ public function testRemoveItemFromAnotherCustomerCart()
         $this->graphQlMutation($query, [], '', $this->getHeaderMap('customer2@search.example.com'));
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testRemoveItemWithEmptyCartId()
+    {
+        $cartId = "";
+        $cartItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
+
+        $this->expectExceptionMessage("Required parameter \"cart_id\" is missing.");
+
+        $query = $this->getQuery($cartId, $cartItemId);
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testRemoveItemWithZeroCartItemId()
+    {
+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $cartItemId = 0;
+
+        $this->expectExceptionMessage("Required parameter \"cart_item_id\" is missing.");
+
+        $query = $this->getQuery($cartId, $cartItemId);
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param int $itemId
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php
@@ -119,6 +119,38 @@ public function testRemoveItemFromCustomerCart()
         $this->graphQlMutation($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testRemoveItemWithEmptyCartId()
+    {
+        $cartId = "";
+        $cartItemId = $this->getQuoteItemIdByReservedQuoteIdAndSku->execute('test_quote', 'simple_product');
+
+        $this->expectExceptionMessage("Required parameter \"cart_id\" is missing.");
+
+        $query = $this->getQuery($cartId, $cartItemId);
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testRemoveItemWithZeroCartItemId()
+    {
+        $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $cartItemId = 0;
+
+        $this->expectExceptionMessage("Required parameter \"cart_item_id\" is missing.");
+
+        $query = $this->getQuery($cartId, $cartItemId);
+        $this->graphQlMutation($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param int $itemId
diff --git a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
@@ -8,8 +8,6 @@
 /**
  * Provides ability to statically register components.
  *
- * @author Josh Di Fabio <joshdifabio@gmail.com>
- *
  * @api
  */
 class ComponentRegistrar implements ComponentRegistrarInterface
@@ -50,13 +48,12 @@ public static function register($type, $componentName, $path)
                 ucfirst($type) . ' \'' . $componentName . '\' from \'' . $path . '\' '
                 . 'has been already defined in \'' . self::$paths[$type][$componentName] . '\'.'
             );
-        } else {
-            self::$paths[$type][$componentName] = str_replace('\\', '/', $path);
         }
+        self::$paths[$type][$componentName] = str_replace('\\', '/', $path);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPaths($type)
     {
@@ -65,7 +62,7 @@ public function getPaths($type)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPath($type, $componentName)
     {
diff --git a/lib/internal/Magento/Framework/Component/ComponentRegistrarInterface.php b/lib/internal/Magento/Framework/Component/ComponentRegistrarInterface.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\Framework\Component;
 
-/**
- * @author Josh Di Fabio <joshdifabio@gmail.com>
- */
 interface ComponentRegistrarInterface
 {
     /**
diff --git a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
@@ -111,8 +111,7 @@ public function load(array $exclude = [])
      * </code>
      *
      * @return \Traversable
-     *
-     * @author Josh Di Fabio <joshdifabio@gmail.com>
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     private function getModuleConfigs()
     {

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@`
`8`	`8`	`/**`
`9`	`9`	`* Provides ability to statically register components.`
`10`	`10`	`*`
`11`		`- * @author Josh Di Fabio <joshdifabio@gmail.com>`
`12`		`- *`
`13`	`11`	`* @api`
`14`	`12`	`*/`
`15`	`13`	`class ComponentRegistrar implements ComponentRegistrarInterface`
`@@ -50,13 +48,12 @@ public static function register($type, $componentName, $path)`
`50`	`48`	`ucfirst($type) . ' \'' . $componentName . '\' from \'' . $path . '\' '`
`51`	`49`	`. 'has been already defined in \'' . self::$paths[$type][$componentName] . '\'.'`
`52`	`50`	`);`
`53`		`- } else {`
`54`		`- self::$paths[$type][$componentName] = str_replace('\\', '/', $path);`
`55`	`51`	`}`
	`52`	`+ self::$paths[$type][$componentName] = str_replace('\\', '/', $path);`
`56`	`53`	`}`
`57`	`54`
`58`	`55`	`/**`
`59`		`- * {@inheritdoc}`
	`56`	`+ * @inheritdoc`
`60`	`57`	`*/`
`61`	`58`	`public function getPaths($type)`
`62`	`59`	`{`
`@@ -65,7 +62,7 @@ public function getPaths($type)`
`65`	`62`	`}`
`66`	`63`
`67`	`64`	`/**`
`68`		`- * {@inheritdoc}`
	`65`	`+ * @inheritdoc`
`69`	`66`	`*/`
`70`	`67`	`public function getPath($type, $componentName)`
`71`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,6 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\Framework\Component;`
`7`	`7`
`8`		`-/**`
`9`		`- * @author Josh Di Fabio <joshdifabio@gmail.com>`
`10`		`- */`
`11`	`8`	`interface ComponentRegistrarInterface`
`12`	`9`	`{`
`13`	`10`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,7 @@ public function load(array $exclude = [])`
`111`	`111`	`* </code>`
`112`	`112`	`*`
`113`	`113`	`* @return \Traversable`
`114`		`- *`
`115`		`- * @author Josh Di Fabio <joshdifabio@gmail.com>`
	`114`	`+ * @throws \Magento\Framework\Exception\FileSystemException`
`116`	`115`	`*/`
`117`	`116`	`private function getModuleConfigs()`
`118`	`117`	`{`