TDMET-5 fix integration test issues

Author: vadimjustus

Model/Command/ApplyMediaFiles.php

@@ -7,7 +7,6 @@
 use Firegento\ContentProvisioning\Api\TargetMediaDirectoryPathProviderInterface;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\DriverInterface;
-use SplFileInfo;
 
 class ApplyMediaFiles
 {
@@ -61,7 +60,7 @@ private function copyFile(string $sourceDirPath, string $fileName): void
         $targetPathname = $targetDirPath . DIRECTORY_SEPARATOR . $fileName;
 
         if ($this->fileSystemDriver->isFile($sourcePathname)
-            && $this->fileSystemDriver->isReadable($sourcePathname)()
+            && $this->fileSystemDriver->isReadable($sourcePathname)
         ) {
             $this->createDirectory($targetDirPath, $sourceDirPath, $sourcePathname);
             $this->fileSystemDriver->copy($sourcePathname, $targetPathname);

Model/Config/Parser/ParserChain.php

@@ -7,6 +7,9 @@
 use Firegento\ContentProvisioning\Api\ConfigParserInterface;
 use Magento\Framework\Exception\LocalizedException;
 
+/**
+ * @api
+ */
 class ParserChain implements ConfigParserInterface
 {
     /**

Model/Config/Parser/Query/FetchMediaFilesChain.php

@@ -6,6 +6,9 @@
 use Firegento\ContentProvisioning\Api\MediaFilesParserInterface;
 use Magento\Framework\Exception\LocalizedException;
 
+/**
+ * @api
+ */
 class FetchMediaFilesChain implements MediaFilesParserInterface
 {
     /**

Test/Integration/Model/Config/_files/test-files/content-with-images-1.html

@@ -1,5 +1,5 @@
 <h5>Some foobar</h5>
-<p>Foobar: <a href="{{media url=&quot;image-1.png&quot;}}">Link zu einem Bilder</a></p>
+<p>Foobar: <a href="{{media url=image-1.png}}">Link zu einem Bilder</a></p>
 <p>Dummy content...</p>
-<p>Image:&nbsp;<img src="{{media url=&quot;some-test-image.png&quot;}}" alt="fooo" width="300"></p>
-<p>Image 2:&nbsp;<img src="{{media url=&quot;foobar/test.png&quot;}}" alt="" width="450" height="150"></p>
+<p>Image:&nbsp;<img src="{{media url=some-test-image.png}}" alt="fooo" width="300"></p>
+<p>Image 2:&nbsp;<img src="{{media url=foobar/test.png}}" alt="" width="450" height="150"></p>

Test/Integration/Model/PageInstaller/InstallMediaFilesTest.php

@@ -81,13 +81,7 @@ protected function setUp(): void
      */
     private function getChildDirectoryUrl(string $name): string
     {
-        foreach ($this->fileSystem->getChildren() as $child) {
-            if ($child->getName() === $name) {
-                return $child->url();
-            }
-        }
-
-        $this->fail('Unknown child name for virtual directory!');
+        return $this->fileSystem->getChild($name)->url();
     }
 
     protected function initEntries()

Test/Integration/_files/content/content-with-images-1.html

@@ -1,5 +1,5 @@
 <h5>Some foobar</h5>
-<p>Foobar: <a href="{{media url=&quot;image-1.png&quot;}}">Link zu einem Bilder</a></p>
+<p>Foobar: <a href="{{media url=image-1.png}}">Link zu einem Bilder</a></p>
 <p>Dummy content...</p>
-<p>Image:&nbsp;<img src="{{media url=&quot;some-test-image.png&quot;}}" alt="fooo" width="300"></p>
-<p>Image 2:&nbsp;<img src="{{media url=&quot;foobar/test.png&quot;}}" alt="" width="450" height="150"></p>
+<p>Image:&nbsp;<img src="{{media url=some-test-image.png}}" alt="fooo" width="300"></p>
+<p>Image 2:&nbsp;<img src="{{media url=foobar/test.png}}" alt="" width="450" height="150"></p>

Test/Integration/phpunit.gitlab.xml

@@ -42,7 +42,7 @@
         <!-- Semicolon-separated 'glob' patterns, that match global XML configuration files -->
         <const name="TESTS_GLOBAL_CONFIG_DIR" value="../../../app/etc"/>
         <!-- Whether to cleanup the application before running tests or not -->
-        <const name="TESTS_CLEANUP" value="enabled"/>
+        <const name="TESTS_CLEANUP" value="disabled"/>
         <!-- Memory usage and estimated leaks thresholds -->
         <!--<const name="TESTS_MEM_USAGE_LIMIT" value="1024M"/>-->
         <const name="TESTS_MEM_LEAK_LIMIT" value=""/>

etc/di.xml

@@ -105,6 +105,17 @@
         </arguments>
     </type>
 
+    <type name="Firegento\ContentProvisioning\Model\Resolver\FileContentResolver">
+        <arguments>
+            <argument name="fileSystemDriver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
+    <type name="Firegento\ContentProvisioning\Model\Command\ApplyMediaFiles">
+        <arguments>
+            <argument name="fileSystemDriver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
+
     <type name="Firegento\ContentProvisioning\Model\Resolver\ContentResolverProvider">
         <arguments>
             <argument name="contentResolvers" xsi:type="array">