Merge branch 'develop' of github.com:magento/magento2-functional-testing-framework into 33294-eliminate-aspectmock-from-allure-helpertest

Author: bohdan-harniuk

CHANGELOG.md

@@ -1,13 +1,30 @@
 Magento Functional Testing Framework Changelog
 ================================================
+3.6.0
+---------
+
+### Enhancements
+
+* Maintainability
+  * Updated composer dependencies to be PHP 8 compatible with the except of codeception/aspect-mock.
+    
+### GitHub Pull Requests:
+
+* [#830](https://github.com/magento/magento2-functional-testing-framework/pull/830) -- Add ability to configure multiple OTPs
+* [#832](https://github.com/magento/magento2-functional-testing-framework/pull/832) -- Updated monolog/monolog to ^2.2
+* [#833](https://github.com/magento/magento2-functional-testing-framework/pull/833) -- Removed usage of AspectMock in FilesystemTest
+* [#834](https://github.com/magento/magento2-functional-testing-framework/pull/834) -- Removed usage of AspectMock in AnnotationsCheckTest
+* [#838](https://github.com/magento/magento2-functional-testing-framework/pull/838) -- Removed usage of AspectMock in DeprecatedEntityUsageCheckTest
+* [#841](https://github.com/magento/magento2-functional-testing-framework/pull/841) -- Removed usage of AspectMock in GenerationErrorHandlerTest
+* [#854](https://github.com/magento/magento2-functional-testing-framework/pull/854) -- Updated "monolog" to the latest version 2.3.1
+
 3.5.1
 ---------
 
 ### GitHub Pull Requests:
 
 * [#825](https://github.com/magento/magento2-functional-testing-framework/pull/825) -- Update allure-codeception in order to support php8
 
-
 3.5.0
 ---------
 

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "3.5.1",
+    "version": "3.6.0",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
@@ -25,8 +25,9 @@
         "csharpru/vault-php": "^4.2.1",
         "csharpru/vault-php-guzzle6-transport": "^2.0",
         "hoa/console": "~3.0",
-        "monolog/monolog": "^1.17",
+        "monolog/monolog": "^2.3",
         "mustache/mustache": "~2.5",
+        "nikic/php-parser": "^4.4",
         "php-webdriver/webdriver": "^1.9.0",
         "spomky-labs/otphp": "^10.0",
         "symfony/console": "^4.4",
@@ -35,8 +36,7 @@
         "symfony/mime": "^5.0",
         "symfony/process": "^4.4",
         "vlucas/phpdotenv": "^2.4",
-        "weew/helpers-array": "^1.3",
-        "nikic/php-parser": "^4.4"
+        "weew/helpers-array": "^1.3"
     },
     "require-dev": {
         "brainmaestro/composer-git-hooks": "^2.3.1",

composer.lock

@@ -3,20 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace tests\unit\Magento\FunctionalTestFramework\Config\Reader;
 
+use Magento\FunctionalTestingFramework\Config\ConverterInterface;
 use Magento\FunctionalTestingFramework\Config\FileResolver\Module;
 use Magento\FunctionalTestingFramework\Config\Reader\Filesystem;
+use Magento\FunctionalTestingFramework\Config\SchemaLocatorInterface;
 use Magento\FunctionalTestingFramework\Config\ValidationState;
 use Magento\FunctionalTestingFramework\Util\Iterator\File;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use AspectMock\Test as AspectMock;
 use tests\unit\Util\TestLoggingUtil;
 
 class FilesystemTest extends TestCase
 {
     /**
-     * Before test functionality
      * @return void
      */
     public function setUp(): void
@@ -25,79 +28,80 @@ public function setUp(): void
     }
 
     /**
-     * Test Reading Empty Files
      * @throws \Exception
      */
     public function testEmptyXmlFile()
     {
-        // create mocked items and read the file
-        $someFile = $this->setMockFile("somepath.xml", "");
-        $filesystem = $this->createPseudoFileSystem($someFile);
-        $filesystem->read();
+        $filesystem = $this->getFilesystem($this->getFileIterator('somepath.xml', ''));
+        $this->assertEquals([], $filesystem->read());
 
-        // validate log statement
         TestLoggingUtil::getInstance()->validateMockLogStatement(
-            "warning",
-            "XML File is empty.",
-            ["File" => "somepath.xml"]
+            'warning',
+            'XML File is empty.',
+            ['File' => 'somepath.xml']
         );
     }
 
     /**
-     * Function used to set mock for File created in test
+     * Retrieve mocked file iterator
      *
      * @param string $fileName
      * @param string $content
-     * @return object
+     * @return File|MockObject
      * @throws \Exception
      */
-    public function setMockFile($fileName, $content)
+    public function getFileIterator(string $fileName, string $content): File
     {
-        $file = AspectMock::double(
-            File::class,
-            [
-                'current' => "",
-                'count' => 1,
-                'getFilename' => $fileName
-            ]
-        )->make();
+        $iterator = new \ArrayIterator([$content]);
+
+        $file = $this->createMock(File::class);
+
+        $file->method('current')
+            ->willReturn($content);
+        $file->method('getFilename')
+            ->willReturn($fileName);
+        $file->method('count')
+            ->willReturn(1);
+
+        $file->method('next')
+            ->willReturnCallback(function () use ($iterator): void {
+                $iterator->next();
+            });
 
-        //set mocked data property for File
-        $property = new \ReflectionProperty(File::class, 'data');
-        $property->setAccessible(true);
-        $property->setValue($file, [$fileName => $content]);
+        $file->method('valid')
+            ->willReturnCallback(function () use ($iterator): bool {
+                return $iterator->valid();
+            });
 
         return $file;
     }
 
     /**
-     * Function used to set mock for filesystem class during test
+     * Get real instance of Filesystem class with mocked dependencies
      *
-     * @param string $fileList
-     * @return object
-     * @throws \Exception
+     * @param File $fileIterator
+     * @return Filesystem
      */
-    public function createPseudoFileSystem($fileList)
+    public function getFilesystem(File $fileIterator): Filesystem
     {
-        $filesystem = AspectMock::double(Filesystem::class)->make();
-
-        //set resolver to use mocked resolver
-        $mockFileResolver = AspectMock::double(Module::class, ['get' => $fileList])->make();
-        $property = new \ReflectionProperty(Filesystem::class, 'fileResolver');
-        $property->setAccessible(true);
-        $property->setValue($filesystem, $mockFileResolver);
-
-        //set validator to use mocked validator
-        $mockValidation = AspectMock::double(ValidationState::class, ['isValidationRequired' => false])->make();
-        $property = new \ReflectionProperty(Filesystem::class, 'validationState');
-        $property->setAccessible(true);
-        $property->setValue($filesystem, $mockValidation);
+        $fileResolver = $this->createMock(Module::class);
+        $fileResolver->method('get')
+            ->willReturn($fileIterator);
+        $validationState = $this->createMock(ValidationState::class);
+        $validationState->method('isValidationRequired')
+            ->willReturn(false);
+        $filesystem = new Filesystem(
+            $fileResolver,
+            $this->createMock(ConverterInterface::class),
+            $this->createMock(SchemaLocatorInterface::class),
+            $validationState,
+            ''
+        );
 
         return $filesystem;
     }
 
     /**
-     * After class functionality
      * @return void
      */
     public static function tearDownAfterClass(): void