Merge remote-tracking branch 'remotes/github/MAGETWO-80120' into EPAM-PR-55

Author: VeronikaYarats

lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php

@@ -298,4 +298,13 @@ public function assertInstalledDataProvider()
             [true, false],
         ];
     }
+
+    /**
+     * Restore error handler after Bootstrap->run method
+     */
+    public function tearDown()
+    {
+        restore_error_handler();
+        setCustomErrorHandler();
+    }
 }

lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/SchemaBuilderTest.php

@@ -312,7 +312,7 @@ public function testBuildUnknownIndexColumn(array $columns, array $references, a
             Schema::class,
             ['resourceConnection' => $resourceConnectionMock]
         );
-        $this->expectException(\Exception::class);
+        $this->expectException(\PHPUnit\Framework\Exception::class);
         $this->expectExceptionMessage(
             'User Warning: Column unknown_column does not exist for index/constraint FIRST_INDEX in table second_table.'
         );

lib/internal/Magento/Framework/Unserialize/Test/Unit/UnserializeTest.php

@@ -3,11 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Unserialize\Test\Unit;
 
 use Magento\Framework\Serialize\Serializer\Serialize;
 use Magento\Framework\Unserialize\Unserialize;
 
+/**
+ * Test unserializer that does not unserialize objects.
+ */
 class UnserializeTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -52,6 +57,10 @@ public function testUnserializeArray()
      */
     public function testUnserializeObject($serialized)
     {
+        $this->expectException(\PHPUnit\Framework\Exception::class);
+        $this->expectExceptionMessage(
+            'String contains serialized object'
+        );
         $this->assertFalse($this->unserialize->unserialize($serialized));
     }
 

lib/internal/Magento/Framework/View/Test/Unit/TemplateEngine/PhpTest.php

@@ -3,8 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\View\Test\Unit\TemplateEngine;
 
+/**
+ * Test template engine that enables PHP templates to be used for rendering.
+ */
 class PhpTest extends \PHPUnit\Framework\TestCase
 {
     const TEST_PROP_VALUE = 'TEST_PROP_VALUE';
@@ -55,7 +60,7 @@ public function testRender()
      * Test the render() function with a nonexistent filename.
      *
      * Expect an exception if the specified file does not exist.
-     * @expectedException \Exception
+     * @expectedException PHPUnit\Framework\Exception
      */
     public function testRenderException()
     {
@@ -66,6 +71,7 @@ public function testRenderException()
         )->disableOriginalConstructor()->getMock();
 
         $filename = 'This_is_not_a_file';
+
         $this->_phpEngine->render($blockMock, $filename);
     }