Skip to content

Prefix constants #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 24, 2018
Merged

Prefix constants #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b18a167
Update readme
markwalet Jun 12, 2018
97b2ff0
Add new constants
markwalet Jun 12, 2018
bc519fb
Replace const usage
markwalet Jun 12, 2018
3c637a0
Deprecate old constants
markwalet Jun 12, 2018
43cffb0
Update readme
markwalet Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/DirapeMultiToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 8 additions & 10 deletions src/DirapeToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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)
Expand Down
10 changes: 10 additions & 0 deletions src/Token.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
7 changes: 7 additions & 0 deletions src/TokenServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}
Expand Down