Cleanup

[packbundle] / Util / SluggerUtil.php

diff --git a/Util/SluggerUtil.php b/Util/SluggerUtil.php
index 5b059584c021d8eb90c8f6a4d9232473ac16995a..8dc50df5ab8c592aff86043ada5b89cb0fbb8454 100644 (file)
--- a/Util/SluggerUtil.php
+++ b/Util/SluggerUtil.php
@@ -31,7 +31,7 @@ class SluggerUtil {
        private $offset;
 
        /**
-        * Creates a new slugger util
+        * Construct slugger util
         *
         * @todo Add a command to generate alpha array or generate it on first run with cache storage ?
         * @todo Use Cache like in calendar controller through FilesystemAdapter
@@ -118,10 +118,16 @@ class SluggerUtil {
        /**
         * Crypt and base64uri encode string
         *
-        * @param string $data The data string
+        * @param array|string $data The data string
         * @return string The hashed data
         */
-       public function hash(string $data): string {
+       public function hash(array|string $data): string {
+               //With array
+               if (is_array($data)) {
+                       //Json encode array
+                       $data = json_encode($data);
+               }
+
                //Return hashed data
                //XXX: we use hash_hmac with md5 hash
                //XXX: crypt was dropped because it provided identical signature for string starting with same pattern
@@ -171,9 +177,15 @@ class SluggerUtil {
         * Convert string to safe slug
         *
         * @param string $data The data string
-        * @return string The slugged data
+        * @return ?string The slugged data
         */
-       function slug(string $data): string {
+       function slug(?string $data): ?string {
+               //With null
+               if ($data === null) {
+                       //Return null
+                       return $data;
+               }
+
                //Use Transliterator if available
                if (class_exists('Transliterator')) {
                        //Convert from any to latin, then to ascii and lowercase
@@ -181,6 +193,7 @@ class SluggerUtil {
                        //Replace every non alphanumeric character by dash then trim dash
                        return trim(preg_replace('/[^a-zA-Z0-9]+/', '-', $trans->transliterate($data)), '-');
                }
+
                //Convert from utf-8 to ascii, replace quotes with space, remove non alphanumericseparator, replace separator with dash and trim dash
                return trim(preg_replace('/[\/_|+ -]+/', '-', strtolower(preg_replace('/[^a-zA-Z0-9\/_|+ -]/', '', str_replace(['\'', '"'], ' ', iconv('UTF-8', 'ASCII//TRANSLIT', $data))))), '-');
        }