Merge pull request #104 from RonasIT/86c0x8ucu-laravel-pint

Install laravel-pint

.github/workflows/run-tests-with-coverage.yml

@@ -37,7 +37,7 @@ jobs:
       redis:
         image: redis:7.2
         env:
-          ALLOW_EMPTY_PASSWORD: yes
+          ALLOW_EMPTY_PASSWORD: "yes"
         ports:
           - 6379:6379
         options: >-

app/Console/Commands/Init.php

@@ -139,7 +139,7 @@ protected function fillReadme(): void
         $type = $this->choice(
             question: 'What type of application will your API serve?',
             choices: ['Mobile', 'Web', 'Multiplatform'],
-            default: 'Multiplatform'
+            default: 'Multiplatform',
         );
 
         $this->setReadmeValue($file, 'type', $type);
@@ -162,12 +162,12 @@ protected function fillResources(): void
         foreach (self::RESOURCES_ITEMS as $key => $title) {
             $defaultAnswer = (in_array($key, self::DEFAULT_URLS)) ? $this->appUrl . "/{$key}" : 'later';
             $text = "Are you going to use {$title}? "
-                . "Please enter a link or select `later` to do it later, otherwise select `no`.";
+                . 'Please enter a link or select `later` to do it later, otherwise select `no`.';
 
             $link = $this->anticipate(
                 $text,
                 ['later', 'no'],
-                $defaultAnswer
+                $defaultAnswer,
             );
 
             if ($link === 'later') {

app/Http/Controllers/AuthController.php

@@ -8,15 +8,15 @@
 use App\Http\Requests\Auth\RefreshTokenRequest;
 use App\Http\Requests\Auth\RegisterUserRequest;
 use App\Http\Requests\Auth\RestorePasswordRequest;
-use App\Http\Resources\Auth\SuccessLoginResource;
 use App\Http\Resources\Auth\RefreshTokenResource;
-use Illuminate\Http\Response;
+use App\Http\Resources\Auth\SuccessLoginResource;
 use App\Services\UserService;
 use App\Traits\TokenTrait;
+use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Password;
-use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
 use PHPOpenSourceSaver\JWTAuth\Exceptions\JWTException;
 use PHPOpenSourceSaver\JWTAuth\JWTAuth;
+use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
 use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 
 class AuthController extends Controller

app/Http/Controllers/SettingController.php

@@ -5,8 +5,8 @@
 use App\Http\Requests\Setting\GetSettingRequest;
 use App\Http\Requests\Setting\SearchSettingRequest;
 use App\Http\Requests\Setting\UpdateSettingRequest;
-use App\Http\Resources\Setting\SettingsCollectionResource;
 use App\Http\Resources\Setting\SettingResource;
+use App\Http\Resources\Setting\SettingsCollectionResource;
 use App\Services\SettingService;
 use Illuminate\Http\Response;
 
@@ -23,7 +23,7 @@ public function update(UpdateSettingRequest $request, SettingService $service, s
     {
         $service->update(
             ['name' => $key],
-            ['value' => $request->all()]
+            ['value' => $request->all()],
         );
 
         return response('', Response::HTTP_NO_CONTENT);

app/Models/Role.php

@@ -8,8 +8,8 @@
 
 class Role extends Model
 {
-    use ModelTrait;
     use HasFactory;
+    use ModelTrait;
 
     public const ADMIN = 1;
     public const USER = 2;

app/Providers/AppServiceProvider.php

@@ -4,9 +4,9 @@
 
 use App\Enums\VersionEnum;
 use Illuminate\Routing\Route;
+use Illuminate\Routing\RouteRegistrar;
 use Illuminate\Support\Facades\Route as RouteFacade;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Routing\RouteRegistrar;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -15,13 +15,13 @@ public function boot(): void
         /**
          * Specify that the route version must be in the range of given values inclusive.
          *
-         * @param VersionEnum|null $start
-         * @param VersionEnum|null $end
-         * @param string|null $param (default is 'version')
-         * @param Route|null $instance
+         * @param  VersionEnum|null  $start
+         * @param  VersionEnum|null  $end
+         * @param  string|null  $param  (default is 'version')
+         * @param  Route|null  $instance
          * @return Route|RouteRegistrar
          */
-        $versionRange = function (?VersionEnum $start, ?VersionEnum $end, ?string $param, Route $instance = null) {
+        $versionRange = function (?VersionEnum $start, ?VersionEnum $end, ?string $param, ?Route $instance = null) {
             if (!$param) {
                 $param = 'version';
             }

app/Repositories/RoleRepository.php

@@ -6,8 +6,8 @@
 use RonasIT\Support\Repositories\BaseRepository;
 
 /**
- * @property  Role $model
-*/
+ * @property Role $model
+ */
 class RoleRepository extends BaseRepository
 {
     public function __construct()

app/Repositories/SettingRepository.php

@@ -7,8 +7,8 @@
 use RonasIT\Support\Repositories\BaseRepository;
 
 /**
- * @property  Setting $model
-*/
+ * @property Setting $model
+ */
 class SettingRepository extends BaseRepository
 {
     public function __construct()

app/Repositories/UserRepository.php

@@ -3,12 +3,11 @@
 namespace App\Repositories;
 
 use App\Models\User;
-use Carbon\Carbon;
 use RonasIT\Support\Repositories\BaseRepository;
 
 /**
- * @property  User $model
-*/
+ * @property User $model
+ */
 class UserRepository extends BaseRepository
 {
     public function __construct()

app/Services/RoleService.php

@@ -8,6 +8,7 @@
 
 /**
  * @property RoleRepository $repository
+ *
  * @mixin RoleRepository
  */
 class RoleService extends EntityService

app/Services/SettingService.php

@@ -9,6 +9,7 @@
 
 /**
  * @property SettingRepository $repository
+ *
  * @mixin SettingRepository
  */
 class SettingService extends EntityService

app/Services/UserService.php

@@ -16,6 +16,7 @@
 
 /**
  * @property UserRepository $repository
+ *
  * @mixin UserRepository
  */
 class UserService extends EntityService
@@ -54,21 +55,19 @@ public function forgotPassword(string $email): string
     {
         return Password::sendResetLink(
             credentials: ['email' => $email],
-            callback: fn ($user, $token) =>
-                Mail::to($user->email)->send(new ForgotPasswordMail(['hash' => $token]))
+            callback: fn ($user, $token) => Mail::to($user->email)->send(new ForgotPasswordMail(['hash' => $token])),
         );
     }
 
     public function restorePassword(array $credentials): string
     {
         return Password::reset(
             credentials: $credentials,
-            callback: fn (User $user, string $password) =>
-                $this->repository
-                    ->force()
-                    ->update($user->id, [
-                        'password' => Hash::make($password),
-                    ])
+            callback: fn (User $user, string $password) => $this->repository
+                ->force()
+                ->update($user->id, [
+                    'password' => Hash::make($password),
+                ]),
         );
     }
 }

bootstrap/app.php

@@ -26,9 +26,9 @@
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Validation\ValidationException;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
+use PHPUnit\Framework\ExpectationFailedException;
 use RonasIT\AutoDoc\Http\Middleware\AutoDocMiddleware;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use PHPUnit\Framework\ExpectationFailedException;
 
 return Application::configure(basePath: dirname(__DIR__))
     ->withRouting(
@@ -37,7 +37,7 @@
         commands: __DIR__ . '/../routes/console.php',
         channels: __DIR__ . '/../routes/channels.php',
         health: '/status',
-        apiPrefix: ''
+        apiPrefix: '',
     )
     ->withMiddleware(function (Middleware $middleware) {
         $middleware->use([

composer.json

@@ -30,14 +30,13 @@
   "require-dev": {
     "ext-json": "*",
     "barryvdh/laravel-ide-helper": "^3.1",
-    "codedefective/cg-hooks": "^3.1",
+    "brainmaestro/composer-git-hooks": "^3.0",
     "fakerphp/faker": "^1.23",
-    "friendsofphp/php-cs-fixer": "^3.8",
+    "laravel/pint": "^1.18",
     "mockery/mockery": "^1.6",
     "php-coveralls/php-coveralls": "^2.7",
     "phpunit/phpunit": "^10.5",
-    "ronasit/laravel-entity-generator": "^3.1",
-    "tightenco/tlint": "^9.3"
+    "ronasit/laravel-entity-generator": "^3.1"
   },
   "autoload": {
     "classmap": [
@@ -56,6 +55,7 @@
   },
   "scripts": {
     "post-install-cmd": [
+      "git config --global --add safe.directory /app",
       "php artisan clear-compiled",
       "[ $COMPOSER_DEV_MODE -eq 0 ] || php artisan ide-helper:generate",
       "[ $COMPOSER_DEV_MODE -eq 0 ] || php artisan ide-helper:meta",
@@ -88,7 +88,7 @@
         "stop-on-failure": ["pre-commit"]
       },
       "pre-commit": [
-        "docker compose up -d php && docker compose exec -T php vendor/bin/php-cs-fixer fix && docker compose exec -T php vendor/bin/tlint"
+        "docker compose -f docker-compose.analyse.yaml up -d && docker compose -f docker-compose.analyse.yaml exec -T nginx vendor/bin/pint"
       ]
     }
   },