| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -namespace WindPressPackages\Hidehalo\Nanoid; | |
| 3 | +namespace WindPressDeps\Hidehalo\Nanoid; | |
| 4 | 4 | |
| 5 | 5 | class Client |
| 6 | 6 | { |
| 7 | 7 | /** |
| @@ -30,13 +30,13 @@ | ||
| 30 | 30 | * Constructor of Client |
| 31 | 31 | * |
| 32 | 32 | * @codeCoverageIgnore |
| 33 | 33 | * @param integer $size |
| 34 | - * @param GeneratorInterface $generator | |
| 34 | + * @param GeneratorInterface|null $generator | |
| 35 | 35 | */ |
| 36 | - public function __construct($size = 21, GeneratorInterface $generator = null) | |
| 36 | + public function __construct($size = 21, ?GeneratorInterface $generator = null) | |
| 37 | 37 | { |
| 38 | - $this->size = ($size > 0) ? $size : 21; | |
| 38 | + $this->size = $size > 0 ? $size : 21; | |
| 39 | 39 | $this->generator = $generator ?: new Generator(); |
| 40 | 40 | $this->core = new Core(); |
| 41 | 41 | $this->alphabet = CoreInterface::SAFE_SYMBOLS; |
| 42 | 42 | } |
| @@ -48,9 +48,9 @@ | ||
| 48 | 48 | * @return string |
| 49 | 49 | */ |
| 50 | 50 | public function generateId($size = 0, $mode = self::MODE_NORMAL) |
| 51 | 51 | { |
| 52 | - $size = ($size > 0) ? $size : $this->size; | |
| 52 | + $size = $size > 0 ? $size : $this->size; | |
| 53 | 53 | switch ($mode) { |
| 54 | 54 | case self::MODE_DYNAMIC: |
| 55 | 55 | return $this->core->random($this->generator, $size, $this->alphabet); |
| 56 | 56 | default: |
| @@ -61,17 +61,17 @@ | ||
| 61 | 61 | * The original API of nanoid. Use it be careful, Please make sure |
| 62 | 62 | * you have been implements your custom GeneratorInterface as correctly. |
| 63 | 63 | * Otherwise use the build-in default random bytes generator |
| 64 | 64 | * |
| 65 | - * @param GeneratorInterface $generator | |
| 65 | + * @param GeneratorInterface|null $generator | |
| 66 | 66 | * @param integer $size |
| 67 | 67 | * @param string $alphabet default CoreInterface::SAFE_SYMBOLS |
| 68 | 68 | * @return string |
| 69 | 69 | */ |
| 70 | - public function formattedId($alphabet, $size = 0, GeneratorInterface $generator = null) | |
| 70 | + public function formattedId($alphabet, $size = 0, ?GeneratorInterface $generator = null) | |
| 71 | 71 | { |
| 72 | 72 | $alphabet = $alphabet ?: CoreInterface::SAFE_SYMBOLS; |
| 73 | - $size = ($size > 0) ? $size : $this->size; | |
| 73 | + $size = $size > 0 ? $size : $this->size; | |
| 74 | 74 | $generator = $generator ?: $this->generator; |
| 75 | 75 | return $this->core->random($generator, $size, $alphabet); |
| 76 | 76 | } |
| 77 | 77 | /** |
| @@ -78,16 +78,16 @@ | ||
| 78 | 78 | * Backwards-compatible method name. |
| 79 | 79 | * |
| 80 | 80 | * @param string $alphabet |
| 81 | 81 | * @param integer $size |
| 82 | - * @param GeneratorInterface $generator | |
| 82 | + * @param GeneratorInterface|null $generator | |
| 83 | 83 | * |
| 84 | 84 | * @return string |
| 85 | 85 | * @since 1.0.0 |
| 86 | 86 | */ |
| 87 | - public function formatedId($alphabet, $size = 0, GeneratorInterface $generator = null) | |
| 87 | + public function formatedId($alphabet, $size = 0, ?GeneratorInterface $generator = null) | |
| 88 | 88 | { |
| 89 | - $size = ($size > 0) ? $size : $this->size; | |
| 89 | + $size = $size > 0 ? $size : $this->size; | |
| 90 | 90 | return $this->formattedId($alphabet, $size, $generator); |
| 91 | 91 | } |
| 92 | 92 | /** |
| 93 | 93 | * Generate secure URL-friendly unique ID. |