Stabilization magento-partners/magento2ce#82

Author: Volodymyr Kublytskyi

app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php

@@ -1192,10 +1192,6 @@ public function testInitiatePasswordResetEmailReset()
         $this->assertTrue($this->accountManagement->initiatePasswordReset($email, $template));
     }
 
-    /**
-     * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage Invalid value of "" provided for the template field. Possible values are email_reminder or email_reset.
-     */
     public function testInitiatePasswordResetNoTemplate()
     {
         $storeId = 1;
@@ -1211,6 +1207,10 @@ public function testInitiatePasswordResetNoTemplate()
 
         $this->prepareInitiatePasswordReset($email, $templateIdentifier, $sender, $storeId, $customerId, $hash);
 
+        $this->setExpectedException(
+            \Magento\Framework\Exception\InputException::class,
+            'Invalid value of "" provided for the template field. Possible values are email_reminder or email_reset.'
+        );
         $this->accountManagement->initiatePasswordReset($email, $template);
     }
 

app/code/Magento/ImportExport/Model/ResourceModel/Import/Data.php

@@ -161,9 +161,9 @@ public function saveBunch($entity, $behavior, array $data)
 
         $encodedData = $this->jsonHelper->jsonEncode($data);
 
-        if ( json_last_error()!==JSON_ERROR_NONE && empty($encodedData) ) {
+        if (json_last_error() !== JSON_ERROR_NONE && empty($encodedData)) {
             throw new \Magento\Framework\Exception\ValidatorException(
-                __( 'Error in CSV: ' . json_last_error_msg() )
+                __('Error in CSV: ' . json_last_error_msg())
             );
         }