Remove constructor range argument

[packbundle] / Util / SluggerUtil.php

diff --git a/Util/SluggerUtil.php b/Util/SluggerUtil.php
index 8dc50df5ab8c592aff86043ada5b89cb0fbb8454..eb6041ef4fe66f1ab85467cfaaa3a5e2d9f0f242 100644 (file)
--- a/Util/SluggerUtil.php
+++ b/Util/SluggerUtil.php
@@ -12,67 +12,51 @@
 namespace Rapsys\PackBundle\Util;
 
 /**
- * Helps manage string conversions
+ * Manages string conversions
  */
 class SluggerUtil {
-       //The secret parameter
-       private $secret;
-
-       //The alpha array
-       private $alpha;
+       /**
+        * The alpha array
+        */
+       protected array $alpha;
 
-       //The rev array
-       private $rev;
+       /**
+        * The rev array
+        */
+       protected array $rev;
 
-       //The alpha array key number
-       private $count;
+       /**
+        * The alpha array key number
+        */
+       protected int $count;
 
-       //The offset reduced from secret
-       private $offset;
+       /**
+        * The offset reduced from secret
+        */
+       protected int $offset;
 
        /**
         * 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
+        * Run "bin/console rapsyspack:range" to generate RAPSYSPACK_RANGE="ayl[...]z9w" range in .env.local
+        *
+        * @todo Use Cache like in calendar controller through FilesystemAdapter ?
         *
         * @param string $secret The secret string
         */
-       public function __construct(string $secret) {
-               //Set secret
-               $this->secret = $secret;
+       public function __construct(protected string $secret) {
+               //Without range
+               if (empty($range = $_ENV['RAPSYSPACK_RANGE']) || $range === 'Ch4ng3m3!') {
+                       //Protect member variable setup
+                       return;
+               }
 
                /**
-                * Pseudo-random alphabet
-                * @xxx use array flip and keys to workaround php "smart" that cast range('0', '9') as int instead of string
-                * @xxx The key count mismatch, count(alpha)>count(rev), resulted in a data corruption due to duplicate numeric values
-                * @todosee required range by json_encode result and short input (0->255 ???)
+                * Get pseuto-random alphabet by splitting range string
+                * TODO: see required range by json_encode result and short input (0->255 ???)
+                * XXX: The key count mismatch, count(alpha)>count(rev), resulted in a data corruption due to duplicate numeric values
                 */
-               $this->alpha = array_keys(array_flip(array_merge(
-                       range('^', '[', -1),
-                       range('V', 'Z'),
-                       range('9', '7', -1),
-                       range('L', 'O'),
-                       range('f', 'a', -1),
-                       range('_', '`'),
-                       range('3', '0', -1),
-                       range('E', 'H'),
-                       range('v', 'r', -1),
-                       range('+', '/'),
-                       range('K', 'I', -1),
-                       range('g', 'j'),
-                       range('=', ':', -1),
-                       range('>', '@'),
-                       range('m', 'k', -1),
-                       range('4', '6'),
-                       range('*', '%', -1),
-                       range('n', 'q'),
-                       range('U', 'P', -1),
-                       range(' ', '$'),
-                       range('D', 'A', -1),
-                       range('w', 'z'),
-                       range('~', '!', -1)
-               )));
+               $this->alpha = str_split($range);
 
                //Init rev array
                $this->count = count($rev = $this->rev = array_flip($this->alpha));
@@ -81,6 +65,7 @@ class SluggerUtil {
                $split = str_split($this->secret);
 
                //Set offset
+               //TODO: protect undefined index ?
                $this->offset = array_reduce($split, function ($res, $a) use ($rev) { return $res += $rev[$a]; }, count($split)) % $this->count;
        }
 
@@ -170,7 +155,7 @@ class SluggerUtil {
                }
 
                //Send result
-               return str_replace(['+','/'], ['-','_'], base64_encode($ret));
+               return str_replace(['+','/','='], ['-','_',''], base64_encode($ret));
        }
 
        /**
@@ -198,6 +183,31 @@ class SluggerUtil {
                return trim(preg_replace('/[\/_|+ -]+/', '-', strtolower(preg_replace('/[^a-zA-Z0-9\/_|+ -]/', '', str_replace(['\'', '"'], ' ', iconv('UTF-8', 'ASCII//TRANSLIT', $data))))), '-');
        }
 
+       /**
+        * Convert string to latin
+        *
+        * @param string $data The data string
+        * @return ?string The slugged data
+        */
+       function latin(?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
+                       $trans = \Transliterator::create('Any-Latin; Latin-ASCII');
+                       //Replace every non alphanumeric character by dash then trim dash
+                       return trim($trans->transliterate($data));
+               }
+
+               //Convert from utf-8 to ascii
+               return trim(iconv('UTF-8', 'ASCII//TRANSLIT', $data));
+       }
+
        /**
         * Unshort then unserialize
         *