X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/6100e3bcd4296f6dab4ea96865f17433f3fc3575..96853a9e2368e10654799eedb3283052275f1a5f:/Util/SluggerUtil.php

diff --git a/Util/SluggerUtil.php b/Util/SluggerUtil.php
index fc3f462..3b1e6b5 100644
--- a/Util/SluggerUtil.php
+++ b/Util/SluggerUtil.php
@@ -12,67 +12,46 @@
 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
+	 * @description Run "php 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 $range The shuffled range string
 	 * @param string $secret The secret string
 	 */
-	public function __construct(string $secret) {
-		//Set secret
-		$this->secret = $secret;
-
+	public function __construct(protected string $range, protected string $secret) {
 		/**
-		 * 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($this->range);
 
 		//Init rev array
 		$this->count = count($rev = $this->rev = array_flip($this->alpha));
@@ -170,7 +149,7 @@ class SluggerUtil {
 		}
 
 		//Send result
-		return str_replace(['+','/'], ['-','_'], base64_encode($ret));
+		return str_replace(['+','/','='], ['-','_',''], base64_encode($ret));
 	}
 
 	/**