Merge remote-tracking branch 'gl_magento2ce/AC-8834' into BUG#AC-8834

2.4.7-Beta1-Composer Integration Test Failures-PHP 8.2

Author: glo05363

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/StockTest.php

@@ -54,7 +54,7 @@ protected function setUp(): void
     public function testValidate(): void
     {
         $this->expectException(LocalizedException::class);
-        $this->expectErrorMessage((string)__('Please enter a valid number in this field.'));
+        $this->expectExceptionMessage((string)__('Please enter a valid number in this field.'));
         $product = $this->productFactory->create();
         $product->setQuantityAndStockStatus(['qty' => 'string']);
         $this->model->validate($product);

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php

@@ -136,7 +136,7 @@ public function postRequestData(): array
     public function testAuthorizedSavingOfWithException(array $data): void
     {
         $this->expectException(AuthorizationException::class);
-        $this->expectErrorMessage('Not allowed to edit the product\'s design attributes');
+        $this->expectExceptionMessage('Not allowed to edit the product\'s design attributes');
         $this->request->setPost(new Parameters($data));
 
         /** @var Product $product */

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductWebsiteLinkRepositoryTest.php

@@ -65,7 +65,7 @@ public function testSaveWithoutWebsiteId(): void
         $productWebsiteLink = $this->productWebsiteLinkFactory->create();
         $productWebsiteLink->setSku('unique-simple-azaza');
         $this->expectException(InputException::class);
-        $this->expectErrorMessage((string)__('There are not websites for assign to product'));
+        $this->expectExceptionMessage((string)__('There are not websites for assign to product'));
         $this->productWebsiteLinkRepository->save($productWebsiteLink);
     }
 

dev/tests/integration/testsuite/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/SuffixTest.php

@@ -32,6 +32,7 @@
  * @magentoAppArea adminhtml
  * @magentoDbIsolation enabled
  * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SuffixTest extends TestCase
 {
@@ -83,7 +84,7 @@ protected function setUp(): void
     public function testSaveWithError(): void
     {
         $this->expectException(LocalizedException::class);
-        $this->expectErrorMessage((string)__('Anchor symbol (#) is not supported in url rewrite suffix.'));
+        $this->expectExceptionMessage((string)__('Anchor symbol (#) is not supported in url rewrite suffix.'));
         $this->model->setValue('.html#');
         $this->model->beforeSave();
     }

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php

@@ -656,7 +656,7 @@ protected function getUsedProducts()
      */
     public function testAddCustomOptionToConfigurableChildProduct(): void
     {
-        $this->expectErrorMessage(
+        $this->expectExceptionMessage(
             'Required custom options cannot be added to a simple product that is a part of a composite product.'
         );
 

dev/tests/integration/testsuite/Magento/Framework/App/ResourceConnection/ConnectionFactoryTest.php

@@ -36,7 +36,8 @@ public function testCreate()
         ];
         $connection = $this->model->create($dbConfig);
         $this->assertInstanceOf(\Magento\Framework\DB\Adapter\AdapterInterface::class, $connection);
-        $this->assertClassHasAttribute('logger', get_class($connection));
+        $this->assertIsObject($connection);
+        $this->assertTrue(property_exists($connection, 'logger'));
         $object = new ReflectionClass(get_class($connection));
         $attribute = $object->getProperty('logger');
         $attribute->setAccessible(true);

dev/tests/integration/testsuite/Magento/Framework/ObjectManager/ObjectManagerTest.php

@@ -12,25 +12,25 @@ class ObjectManagerTest extends \PHPUnit\Framework\TestCase
     /**#@+
      * Test class with type error
      */
-    const TEST_CLASS_WITH_TYPE_ERROR = \Magento\Framework\ObjectManager\TestAsset\ConstructorWithTypeError::class;
+    public const TEST_CLASS_WITH_TYPE_ERROR = \Magento\Framework\ObjectManager\TestAsset\ConstructorWithTypeError::class;
 
     /**#@+
      * Test classes for basic instantiation
      */
-    const TEST_CLASS = \Magento\Framework\ObjectManager\TestAsset\Basic::class;
+    public const TEST_CLASS = \Magento\Framework\ObjectManager\TestAsset\Basic::class;
 
-    const TEST_CLASS_INJECTION = \Magento\Framework\ObjectManager\TestAsset\BasicInjection::class;
+    public const TEST_CLASS_INJECTION = \Magento\Framework\ObjectManager\TestAsset\BasicInjection::class;
 
     /**#@-*/
 
     /**#@+
      * Test classes and interface to test preferences
      */
-    const TEST_INTERFACE = \Magento\Framework\ObjectManager\TestAsset\TestAssetInterface::class;
+    public const TEST_INTERFACE = \Magento\Framework\ObjectManager\TestAsset\TestAssetInterface::class;
 
-    const TEST_INTERFACE_IMPLEMENTATION = \Magento\Framework\ObjectManager\TestAsset\InterfaceImplementation::class;
+    public const TEST_INTERFACE_IMPLEMENTATION = \Magento\Framework\ObjectManager\TestAsset\InterfaceImplementation::class;
 
-    const TEST_CLASS_WITH_INTERFACE = \Magento\Framework\ObjectManager\TestAsset\InterfaceInjection::class;
+    public const TEST_CLASS_WITH_INTERFACE = \Magento\Framework\ObjectManager\TestAsset\InterfaceInjection::class;
 
     /**#@-*/
 
@@ -141,7 +141,8 @@ public function testNewInstance($actualClassName, array $properties = [], $expec
         $object = new ReflectionClass($actualClassName);
         if ($properties) {
             foreach ($properties as $propertyName => $propertyClass) {
-                $this->assertClassHasAttribute($propertyName, $actualClassName);
+                $this->assertIsObject($testObject);
+                $this->assertTrue(property_exists($testObject, $propertyName));
                 $attribute = $object->getProperty($propertyName);
                 $attribute->setAccessible(true);
                 $propertyObject = $attribute->getValue($testObject);

dev/tests/integration/testsuite/Magento/Framework/ProfilerTest.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Test case for \Magento\Framework\Profiler
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -25,7 +23,8 @@ public function testApplyConfigWithDrivers(array $config, array $expectedDrivers
     {
         $profiler = new \Magento\Framework\Profiler();
         $profiler::applyConfig($config, '');
-        $this->assertClassHasAttribute('_drivers', \Magento\Framework\Profiler::class);
+        $this->assertIsObject($profiler);
+        $this->assertTrue(property_exists($profiler, '_drivers'));
         $object = new ReflectionClass(\Magento\Framework\Profiler::class);
         $attribute = $object->getProperty('_drivers');
         $attribute->setAccessible(true);

dev/tests/integration/testsuite/Magento/ImportExport/Model/ExportTest.php

@@ -35,7 +35,8 @@ public function testGetEntityAdapterWithValidEntity($entity, $expectedEntityType
     {
         $this->_model->setData(['entity' => $entity]);
         $this->_model->getEntityAttributeCollection();
-        $this->assertClassHasAttribute('_entityAdapter', get_class($this->_model));
+        $this->assertIsObject($this->_model);
+        $this->assertTrue(property_exists($this->_model, '_entityAdapter'));
         $object = new ReflectionClass(get_class($this->_model));
         $attribute = $object->getProperty('_entityAdapter');
         $attribute->setAccessible(true);