Quellcode durchsuchen

updated php to 8.4, updated drupal core to 10.6.5, fixed custom code deprecation

bach vor 1 Tag
Ursprung
Commit
58ebf80d1d
3 geänderte Dateien mit 239 neuen und 340 gelöschten Zeilen
  1. 1 1
      composer.json
  2. 206 334
      composer.lock
  3. 32 5
      web/modules/custom/edlp_corpus/src/Plugin/Block/BlockEntrees.php

+ 1 - 1
composer.json

@@ -76,7 +76,7 @@
         "drupal/views_bulk_edit": "^3",
         "drupal/views_bulk_operations": "^4.3",
         "drupal/workflow": "^1.8",
-        "drush/drush": "^12",
+        "drush/drush": "^13",
         "kint-php/kint": "^5.1",
         "vlucas/phpdotenv": "^2.4",
         "webflo/drupal-finder": "^1.0.0",

Datei-Diff unterdrückt, da er zu groß ist
+ 206 - 334
composer.lock


+ 32 - 5
web/modules/custom/edlp_corpus/src/Plugin/Block/BlockEntrees.php

@@ -125,11 +125,38 @@ class BlockEntrees extends BlockBase {
     );
   }
 
-  private function stripAccent($str){
-    return strtr(
-               utf8_decode($str),
-               utf8_decode('àáâãäçèéêëìíîïñòóôõöùúûüýÿÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝ'),
-               'aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY');
+  // DEPRECATED
+  // private function stripAccent($str){
+  //   return strtr(
+  //              utf8_decode($str),
+  //              utf8_decode('àáâãäçèéêëìíîïñòóôõöùúûüýÿÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝ'),
+  //              'aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY');
+  // }
+
+  private function stripAccent($str) {
+    if (class_exists('Transliterator')) {
+        $transliterator = \Transliterator::create('Any-Latin; Latin-ASCII');
+        return $transliterator->transliterate($str);
+    }
+    // Fallback si l'extension Intl n'est pas disponible
+    return strtr($str, [
+        'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a', 'ä' => 'a',
+        'ç' => 'c',
+        'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e',
+        'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i',
+        'ñ' => 'n',
+        'ò' => 'o', 'ó' => 'o', 'ô' => 'o', 'õ' => 'o', 'ö' => 'o',
+        'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ü' => 'u',
+        'ý' => 'y', 'ÿ' => 'y',
+        'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A',
+        'Ç' => 'C',
+        'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E',
+        'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', 'Ï' => 'I',
+        'Ñ' => 'N',
+        'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O', 'Ö' => 'O',
+        'Ù' => 'U', 'Ú' => 'U', 'Û' => 'U', 'Ü' => 'U',
+        'Ý' => 'Y',
+    ]);
   }
 
 }

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.