Merge pull request #157 from magento-okapis/API-Bug-Fixes

[Okapis] Bug Fixes

Author: heyitsroberthe

app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

@@ -18,9 +18,8 @@ class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
     public function render(\Magento\Framework\DataObject $row)
     {
         return '<span class="grid-row-title">' .
-            $row->getTitle() .
+            $this->escapeHtml($row->getTitle()) .
             '</span>' .
-            ($row->getDescription() ? '<br />' .
-            $row->getDescription() : '');
+            ($row->getDescription() ? '<br />' . $this->escapeHtml($row->getDescription()) : '');
     }
 }

app/code/Magento/Catalog/Model/Layer/FilterList.php

@@ -30,10 +30,10 @@ class FilterList
      * @var string[]
      */
     protected $filterTypes = [
-        self::CATEGORY_FILTER  => 'Magento\Catalog\Model\Layer\Filter\Category',
-        self::ATTRIBUTE_FILTER => 'Magento\Catalog\Model\Layer\Filter\Attribute',
-        self::PRICE_FILTER     => 'Magento\Catalog\Model\Layer\Filter\Price',
-        self::DECIMAL_FILTER   => 'Magento\Catalog\Model\Layer\Filter\Decimal',
+        self::CATEGORY_FILTER  => \Magento\Catalog\Model\Layer\Filter\Category::class,
+        self::ATTRIBUTE_FILTER => \Magento\Catalog\Model\Layer\Filter\Attribute::class,
+        self::PRICE_FILTER     => \Magento\Catalog\Model\Layer\Filter\Price::class,
+        self::DECIMAL_FILTER   => \Magento\Catalog\Model\Layer\Filter\Decimal::class,
     ];
 
     /**

app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php

@@ -63,8 +63,11 @@ public function getAllOptions()
         if ($cache = $this->_configCacheType->load($cacheKey)) {
             $options = unserialize($cache);
         } else {
-            $collection = $this->_countryFactory->create()->getResourceCollection()->loadByStore();
-            $options = $collection->toOptionArray();
+            /** @var \Magento\Directory\Model\Country $country */
+            $country = $this->_countryFactory->create();
+            /** @var \Magento\Directory\Model\ResourceModel\Country\Collection $collection */
+            $collection = $country->getResourceCollection();
+            $options = $collection->load()->toOptionArray();
             $this->_configCacheType->save(serialize($options), $cacheKey);
         }
         return $options;

app/code/Magento/Integration/etc/crontab.xml

@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
     <group id="default">
         <job name="outdated_authentication_failures_cleanup" instance="Magento\Integration\Cron\CleanExpiredAuthenticationFailures" method="execute">
-            <schedule>0 1 * * *</schedule>
+            <schedule>* * * * *</schedule>
         </job>
     </group>
 </config>

app/code/Magento/LayeredNavigation/Block/Navigation.php

@@ -59,7 +59,6 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
-        $this->renderer = $this->getChildBlock('renderer');
         foreach ($this->filterList->getFilters($this->_catalogLayer) as $filter) {
             $filter->apply($this->getRequest());
         }

app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php

@@ -71,8 +71,6 @@ public function testGetStateHtml()
         $stateHtml = 'I feel good';
         $this->filterListMock->expects($this->any())->method('getFilters')->will($this->returnValue([]));
         $this->layoutMock->expects($this->at(0))->method('getChildName')
-            ->with(null, 'renderer');
-        $this->layoutMock->expects($this->at(1))->method('getChildName')
             ->with(null, 'state')
             ->will($this->returnValue('state block'));
 

app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php

@@ -126,6 +126,9 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
                 $this->creditmemoResource->saveAttribute($creditmemo, ['send_email', 'email_sent']);
                 return true;
             }
+        } else {
+            $creditmemo->setEmailSent(null);
+            $this->creditmemoResource->saveAttribute($creditmemo, 'email_sent');
         }
 
         $this->creditmemoResource->saveAttribute($creditmemo, 'send_email');

app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php

@@ -126,6 +126,9 @@ public function send(Invoice $invoice, $forceSyncMode = false)
                 $this->invoiceResource->saveAttribute($invoice, ['send_email', 'email_sent']);
                 return true;
             }
+        } else {
+            $invoice->setEmailSent(null);
+            $this->invoiceResource->saveAttribute($invoice, 'email_sent');
         }
 
         $this->invoiceResource->saveAttribute($invoice, 'send_email');

app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php

@@ -104,6 +104,9 @@ public function send(Order $order, $forceSyncMode = false)
                 $this->orderResource->saveAttribute($order, ['send_email', 'email_sent']);
                 return true;
             }
+        } else {
+            $order->setEmailSent(null);
+            $this->orderResource->saveAttribute($order, 'email_sent');
         }
 
         $this->orderResource->saveAttribute($order, 'send_email');

app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php

@@ -126,6 +126,9 @@ public function send(Shipment $shipment, $forceSyncMode = false)
                 $this->shipmentResource->saveAttribute($shipment, ['send_email', 'email_sent']);
                 return true;
             }
+        } else {
+            $shipment->setEmailSent(null);
+            $this->shipmentResource->saveAttribute($shipment, 'email_sent');
         }
 
         $this->shipmentResource->saveAttribute($shipment, 'send_email');