realodix/relax v1.18

realodix · Aug 7, 2024 · 7a94cd9 · 7a94cd9
1 parent 120fd8d
commit 7a94cd9
Show file tree

Hide file tree

Showing 32 changed files with 97 additions and 98 deletions.
diff --git a/app/Helpers/Global/GeneralHelper.php b/app/Helpers/Global/GeneralHelper.php
@@ -3,13 +3,13 @@
 use App\Helpers\Helper;
 use Illuminate\Support\Number;
 
-if (! function_exists('urlFormat')) {
+if (!function_exists('urlFormat')) {
     /**
      * Display the link according to what You need.
      *
-     * @param string   $value
-     * @param null|int $limit
-     * @param bool     $scheme
+     * @param string $value
+     * @param int|null $limit
+     * @param bool $scheme
      * @return string
      */
     function urlFormat($value, $limit = null, $scheme = true)
@@ -18,7 +18,7 @@ function urlFormat($value, $limit = null, $scheme = true)
     }
 }
 
-if (! function_exists('n_abb')) {
+if (!function_exists('n_abb')) {
     /**
      * This is modified version of Laravel Number::abbreviate() method with the
      * default value of maxPrecision is 2.
@@ -27,8 +27,8 @@ function urlFormat($value, $limit = null, $scheme = true)
      * - https://github.com/laravel/framework/blob/5d4b26e/src/Illuminate/Support/Number.php#L154
      *
      * @param int|float $number
-     * @param int       $precision
-     * @param null|int  $maxPrecision
+     * @param int $precision
+     * @param int|null $maxPrecision
      * @return bool|string
      */
     function n_abb($number, $precision = 0, $maxPrecision = 2)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
@@ -23,17 +23,17 @@ public static function deviceDetector()
     /**
      * A URL formatted according to the specified format.
      *
-     * @param string   $value         URL links
-     * @param null|int $limit         Length string will be truncated to, including suffix
-     * @param bool     $scheme        Show or remove URL schemes
-     * @param bool     $trailingSlash Show or remove trailing slash
+     * @param string $value URL links
+     * @param int|null $limit Length string will be truncated to, including suffix
+     * @param bool $scheme Show or remove URL schemes
+     * @param bool $trailingSlash Show or remove trailing slash
      * @return string
      */
     public static function urlFormat(string $value, ?int $limit = null, bool $scheme = true, bool $trailingSlash = true)
     {
         $sUrl = SpatieUrl::fromString($value);
-        $hostLen = strlen($sUrl->getScheme().'://'.$sUrl->getHost());
-        $limit = $limit ?? strlen($value);
+        $hostLen = strlen($sUrl->getScheme() . '://' . $sUrl->getHost());
+        $limit ??= strlen($value);
 
         // Optionally strip scheme
         if ($scheme === false) {
@@ -52,7 +52,7 @@ public static function urlFormat(string $value, ?int $limit = null, bool $scheme
             $firstPartLen = $hostLen + intval(($pathLen - 1) * 0.5) + strlen($trimMarker);
             $lastPartLen = -abs($limit - $firstPartLen);
 
-            return mb_strimwidth($value, 0, $firstPartLen, $trimMarker).substr($value, $lastPartLen);
+            return mb_strimwidth($value, 0, $firstPartLen, $trimMarker) . substr($value, $lastPartLen);
         }
 
         return $value;
@@ -67,7 +67,7 @@ public static function routeCollisionList()
     {
         return collect(\Illuminate\Support\Facades\Route::getRoutes()->get())
             ->map(fn(\Illuminate\Routing\Route $route) => $route->uri)
-            ->reject(fn($value) => ! preg_match('/^[a-zA-Z\-]+$/', $value))
+            ->reject(fn($value) => !preg_match('/^[a-zA-Z\-]+$/', $value))
             ->unique()->sort()
             ->toArray();
     }
@@ -89,7 +89,7 @@ public static function publicPathCollisionList()
             // remove ., ..,
             ->reject(fn($value) => in_array($value, ['.', '..']))
             // remove file with extension
-            ->filter(fn($value) => ! preg_match('/\.[a-z]+$/', $value))
+            ->filter(fn($value) => !preg_match('/\.[a-z]+$/', $value))
             // remove array value which is in config('urlhub.reserved_keyword')
             ->reject(fn($value) => in_array($value, config('urlhub.reserved_keyword')))
             ->toArray();

diff --git a/app/Http/Controllers/Dashboard/DashboardController.php b/app/Http/Controllers/Dashboard/DashboardController.php
@@ -42,7 +42,7 @@ public function edit(Url $url)
      * Update the destination URL.
      *
      * @param UpdateUrlRequest $request \App\Http\Requests\UpdateUrlRequest
-     * @param Url              $url     \App\Models\Url
+     * @param Url $url \App\Models\Url
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Auth\Access\AuthorizationException

diff --git a/app/Http/Controllers/Dashboard/User/ChangePasswordController.php b/app/Http/Controllers/Dashboard/User/ChangePasswordController.php
@@ -29,7 +29,7 @@ public function view(User $user)
      * Change the password.
      *
      * @param UpdateUserPassword $request \App\Http\Requests\UpdateUserPassword
-     * @param User               $user    \App\Models\User
+     * @param User $user \App\Models\User
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Auth\Access\AuthorizationException

diff --git a/app/Http/Controllers/Dashboard/User/UserController.php b/app/Http/Controllers/Dashboard/User/UserController.php
@@ -44,7 +44,7 @@ public function edit(User $user)
      * Update the specified user in storage.
      *
      * @param UpdateUserEmail $request \App\Http\Requests\UpdateUserEmail
-     * @param User            $user    \App\Models\User
+     * @param User $user \App\Models\User
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Auth\Access\AuthorizationException

diff --git a/app/Http/Requests/StoreUrlRequest.php b/app/Http/Requests/StoreUrlRequest.php
@@ -31,7 +31,7 @@ public function rules()
             'long_url' => ['required', 'url', 'max:65535', new NotBlacklistedDomain],
             'custom_key' => [
                 'nullable', 'unique:urls,keyword',
-                "min:$minLen", "max:$maxLen", 'lowercase',
+                "min:{$minLen}", "max:{$maxLen}", 'lowercase',
                 new \App\Rules\AlphaNumHyphen,
                 new \App\Rules\NotBlacklistedKeyword,
             ],

diff --git a/app/Livewire/Table/UserTable.php b/app/Livewire/Table/UserTable.php
@@ -44,28 +44,28 @@ public function fields(): PowerGridFields
         return PowerGrid::fields()
             ->add('name', function (User $user) {
                 $urlsCount = $user->urls_count;
-                $urlCountTitle = number_format($urlsCount).' short '.Str::plural('link', $urlsCount);
+                $urlCountTitle = number_format($urlsCount) . ' short ' . Str::plural('link', $urlsCount);
 
-                return $user->name.' <span title="'.$urlCountTitle.'">('.n_abb($urlsCount).')</span>';
+                return $user->name . ' <span title="' . $urlCountTitle . '">(' . n_abb($urlsCount) . ')</span>';
             })
             ->add('email')
             ->add('created_at_formatted', function (User $user) {
                 return
-                    '<span title="'.$user->created_at->toDayDateTimeString().'">'
-                        .$user->created_at->shortRelativeDiffForHumans().
+                    '<span title="' . $user->created_at->toDayDateTimeString() . '">'
+                        . $user->created_at->shortRelativeDiffForHumans() .
                     '</span>';
             })
             ->add('action', function (User $user) {
                 return
-                    '<a role="button" href="'.route('user.edit', $user).'" title="'.__('Details').'"
+                    '<a role="button" href="' . route('user.edit', $user) . '" title="' . __('Details') . '"
                         class="btn btn-secondary btn-sm"
                     >'
-                        .Blade::render('@svg(\'icon-person-edit\')').
+                        . Blade::render('@svg(\'icon-person-edit\')') .
                     '</a>
-                    <a role="button" href="'.route('user.password.show', $user).'" title="'.__('Change Password').'"
+                    <a role="button" href="' . route('user.password.show', $user) . '" title="' . __('Change Password') . '"
                         class="btn btn-secondary btn-sm"
                     >'
-                        .Blade::render('@svg(\'icon-key\')').
+                        . Blade::render('@svg(\'icon-key\')') .
                     '</a>';
             });
     }

diff --git a/app/Livewire/Validation/ValidateCustomKeyword.php b/app/Livewire/Validation/ValidateCustomKeyword.php
@@ -26,7 +26,7 @@ public function rules()
 
         return [
             'keyword' => [
-                "min:$minLen", "max:$maxLen", 'unique:App\Models\Url', 'lowercase:field',
+                "min:{$minLen}", "max:{$maxLen}", 'unique:App\Models\Url', 'lowercase:field',
                 new \App\Rules\AlphaNumHyphen,
                 new \App\Rules\NotBlacklistedKeyword,
             ],

diff --git a/app/Models/Url.php b/app/Models/Url.php
@@ -8,18 +8,18 @@
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int            $id
- * @property null|int       $user_id
- * @property string         $keyword
- * @property bool           $is_custom
- * @property string         $destination
- * @property string         $title
- * @property string         $user_sign
+ * @property int $id
+ * @property int|null $user_id
+ * @property string $keyword
+ * @property bool $is_custom
+ * @property string $destination
+ * @property string $title
+ * @property string $user_sign
  * @property \Carbon\Carbon $created_at
  * @property \Carbon\Carbon $updated_at
- * @property User           $author
- * @property Visit          $visits
- * @property string         $short_url
+ * @property User $author
+ * @property Visit $visits
+ * @property string $short_url
  */
 class Url extends Model
 {
@@ -48,7 +48,7 @@ class Url extends Model
     /**
      * Get the attributes that should be cast.
      *
-     * @return array{user_id: 'integer', is_custom: 'boolean'}
+     * @return array{user_id:'integer',is_custom:'boolean'}
      */
     protected function casts(): array
     {
@@ -103,7 +103,7 @@ protected function userId(): Attribute
     protected function shortUrl(): Attribute
     {
         return Attribute::make(
-            get: fn($value, $attr) => url('/'.$attr['keyword']),
+            get: fn($value, $attr) => url('/' . $attr['keyword']),
         );
     }
 
@@ -148,7 +148,7 @@ public function getKeyword(StoreUrlRequest $request): string
     public function getWebTitle(string $value): string
     {
         $spatieUrl = \Spatie\Url\Url::fromString($value);
-        $defaultTitle = $spatieUrl->getHost().' - Untitled';
+        $defaultTitle = $spatieUrl->getHost() . ' - Untitled';
 
         if (config('urlhub.web_title')) {
             try {

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -9,17 +9,17 @@
 use Illuminate\Notifications\Notifiable;
 
 /**
- * @property int            $id
- * @property string         $name
- * @property string         $email
- * @property string         $email_verified_at
- * @property string         $password
- * @property string         $two_factor_secret
- * @property string         $two_factor_recovery_codes
- * @property string         $remember_token
+ * @property int $id
+ * @property string $name
+ * @property string $email
+ * @property string $email_verified_at
+ * @property string $password
+ * @property string $two_factor_secret
+ * @property string $two_factor_recovery_codes
+ * @property string $remember_token
  * @property \Carbon\Carbon $created_at
  * @property \Carbon\Carbon $updated_at
- * @property Url            $urls
+ * @property Url $urls
  */
 class User extends Authenticatable
 {
@@ -47,7 +47,7 @@ class User extends Authenticatable
     /**
      * Get the attributes that should be cast.
      *
-     * @return array{email_verified_at: 'datetime', password: 'hashed'}
+     * @return array{email_verified_at:'datetime',password:'hashed'}
      */
     protected function casts(): array
     {
@@ -98,10 +98,10 @@ public function signature(): string
 
             $userDeviceInfo = implode([
                 request()->ip(),
-                isset($browser['name']) ? $browser['name'] : '',
-                isset($os['name']) ? $os['name'] : '',
-                isset($os['version']) ? $os['version'] : '',
-                $device->getDeviceName().$device->getModel().$device->getBrandName(),
+                $browser['name'] ?? '',
+                $os['name'] ?? '',
+                $os['version'] ?? '',
+                $device->getDeviceName() . $device->getModel() . $device->getBrandName(),
                 request()->getPreferredLanguage(),
             ]);
 

diff --git a/app/Models/Visit.php b/app/Models/Visit.php
@@ -6,14 +6,14 @@
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @property int            $id
- * @property int            $url_id
- * @property string         $visitor_id
- * @property bool           $is_first_click
- * @property string         $referer
+ * @property int $id
+ * @property int $url_id
+ * @property string $visitor_id
+ * @property bool $is_first_click
+ * @property string $referer
  * @property \Carbon\Carbon $created_at
  * @property \Carbon\Carbon $updated_at
- * @property Url            $urls
+ * @property Url $urls
  */
 class Visit extends Model
 {
@@ -34,7 +34,7 @@ class Visit extends Model
     /**
      * Get the attributes that should be cast.
      *
-     * @return array{is_first_click: 'boolean'}
+     * @return array{is_first_click:'boolean'}
      */
     protected function casts(): array
     {

diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php
@@ -48,7 +48,7 @@ public function boot()
         RateLimiter::for('login', function (Request $request) {
             $email = (string) $request->identity;
 
-            return Limit::perMinute(5)->by($email.$request->ip());
+            return Limit::perMinute(5)->by($email . $request->ip());
         });
 
         RateLimiter::for('two-factor', function (Request $request) {

diff --git a/app/Providers/HelperServiceProvider.php b/app/Providers/HelperServiceProvider.php
@@ -16,12 +16,12 @@ class HelperServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $rdi = new \RecursiveDirectoryIterator(app_path('Helpers'.DIRECTORY_SEPARATOR.'Global'));
+        $rdi = new \RecursiveDirectoryIterator(app_path('Helpers' . DIRECTORY_SEPARATOR . 'Global'));
         $it = new \RecursiveIteratorIterator($rdi);
 
         while ($it->valid()) {
             if (
-                ! $it->isDot()
+                !$it->isDot()
                 && $it->isFile()
                 && $it->isReadable()
                 && $it->current()->getExtension() === 'php'

diff --git a/app/Rules/NotBlacklistedDomain.php b/app/Rules/NotBlacklistedDomain.php
@@ -15,8 +15,8 @@ public function validate(string $attribute, mixed $value, \Closure $fail): void
 
         foreach ($blackLists as $blackList) {
             $blackList = Helper::urlFormat($blackList, scheme: false);
-            $segment1 = '://'.$blackList.'/';
-            $segment2 = '://www.'.$blackList.'/';
+            $segment1 = '://' . $blackList . '/';
+            $segment2 = '://www.' . $blackList . '/';
 
             if (strstr($longUrl, $segment1) || strstr($longUrl, $segment2)) {
                 $bool = false;
@@ -26,7 +26,7 @@ public function validate(string $attribute, mixed $value, \Closure $fail): void
         if ($bool === false) {
             $fail(
                 'Sorry, the URL you entered is on our internal blacklist. '
-                .'It may have been used abusively in the past, or it may link to another URL redirection service.',
+                . 'It may have been used abusively in the past, or it may link to another URL redirection service.',
             );
         }
     }

diff --git a/app/Services/KeyGeneratorService.php b/app/Services/KeyGeneratorService.php
@@ -18,10 +18,10 @@ public function generate(string $value): string
     {
         $string = $this->simpleString($value);
 
-        if (! $this->verify($string) || strlen($string) < config('urlhub.keyword_length')) {
+        if (!$this->verify($string) || strlen($string) < config('urlhub.keyword_length')) {
             do {
                 $randomString = $this->randomString();
-            } while (! $this->verify($randomString));
+            } while (!$this->verify($randomString));
 
             return $randomString;
         }
@@ -151,7 +151,7 @@ public function totalKey(): int
         $length = config('urlhub.keyword_length');
 
         return Url::whereRaw('LENGTH(keyword) = ?', [$length])
-            ->whereRaw('keyword REGEXP "^[a-zA-Z0-9]{'.$length.'}$"')
+            ->whereRaw('keyword REGEXP "^[a-zA-Z0-9]{' . $length . '}$"')
             ->count();
     }
 

diff --git a/app/Services/VisitorService.php b/app/Services/VisitorService.php
@@ -64,6 +64,6 @@ public function getRefererHost(?string $value): ?string
 
         $referer = SpatieUrl::fromString($value);
 
-        return $referer->getScheme().'://'.$referer->getHost();
+        return $referer->getScheme() . '://' . $referer->getHost();
     }
 }
diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -6,8 +6,8 @@
 
 return Application::configure(basePath: dirname(__DIR__))
     ->withRouting(
-        web: __DIR__.'/../routes/web.php',
-        commands: __DIR__.'/../routes/console.php',
+        web: __DIR__ . '/../routes/web.php',
+        commands: __DIR__ . '/../routes/console.php',
         health: '/up',
     )
     ->withMiddleware(function (Middleware $middleware) {