Merge pull request #7421 from magento-atwix-pyrrans/AC-2123-fix-php81-deprecation-in-db-expression-converter

[Pyrrans] Fixed failures Integration Test in CI for AWS Aurora

Author: sidolov

lib/internal/Magento/Framework/DB/ExpressionConverter.php

@@ -1,18 +1,20 @@
 <?php
 /**
- * DB expression converter
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\DB;
 
+/**
+ * The Database expression converter
+ */
 class ExpressionConverter
 {
     /**
      * Maximum length for many MySql identifiers, including database, table, trigger, and column names
      */
-    const MYSQL_IDENTIFIER_LEN = 64;
+    public const MYSQL_IDENTIFIER_LEN = 64;
 
     /**
      * Dictionary maps common words in identifiers to abbreviations
@@ -90,6 +92,8 @@ public static function addTranslate($from, $to)
     }
 
     /**
+     * Retrieves shorten entity name.
+     *
      * Shorten the name of a MySql identifier, by abbreviating common words and hashing if necessary. Prepends the
      * given prefix to clarify what kind of entity the identifier represents, in case hashing is used.
      *
@@ -125,12 +129,14 @@ public static function shortenEntityName($entityName, $prefix)
      * @param  int $maxCharacters
      * @return string
      */
-    private static function trimHash($hash, $prefix, $maxCharacters)
-    {
-        $diff        = strlen($hash) + strlen($prefix) -  $maxCharacters;
-        $superfluous = $diff / 2;
-        $odd         = $diff % 2;
-        $hash        = substr($hash, $superfluous, - ($superfluous + $odd));
-        return $hash;
+    private static function trimHash(
+        string $hash,
+        string $prefix,
+        int $maxCharacters
+    ): string {
+        $diff = strlen($hash) + strlen($prefix) - $maxCharacters;
+        $superfluous = intdiv($diff, 2);
+        $odd = $diff % 2;
+        return substr($hash, $superfluous, - ($superfluous + $odd));
     }
 }

lib/internal/Magento/Framework/DB/Test/Unit/ExpressionConverterTest.php

@@ -39,11 +39,16 @@ public function shortenEntityNameDataProvider()
                 'pre_',
                 'pre_'
             ],
+            'Hashed identifer with long prefix' => [
+                $length64 . '_cannotBeAbbreviated',
+                'pre_' . $length40,
+                '8d703c761bf8a322a999'
+            ],
             'Abbreviated identifier' => [
                 $length40 . 'downloadable_notification_index',
                 'pre_',
                 $length40 . 'dl_ntfc_idx'
-            ],
+            ]
         ];
     }