🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #13185: Fix negative basket total due to shipping tax residue (by @torreytsui)
 - #12324: Simplified \Magento\Framework\Reflection\TypeProcessor (by @joni-jones)

Author: magento-engcom-team

app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php

@@ -152,12 +152,23 @@ protected function clearValues(Address\Total $total)
         $total->setBaseTotalAmount('subtotal', 0);
         $total->setTotalAmount('tax', 0);
         $total->setBaseTotalAmount('tax', 0);
+        $total->setTotalAmount('shipping', 0);
+        $total->setBaseTotalAmount('shipping', 0);
         $total->setTotalAmount('discount_tax_compensation', 0);
         $total->setBaseTotalAmount('discount_tax_compensation', 0);
         $total->setTotalAmount('shipping_discount_tax_compensation', 0);
         $total->setBaseTotalAmount('shipping_discount_tax_compensation', 0);
         $total->setSubtotalInclTax(0);
         $total->setBaseSubtotalInclTax(0);
+        $total->setShippingInclTax(0);
+        $total->setBaseShippingInclTax(0);
+        $total->setShippingTaxAmount(0);
+        $total->setBaseShippingTaxAmount(0);
+        $total->setShippingAmountForDiscount(0);
+        $total->setBaseShippingAmountForDiscount(0);
+        $total->setBaseShippingAmountForDiscount(0);
+        $total->setTotalAmount('extra_tax', 0);
+        $total->setBaseTotalAmount('extra_tax', 0);
     }
 
     /**

lib/internal/Magento/Framework/Reflection/Test/Unit/DataObject.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Reflection\Test\Unit;
 
+use Magento\Framework\Reflection\Test\Unit\Fixture\TSampleInterface;
+
 /**
  * Dummy data object to be used by TypeProcessorTest
  */
@@ -13,18 +15,23 @@ class DataObject
     /**
      * @var string
      */
-    protected $attrName;
+    private $attrName;
 
     /**
      * @var bool
      */
-    protected $isActive;
+    private $isActive;
 
     /**
      * @var string
      */
     private $name;
 
+    /**
+     * @var array
+     */
+    private $data = [];
+
     /**
      * @return string
      */
@@ -70,4 +77,32 @@ public function setName($name = null)
         $this->name = $name;
         return $this;
     }
+
+    /**
+     * @param string $key Key is used as index
+     * @param string $value
+     * @return void
+     */
+    public function setData(string $key, string $value)
+    {
+        $this->data[$key] = $value;
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    public function addData(array $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @param TSampleInterface[] $list
+     * @return void
+     */
+    public function addObjectList(array $list)
+    {
+        $this->data['objects'] = $list;
+    }
 }