[FIX] use Streams for Certificate-ZIP

mjansenDatabay · Nov 13, 2023 · 5227b05 · 5227b05
1 parent 9dd1af0
commit 5227b05
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 29 deletions.
diff --git a/Services/Certificate/classes/Helper/ilCertificateUtilHelper.php b/Services/Certificate/classes/Helper/ilCertificateUtilHelper.php
@@ -83,13 +83,6 @@ public function zipAndDeliver(array $streams, string $download_filename): void
         );
     }
 
-    public function deliverFile(string $zipPath, string $zipFileName, string $mime): void
-    {
-        $this->delivery->delivery()->
-
-        ilFileDelivery::deliverFileLegacy($zipPath, $zipFileName, $mime);
-    }
-
     public function getDir(string $copyDirectory): array
     {
         return ilFileUtils::getDir($copyDirectory);

diff --git a/Services/Certificate/test/ilCertificateBackgroundImageUploadTest.php b/Services/Certificate/test/ilCertificateBackgroundImageUploadTest.php
@@ -76,6 +76,7 @@ public function testFileCanBeUploaded(): void
             ->method('delete');
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper->expects($this->exactly(2))
@@ -158,6 +159,7 @@ public function testPendingFilesCanBeUploaded(): void
             ->method('writeStream');
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper->expects($this->exactly(2))

diff --git a/Services/Certificate/test/ilCertificateLearningHistoryProviderTest.php b/Services/Certificate/test/ilCertificateLearningHistoryProviderTest.php
@@ -61,6 +61,10 @@ public function testIsActive(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+                           ->disableOriginalConstructor()
+                           ->getMock();
+
         $provider = new ilCertificateLearningHistoryProvider(
             10,
             $learningHistoryFactory,
@@ -71,7 +75,8 @@ public function testIsActive(): void
             $controller,
             $certificateSettings,
             $uiFactory,
-            $uiRenderer
+            $uiRenderer,
+            $utilHelper
         );
 
         $this->assertTrue($provider->isActive());
@@ -304,6 +309,10 @@ public function testGetName(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+                           ->disableOriginalConstructor()
+                           ->getMock();
+
         $provider = new ilCertificateLearningHistoryProvider(
             10,
             $learningHistoryFactory,
@@ -314,7 +323,8 @@ public function testGetName(): void
             $controller,
             $certificateSettings,
             $uiFactory,
-            $uiRenderer
+            $uiRenderer,
+            $utilHelper
         );
 
         $this->assertSame('Certificates', $provider->getName());

diff --git a/Services/Certificate/test/ilCertificatePdfActionTest.php b/Services/Certificate/test/ilCertificatePdfActionTest.php
@@ -34,6 +34,7 @@ public function testCreatePdfWillCreatedAndIsDownloadable(): void
             ->willReturn('Something');
 
         $ilUtilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $errorHandler = $this->getMockBuilder(ilErrorHandling::class)
@@ -66,6 +67,7 @@ public function testPdfDownloadAction(): void
             ->willReturn('some_file_name.pdf');
 
         $ilUtilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $ilUtilHelper->method('deliverData')
@@ -104,6 +106,7 @@ public function testDownloadResultsInExceptionBecauseTheServerIsNotActive(): voi
             ->willReturn('some_file_name.pdf');
 
         $ilUtilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $ilUtilHelper->method('deliverData')

diff --git a/Services/Certificate/test/ilCertificateTemplateDeleteActionTest.php b/Services/Certificate/test/ilCertificateTemplateDeleteActionTest.php
@@ -47,6 +47,7 @@ public function testDeleteTemplateAndUseOldThumbnail(): void
             ));
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper
@@ -100,6 +101,7 @@ public function testDeleteTemplateButNoThumbnailWillBeCopiedFromOldCertificate()
             ));
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper

diff --git a/Services/Certificate/test/ilCertificateTemplateExportActionTest.php b/Services/Certificate/test/ilCertificateTemplateExportActionTest.php
@@ -44,41 +44,23 @@ public function testExport(): void
             ));
 
         $filesystem = $this->getMockBuilder(ILIAS\Filesystem\Filesystem::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
-        $filesystem
-            ->expects($this->once())
-            ->method('createDir');
-
-        $filesystem
-            ->expects($this->once())
-            ->method('put');
-
-        $filesystem
-            ->expects($this->once())
-            ->method('deleteDir');
-
-        $filesystem
-            ->expects($this->once())
-            ->method('put');
-
         $objectHelper = $this->getMockBuilder(ilCertificateObjectHelper::class)
             ->getMock();
 
         $objectHelper->method('lookupType')
             ->willReturn('crs');
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper
             ->expects($this->once())
             ->method('zipAndDeliver');
 
-        $utilHelper
-            ->expects($this->once())
-            ->method('deliverFile');
-
         $action = new ilCertificateTemplateExportAction(
             100,
             '/some/where/background.jpg',

diff --git a/Services/Certificate/test/ilCertificateTemplateImportActionTest.php b/Services/Certificate/test/ilCertificateTemplateImportActionTest.php
@@ -48,6 +48,7 @@ public function testCertificateCanBeImportedWithBackgroundImage(): void
             ->willReturn('crs');
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper
@@ -128,6 +129,7 @@ public function testCertificateCanBeImportedWithoutBackgroundImage(): void
             ->willReturn('crs');
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper
@@ -197,6 +199,7 @@ public function testNoXmlFileInUplodadZipFolder(): void
             ->getMock();
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper
@@ -262,6 +265,7 @@ public function testZipfileCouldNoBeMoved(): void
             ->getMock();
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper

diff --git a/Services/Certificate/test/ilCertificateTemplatePreviewActionTest.php b/Services/Certificate/test/ilCertificateTemplatePreviewActionTest.php
@@ -54,6 +54,7 @@ public function testA(): void
             ->willReturn(100);
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper

diff --git a/Services/Certificate/test/ilCoursePlaceholderValuesTest.php b/Services/Certificate/test/ilCoursePlaceholderValuesTest.php
@@ -66,6 +66,7 @@ public function testGetPlaceholderValues(): void
             ->willReturn('2018-09-10');
 
         $ilUtilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $ilUtilHelper->method('prepareFormOutput')
@@ -152,6 +153,7 @@ public function testGetPreviewPlaceholderValues(): void
             ->getMock();
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper->method('prepareFormOutput')

diff --git a/Services/Certificate/test/ilDefaultPlaceholderValuesTest.php b/Services/Certificate/test/ilDefaultPlaceholderValuesTest.php
@@ -130,6 +130,7 @@ public function testGetPlaceholderValues(): void
             ->willReturn('Something');
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper->method('prepareFormOutput')
@@ -206,6 +207,7 @@ public function testGetPlaceholderValuesForPreview(): void
             ->willReturn('Something');
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper->method('prepareFormOutput')

diff --git a/Services/Certificate/test/ilExercisePlaceHolderValuesTest.php b/Services/Certificate/test/ilExercisePlaceHolderValuesTest.php
@@ -69,6 +69,7 @@ public function testGetPlaceholderValues(): void
             ->willReturn('aaa');
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper->expects($this->exactly(2))
@@ -147,6 +148,7 @@ public function testGetPlaceholderValuesForPreview(): void
             ->getMock();
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper->method('prepareFormOutput')

diff --git a/Services/Certificate/test/ilScormPlaceholderValuesTest.php b/Services/Certificate/test/ilScormPlaceholderValuesTest.php
@@ -74,6 +74,7 @@ public function testGetPlaceholderValues(): void
             ->willReturn($objectMock);
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper->method('prepareFormOutput')
@@ -193,6 +194,7 @@ public function testGetPlaceholderValuesForPreview(): void
             ->willReturn($objectMock);
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper->method('prepareFormOutput')

diff --git a/Services/Certificate/test/ilTestPlaceHolderValuesTest.php b/Services/Certificate/test/ilTestPlaceHolderValuesTest.php
@@ -102,6 +102,7 @@ public function testA(): void
             ->willReturn('2018-01-12');
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper->method('prepareFormOutput')
@@ -187,6 +188,7 @@ public function testGetPlaceholderValuesForPreview(): void
             ->getMock();
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $utilHelper->method('prepareFormOutput')

diff --git a/Services/Certificate/test/ilXlsFoParserTest.php b/Services/Certificate/test/ilXlsFoParserTest.php
@@ -38,6 +38,7 @@ private function verifyFoGeneratedFromXhtml(array $form_data, string $fo): void
         $page_formats = new ilPageFormats($language);
 
         $util_helper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+                            ->disableOriginalConstructor()
                             ->getMock();
 
         $util_helper->method('stripSlashes')
@@ -114,6 +115,7 @@ public function testParseWithNonCustomPageFormatting(): void
         $xmlChecker = new ilXMLChecker(new ILIAS\Data\Factory());
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+                           ->disableOriginalConstructor()
                            ->getMock();
 
         $utilHelper->method('stripSlashes')
@@ -208,6 +210,7 @@ public function testParseButXmlCheckerFindsAnError(): never
         $xmlChecker = new ilXMLChecker(new ILIAS\Data\Factory());
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+                           ->disableOriginalConstructor()
                            ->getMock();
 
         $xlstProcess = $this->getMockBuilder(ilCertificateXlstProcess::class)
@@ -279,6 +282,7 @@ public function testParseWithCustomPageFormatting(): void
         $xmlChecker = new ilXMLChecker(new ILIAS\Data\Factory());
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+                           ->disableOriginalConstructor()
                            ->getMock();
 
         $utilHelper->method('stripSlashes')
@@ -373,6 +377,7 @@ public function testCommasWillBeConvertedToPointInDecimalSepartor(): void
         $xmlChecker = new ilXMLChecker(new ILIAS\Data\Factory());
 
         $utilHelper = $this->getMockBuilder(ilCertificateUtilHelper::class)
+                           ->disableOriginalConstructor()
                            ->getMock();
 
         $utilHelper->method('stripSlashes')