diff --git a/src/Service/NamingService.php b/src/Service/NamingService.php index 183e142..5bdc300 100644 --- a/src/Service/NamingService.php +++ b/src/Service/NamingService.php @@ -64,7 +64,7 @@ private function findNextPossibleFilename(string $path): string return $pathInfo['dirname'] . DIRECTORY_SEPARATOR . $newFileName - . ($pathInfo['extension'] ? '.' . $pathInfo['extension'] : ''); + . (isset($pathInfo['extension']) && $pathInfo['extension'] ? '.' . $pathInfo['extension'] : ''); } public function validateFileName(string $fileName): bool diff --git a/tests/Unit/Image/Service/ImageResourceTest.php b/tests/Unit/Image/Service/ImageResourceTest.php index a98cf46..cffb2f1 100644 --- a/tests/Unit/Image/Service/ImageResourceTest.php +++ b/tests/Unit/Image/Service/ImageResourceTest.php @@ -307,14 +307,8 @@ public static function getThumbnailPathDataProvider(): array ]; } - public function getThumbnailUrlProvider() + public static function getThumbnailUrlProvider() { - $sut = $this->getSut(); - $sThumbName = $this->getImageSizeAsString( - md5(self::FIXTURE_FILE) . '_thumb_', - $sut->getDefaultThumbnailSize() - ); - return [ [ 'sFile' => '', @@ -324,7 +318,7 @@ public function getThumbnailUrlProvider() [ 'sFile' => self::FIXTURE_FILE, 'imageSize' => null, - 'expected' => 'thumbs/' . $sThumbName, + 'expected' => 'thumbs/d0b3244693f743a542dc6a84b8f5ae22_thumb_185*185.jpg', ], [ 'sFile' => '111.jpg', diff --git a/tests/Unit/Service/MediaTest.php b/tests/Unit/Service/MediaTest.php index aa34b8a..80e20d0 100644 --- a/tests/Unit/Service/MediaTest.php +++ b/tests/Unit/Service/MediaTest.php @@ -293,19 +293,15 @@ public function testUploadMedia() $sut->uploadMedia($sSourcePath, $sDestPath, $sFileSize, $sFileType); } - public function getRenameDataProvider(): array + public static function getRenameDataProvider(): array { - $oMedia = $this->getSut( - namingService: ContainerFactory::getInstance()->getContainer()->get(NamingServiceInterface::class), - ); + $defaultThumbnailSize = 185; - $defaultThumbnailSize = $oMedia->imageResource->getDefaultThumbnailSize(); - - $sThumbName = $this->getImageSizeAsString( + $sThumbName = self::getImageSizeAsString( md5(self::FIXTURE_FILE) . '_thumb_', $defaultThumbnailSize ); - $sThumbNameNew = $this->getImageSizeAsString( + $sThumbNameNew = self::getImageSizeAsString( md5('new.jpg') . '_thumb_', $defaultThumbnailSize ); @@ -315,7 +311,7 @@ public function getRenameDataProvider(): array $structureExpected['root']['out']['pictures']['ddmedia']['new.jpg'] = 'some file'; $structureExpected['root']['out']['pictures']['ddmedia']['thumbs'][$sThumbNameNew] = 'some file'; - $sThumbName = $this->getImageSizeAsString( + $sThumbName = self::getImageSizeAsString( md5(self::FIXTURE_FILE) . '_thumb_', $defaultThumbnailSize ); @@ -341,19 +337,19 @@ public function getRenameDataProvider(): array $structure2['out']['pictures']['ddmedia'][self::FIXTURE_FOLDER] = []; $structureExpected2['root']['out']['pictures']['ddmedia']['folderNew'] = []; - $sThumbName = $this->getImageSizeAsString( + $sThumbName = self::getImageSizeAsString( md5(self::FIXTURE_FILE) . '_thumb_', $defaultThumbnailSize ); - $sThumbName2 = $this->getImageSizeAsString( + $sThumbName2 = self::getImageSizeAsString( md5('new_1.jpg') . '_thumb_', $defaultThumbnailSize ); - $sThumbName3 = $this->getImageSizeAsString( + $sThumbName3 = self::getImageSizeAsString( md5('new_1.jpg') . '_thumb_', $defaultThumbnailSize ); - $sThumbNameNew2 = $this->getImageSizeAsString( + $sThumbNameNew2 = self::getImageSizeAsString( md5('new_2.jpg') . '_thumb_', $defaultThumbnailSize ); @@ -438,12 +434,11 @@ public function getRenameDataProvider(): array ]; } - public function getDeleteDataProvider() + public static function getDeleteDataProvider() { - $oMedia = $this->getSut(); - $sThumbName = $this->getImageSizeAsString( + $sThumbName = self::getImageSizeAsString( '111_thumb_', - $oMedia->imageResource->getDefaultThumbnailSize() + 185 ); // scenario 1 - file in media root @@ -579,7 +574,7 @@ protected function getImageResourceStub( ); } - private function getImageSizeAsString(string $prefix, int $imageSize, $suffix = '.jpg'): string + private static function getImageSizeAsString(string $prefix, int $imageSize, $suffix = '.jpg'): string { return sprintf( '%s%d*%d%s', diff --git a/tests/github_actions/module-medialibrary.yml b/tests/github_actions/module-medialibrary.yml index 852c041..5257687 100644 --- a/tests/github_actions/module-medialibrary.yml +++ b/tests/github_actions/module-medialibrary.yml @@ -31,7 +31,7 @@ codeception: title: codeception container: options: '-e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome -e XDEBUG_MODE=coverage -e THEME_ID=apex' - configuration: '/var/www/vendor/oxid-esales/gdpr-optin-module/tests/codeception.yml' + configuration: '/var/www/vendor/oxid-esales/media-library-module/tests/codeception.yml' suite: 'acceptance' additional_options: '--coverage-xml=/var/www/codeception_coverage.xml' logfile: diff --git a/tests/phpunit.xml b/tests/phpunit.xml index 85e2a5c..82f25c0 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -10,7 +10,12 @@ xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false" - requireCoverageMetadata="false"> + requireCoverageMetadata="false" + displayDetailsOnTestsThatTriggerWarnings="true" + displayDetailsOnTestsThatTriggerNotices="true" + displayDetailsOnTestsThatTriggerErrors="true" + displayDetailsOnTestsThatTriggerDeprecations="true" +> Unit/