Update project

garbuzivan · Oct 23, 2021 · c388bf9 · c388bf9
1 parent a6f4a7b
commit c388bf9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/Commands/ProlongationByIDCommand.php b/src/Commands/ProlongationByIDCommand.php
@@ -64,10 +64,10 @@ public function handle()
             $this->line('ID токена не введен.');
             return 1;
         }
-        $day = intval($arguments['day']) > 0 ? intval($arguments['day']) : 365;
-        $expiration = Carbon::now()->addDays($day);
+        $expiration = intval($arguments['day']) > 0 ? Carbon::now()->addDays(intval($arguments['day'])) : null;
         $this->TokenManager->prolongationAccessTokenById($token_id, $expiration);
-        $this->line('Токен продлен до ' . $expiration->format('Y-m-d H:i:s') . '.');
+        $date = is_null($expiration) ? 'навсегда' : 'до ' . $expiration->format('Y-m-d H:i:s');
+        $this->line('Токен продлен ' . $date . '.');
         return 1;
     }
 }
diff --git a/src/Commands/ProlongationByTokenCommand.php b/src/Commands/ProlongationByTokenCommand.php
@@ -64,10 +64,10 @@ public function handle()
             $this->line('Токен не введен.');
             return 1;
         }
-        $day = intval($arguments['day']) > 0 ? intval($arguments['day']) : 365;
-        $expiration = Carbon::now()->addDays($day);
+        $expiration = intval($arguments['day']) > 0 ? Carbon::now()->addDays(intval($arguments['day'])) : null;
         $this->TokenManager->prolongationAccessToken($token, $expiration);
-        $this->line('Токен продлен до ' . $expiration->format('Y-m-d H:i:s') . '.');
+        $date = is_null($expiration) ? 'навсегда' : 'до ' . $expiration->format('Y-m-d H:i:s');
+        $this->line('Токен продлен ' . $date . '.');
         return 1;
     }
 }
diff --git a/src/Commands/ProlongationByUserCommand.php b/src/Commands/ProlongationByUserCommand.php
@@ -66,10 +66,10 @@ public function handle()
             $this->line('ID пользователя не введен.');
             return 1;
         }
-        $day = intval($arguments['day']);
-        $expiration = $day > 0 ? Carbon::now()->addDays($day) : null;
+        $expiration = intval($arguments['day']) > 0 ? Carbon::now()->addDays(intval($arguments['day'])) : null;
         $this->TokenManager->prolongationAccessTokenByUser($user_id, $user_type, $expiration);
-        $this->line('Токены пользователя продлены до ' . $expiration->format('Y-m-d H:i:s') . '.');
+        $date = is_null($expiration) ? 'навсегда' : 'до ' . $expiration->format('Y-m-d H:i:s');
+        $this->line('Токен продлен ' . $date . '.');
         return 1;
     }
 }