Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-59

Chhandak.Barua · Chhandak.Barua · commit 0e92bb5b00b7 · 2022-02-02T10:23:50.000+05:30
diff --git a/app/code/Magento/AwsS3/Test/Mftf/Helper/FileAssertions.php b/app/code/Magento/AwsS3/Test/Mftf/Helper/FileAssertions.php
@@ -297,7 +297,7 @@ public function assertDirectoryNotEmpty($path, $message = ''): void
      * @param string $filePathJson - path to file or json structure with paths by storage type.
      * @return mixed
      */
-    private function extractFilePath($filePathJson)
+    public function extractFilePath($filePathJson)
     {
         $filePathArgs = json_decode($filePathJson, true);
         if (isset($filePathArgs[$this->storageType])) {

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public function assertDirectoryNotEmpty($path, $message = ''): void`
`297`	`297`	`* @param string $filePathJson - path to file or json structure with paths by storage type.`
`298`	`298`	`* @return mixed`
`299`	`299`	`*/`
`300`		`- private function extractFilePath($filePathJson)`
	`300`	`+ public function extractFilePath($filePathJson)`
`301`	`301`	`{`
`302`	`302`	`$filePathArgs = json_decode($filePathJson, true);`
`303`	`303`	`if (isset($filePathArgs[$this->storageType])) {`