Merge branch hotfix/v2.1.46

roadiz · Sep 28, 2023 · aeb698c · aeb698c
1 parent 2aac63b
commit aeb698c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/DependencyInjection/Compiler/DoctrineMigrationCompilerPass.php b/src/DependencyInjection/Compiler/DoctrineMigrationCompilerPass.php
@@ -29,11 +29,11 @@ private function checkIfBundleRelativePath(string $path, ContainerBuilder $conta
     {
         if (isset($path[0]) && $path[0] === '@') {
             $pathParts  = explode('/', $path);
-            $bundleName = substr($pathParts[0], 1);
+            $bundleName = \mb_substr($pathParts[0], 1);
 
             $bundlePath = $this->getBundlePath($bundleName, $container);
 
-            return $bundlePath . substr($path, strlen('@' . $bundleName));
+            return $bundlePath . \mb_substr($path, \mb_strlen('@' . $bundleName));
         }
 
         return $path;

diff --git a/src/Doctrine/EventSubscriber/FontLifeCycleSubscriber.php b/src/Doctrine/EventSubscriber/FontLifeCycleSubscriber.php
@@ -100,8 +100,8 @@ public function preRemove(LifecycleEventArgs $args): void
             try {
                 // factorize previous code with loop
                 foreach (self::$formats as $format) {
-                    $getter = 'get' . mb_strtoupper($format) . 'Filename';
-                    $relativeUrlGetter = 'get' . mb_strtoupper($format) . 'RelativeUrl';
+                    $getter = 'get' . \mb_strtoupper($format) . 'Filename';
+                    $relativeUrlGetter = 'get' . \mb_strtoupper($format) . 'RelativeUrl';
                     if (null !== $entity->$getter() && $this->fontStorage->fileExists($entity->$relativeUrlGetter())) {
                         $this->fontStorage->delete($entity->$relativeUrlGetter());
                         $this->logger->info('Font file deleted', ['file' => $entity->$relativeUrlGetter()]);
@@ -136,7 +136,7 @@ public function setFontFilesNames(Font $font): void
             /** @var UploadedFile|null $file */
             $file = $font->{'get' . ucfirst($format) . 'File'}();
             if (null !== $file) {
-                $font->{'set' . mb_strtoupper($format) . 'Filename'}($file->getClientOriginalName());
+                $font->{'set' . \mb_strtoupper($format) . 'Filename'}($file->getClientOriginalName());
             }
         }
     }
@@ -152,7 +152,7 @@ public function upload(Font $font): void
             /** @var UploadedFile|null $file */
             $file = $font->{'get' . ucfirst($format) . 'File'}();
             /** @var string|null $relativeUrl */
-            $relativeUrl =  $font->{'get' . mb_strtoupper($format) . 'RelativeUrl'}();
+            $relativeUrl =  $font->{'get' . \mb_strtoupper($format) . 'RelativeUrl'}();
             if (null !== $file && null !== $relativeUrl) {
                 $filename = $file->getPathname();
                 $fontResource = fopen($file->getPathname(), 'r');

diff --git a/src/Entity/Font.php b/src/Entity/Font.php
@@ -121,7 +121,7 @@ class Font extends AbstractDateTimed
      */
     public function __construct()
     {
-        $this->folder = substr(hash("crc32b", date('YmdHi')), 0, 12);
+        $this->folder = \mb_substr(hash("crc32b", date('YmdHi')), 0, 12);
         $this->initAbstractDateTimed();
     }
 
@@ -322,7 +322,7 @@ public function setHash(string $hash): Font
      */
     public function generateHashWithSecret(string $secret): Font
     {
-        $this->hash = substr(hash("crc32b", $this->name . $secret), 0, 12);
+        $this->hash = \mb_substr(hash("crc32b", $this->name . $secret), 0, 12);
 
         return $this;
     }