Skip to content

Commit 9cbf6c0

Browse files
committed
AC-1989: Fix subset of deprecated php usages
- Fix unit test
1 parent 2ef765d commit 9cbf6c0

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

app/code/Magento/MediaStorage/App/Media.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,10 @@ private function createLocalCopy(): void
238238
*/
239239
private function checkMediaDirectoryChanged(): bool
240240
{
241-
$isDirectoryChanged = false;
242-
if ($this->mediaDirectoryPath && $this->directoryMedia->getAbsolutePath()) {
243-
$isDirectoryChanged = rtrim($this->mediaDirectoryPath, '/')
244-
!== rtrim($this->directoryMedia->getAbsolutePath(), '/');
245-
}
246-
return $isDirectoryChanged;
241+
$mediaDirectoryPath = $this->mediaDirectoryPath ? rtrim($this->mediaDirectoryPath, '/') : '';
242+
$directoryMediaAbsolutePath = $this->directoryMedia->getAbsolutePath();
243+
$directoryMediaAbsolutePath = $directoryMediaAbsolutePath ? rtrim($directoryMediaAbsolutePath, '/') : '';
244+
return $mediaDirectoryPath !== $directoryMediaAbsolutePath;
247245
}
248246

249247
/**

0 commit comments

Comments
 (0)