diff --git a/src/DirapeMultiToken.php b/src/DirapeMultiToken.php index a357c75..9149a38 100644 --- a/src/DirapeMultiToken.php +++ b/src/DirapeMultiToken.php @@ -16,34 +16,33 @@ public function setTokens() if (! isset($this->DMT_columns)) { throw new Exception("No Columns settings found in model, please see our package documentation https://github.com/F54it/laravel-token"); } + $table = $this->getTable(); $token = new Token(); foreach ($this->DMT_columns as $column => $settings) { $generated_token = null; switch ($settings['type']) { - case DT_Unique: - $generated_token = $token->unique($table, $column, $settings['size'], $settings['special_chr']); - break; - case DT_UniqueNum: + case Token::UNIQUE_NUMBER: $generated_token = $token->uniqueNumber($table, $column, $settings['size'], $settings['special_chr']); break; - case DT_UniqueStr: + case Token::UNIQUE_STRING: $generated_token = $token->uniqueString($table, $column, $settings['size'], $settings['special_chr']); break; - case DT_Random: + case Token::RANDOM: $generated_token = $token->random($settings['size'], $settings['special_chr']); break; - case DT_RandomNum: + case Token::RANDOM_NUMBER: $generated_token = $token->randomNumber($settings['size'], $settings['special_chr']); break; - case DT_RandomStr: + case Token::RANDOM_STRING: $generated_token = $token->randomString($settings['size'], $settings['special_chr']); break; + case Token::UNIQUE: default: $generated_token = $token->unique($table, $column, $settings['size'], $settings['special_chr']); break; diff --git a/src/DirapeToken.php b/src/DirapeToken.php index cee2b7b..1f703b0 100644 --- a/src/DirapeToken.php +++ b/src/DirapeToken.php @@ -57,31 +57,30 @@ public function setToken($type = null, int $size = null, bool $specialCharacter $token = new Token(); $generated_token = null; switch ($this->DT_settings['type']) { - case DT_Unique: - $generated_token = $token->unique($table, $this->DT_Column, $this->DT_settings['size'], $this->DT_settings['special_chr']); - break; - case DT_UniqueNum: + case Token::UNIQUE_NUMBER: $generated_token = $token->uniqueNumber($table, $this->DT_Column, $this->DT_settings['size'], $this->DT_settings['special_chr']); break; - case DT_UniqueStr: + case Token::UNIQUE_STRING: $generated_token = $token->uniqueString($table, $this->DT_Column, $this->DT_settings['size'], $this->DT_settings['special_chr']); break; - case DT_Random: + case Token::RANDOM: $generated_token = $token->random($this->DT_settings['size'], $this->DT_settings['special_chr']); break; - case DT_RandomNum: + case Token::RANDOM_NUMBER: $generated_token = $token->randomNumber($this->DT_settings['size'], $this->DT_settings['special_chr']); break; - case DT_RandomStr: + case Token::RANDOM_STRING: $generated_token = $token->randomString($this->DT_settings['size'], $this->DT_settings['special_chr']); break; + case Token::UNIQUE: default: - $generated_token = $token->Unique($table, $this->DT_Column, $this->DT_settings['size'], $this->DT_settings['special_chr']); + $generated_token = $token->unique($table, $this->DT_Column, $this->DT_settings['size'], $this->DT_settings['special_chr']); + break; } @@ -94,7 +93,6 @@ public function setToken($type = null, int $size = null, bool $specialCharacter * * @param Builder $query * @param bool $flag - * * @return Builder */ public function scopeWithToken($query, $flag = true) diff --git a/src/Token.php b/src/Token.php index d9efd6f..900de4e 100644 --- a/src/Token.php +++ b/src/Token.php @@ -6,6 +6,16 @@ class Token { + /** + * Methods. + */ + const UNIQUE = 'Unique'; + const UNIQUE_NUMBER = 'UniqueNumber'; + const UNIQUE_STRING = 'UniqueString'; + const RANDOM = 'Random'; + const RANDOM_NUMBER = 'RandomNumber'; + const RANDOM_STRING = 'RandomString'; + /** * Create a unique token. * diff --git a/src/TokenServiceProvider.php b/src/TokenServiceProvider.php index cab268e..9a7b288 100644 --- a/src/TokenServiceProvider.php +++ b/src/TokenServiceProvider.php @@ -14,12 +14,19 @@ class TokenServiceProvider extends ServiceProvider public function boot() { if (! defined("DT_STARTED")) { + /** @deprecated */ define('DT_STARTED', true); + /** @deprecated */ define('DT_Unique', 'Unique'); + /** @deprecated */ define('DT_UniqueNum', 'UniqueNumber'); + /** @deprecated */ define('DT_UniqueStr', 'UniqueString'); + /** @deprecated */ define('DT_Random', 'Random'); + /** @deprecated */ define('DT_RandomNum', 'RandomNumber'); + /** @deprecated */ define('DT_RandomStr', 'RandomString'); } }