diff --git a/backend/app/Http/Requests/AddProductToCartRequest.php b/backend/app/Http/Requests/AddProductToCartRequest.php index 12615f5..9611708 100644 --- a/backend/app/Http/Requests/AddProductToCartRequest.php +++ b/backend/app/Http/Requests/AddProductToCartRequest.php @@ -2,6 +2,7 @@ namespace App\Http\Requests; +use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; class AddProductToCartRequest extends FormRequest @@ -17,7 +18,7 @@ public function authorize(): bool /** * Get the validation rules that apply to the request. * - * @return array|string> + * @return array|string> */ public function rules(): array { diff --git a/backend/app/Http/Requests/RegisterUserRequest.php b/backend/app/Http/Requests/RegisterUserRequest.php index d5db2cd..62d586c 100644 --- a/backend/app/Http/Requests/RegisterUserRequest.php +++ b/backend/app/Http/Requests/RegisterUserRequest.php @@ -2,6 +2,7 @@ namespace App\Http\Requests; +use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rules\Password; @@ -18,7 +19,7 @@ public function authorize(): bool /** * Get the validation rules that apply to the request. * - * @return array|string> + * @return array|string> */ public function rules(): array { diff --git a/backend/app/Http/Requests/RemoveProductFromCartRequest.php b/backend/app/Http/Requests/RemoveProductFromCartRequest.php index d388f6d..df49cea 100644 --- a/backend/app/Http/Requests/RemoveProductFromCartRequest.php +++ b/backend/app/Http/Requests/RemoveProductFromCartRequest.php @@ -2,6 +2,7 @@ namespace App\Http\Requests; +use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; class RemoveProductFromCartRequest extends FormRequest @@ -17,7 +18,7 @@ public function authorize(): bool /** * Get the validation rules that apply to the request. * - * @return array|string> + * @return array|string> */ public function rules(): array { diff --git a/backend/app/Http/Requests/UpdateProductInCartRequest.php b/backend/app/Http/Requests/UpdateProductInCartRequest.php index adbc4d9..0b24ba2 100644 --- a/backend/app/Http/Requests/UpdateProductInCartRequest.php +++ b/backend/app/Http/Requests/UpdateProductInCartRequest.php @@ -2,6 +2,7 @@ namespace App\Http\Requests; +use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; class UpdateProductInCartRequest extends FormRequest @@ -17,7 +18,7 @@ public function authorize(): bool /** * Get the validation rules that apply to the request. * - * @return array|string> + * @return array|string> */ public function rules(): array { diff --git a/backend/app/Http/Requests/UploadImageRequest.php b/backend/app/Http/Requests/UploadImageRequest.php index c214fa9..dc193dc 100644 --- a/backend/app/Http/Requests/UploadImageRequest.php +++ b/backend/app/Http/Requests/UploadImageRequest.php @@ -2,6 +2,7 @@ namespace App\Http\Requests; +use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; class UploadImageRequest extends FormRequest @@ -17,7 +18,7 @@ public function authorize(): bool /** * Get the validation rules that apply to the request. * - * @return array|string> + * @return array|string> */ public function rules(): array { diff --git a/backend/app/Models/Cart.php b/backend/app/Models/Cart.php index 5c7acc4..b208e7d 100644 --- a/backend/app/Models/Cart.php +++ b/backend/app/Models/Cart.php @@ -5,17 +5,20 @@ use App\Enums\CartStatus; use Illuminate\Database\Eloquent\Attributes\Scope; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Carbon; /** * @property int $id * @property int $user_id * @property CartStatus $status - * @property \Illuminate\Support\Carbon|null $created_at - * @property \Illuminate\Support\Carbon|null $updated_at - * @property-read \Illuminate\Database\Eloquent\Collection $products + * @property Carbon|null $created_at + * @property Carbon|null $updated_at + * @property-read Collection $products * @property-read int|null $products_count - * @property-read \App\Models\User|null $user + * @property-read User|null $user + * * @method static Builder|Cart active() * @method static Builder|Cart newModelQuery() * @method static Builder|Cart newQuery() @@ -26,6 +29,7 @@ * @method static Builder|Cart whereUpdatedAt($value) * @method static Builder|Cart whereUserId($value) * @method static Builder|Cart withProducts() + * * @mixin \Eloquent */ class Cart extends Model diff --git a/backend/app/Models/Product.php b/backend/app/Models/Product.php index fa8b40d..da9380d 100644 --- a/backend/app/Models/Product.php +++ b/backend/app/Models/Product.php @@ -4,10 +4,12 @@ use Illuminate\Database\Eloquent\Attributes\Scope; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Support\Carbon; use Illuminate\Support\Str; /** @@ -18,16 +20,17 @@ * @property numeric $actual_price * @property numeric $list_price * @property int $product_category_id - * @property \Illuminate\Support\Carbon|null $created_at - * @property \Illuminate\Support\Carbon|null $updated_at + * @property Carbon|null $created_at + * @property Carbon|null $updated_at * @property bool $is_active - * @property-read \Illuminate\Database\Eloquent\Collection $carts + * @property-read Collection $carts * @property-read int|null $carts_count - * @property-read \App\Models\ProductCategory|null $category - * @property-read \Illuminate\Database\Eloquent\Collection $favoritedBy + * @property-read ProductCategory|null $category + * @property-read Collection $favoritedBy * @property-read int|null $favorited_by_count - * @property-read \Illuminate\Database\Eloquent\Collection $images + * @property-read Collection $images * @property-read int|null $images_count + * * @method static Builder|Product active() * @method static Builder|Product newModelQuery() * @method static Builder|Product newQuery() @@ -42,6 +45,7 @@ * @method static Builder|Product whereSlug($value) * @method static Builder|Product whereTitle($value) * @method static Builder|Product whereUpdatedAt($value) + * * @mixin \Eloquent */ class Product extends Model diff --git a/backend/app/Models/ProductCategory.php b/backend/app/Models/ProductCategory.php index 1ed44a3..15f9184 100644 --- a/backend/app/Models/ProductCategory.php +++ b/backend/app/Models/ProductCategory.php @@ -3,13 +3,15 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Carbon; /** * @property int $id * @property string $name * @property string $slug - * @property \Illuminate\Support\Carbon|null $created_at - * @property \Illuminate\Support\Carbon|null $updated_at + * @property Carbon|null $created_at + * @property Carbon|null $updated_at + * * @method static \Illuminate\Database\Eloquent\Builder|ProductCategory newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|ProductCategory newQuery() * @method static \Illuminate\Database\Eloquent\Builder|ProductCategory query() @@ -18,6 +20,7 @@ * @method static \Illuminate\Database\Eloquent\Builder|ProductCategory whereName($value) * @method static \Illuminate\Database\Eloquent\Builder|ProductCategory whereSlug($value) * @method static \Illuminate\Database\Eloquent\Builder|ProductCategory whereUpdatedAt($value) + * * @mixin \Eloquent */ class ProductCategory extends Model diff --git a/backend/app/Models/ProductImage.php b/backend/app/Models/ProductImage.php index 15ff24e..b1284a6 100644 --- a/backend/app/Models/ProductImage.php +++ b/backend/app/Models/ProductImage.php @@ -4,14 +4,16 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Support\Carbon; /** * @property int $id * @property string $path * @property int $product_id - * @property \Illuminate\Support\Carbon|null $created_at - * @property \Illuminate\Support\Carbon|null $updated_at - * @property-read \App\Models\Product|null $product + * @property Carbon|null $created_at + * @property Carbon|null $updated_at + * @property-read Product|null $product + * * @method static \Illuminate\Database\Eloquent\Builder|ProductImage newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|ProductImage newQuery() * @method static \Illuminate\Database\Eloquent\Builder|ProductImage query() @@ -20,6 +22,7 @@ * @method static \Illuminate\Database\Eloquent\Builder|ProductImage wherePath($value) * @method static \Illuminate\Database\Eloquent\Builder|ProductImage whereProductId($value) * @method static \Illuminate\Database\Eloquent\Builder|ProductImage whereUpdatedAt($value) + * * @mixin \Eloquent */ class ProductImage extends Model diff --git a/backend/bootstrap/providers.php b/backend/bootstrap/providers.php index 38b258d..fc94ae6 100644 --- a/backend/bootstrap/providers.php +++ b/backend/bootstrap/providers.php @@ -1,5 +1,7 @@ [ 'users' => [ 'driver' => 'eloquent', - 'model' => env('AUTH_MODEL', App\Models\User::class), + 'model' => env('AUTH_MODEL', User::class), ], // 'users' => [ diff --git a/backend/config/database.php b/backend/config/database.php index df933e7..64709ce 100644 --- a/backend/config/database.php +++ b/backend/config/database.php @@ -1,6 +1,7 @@ true, 'engine' => null, 'options' => extension_loaded('pdo_mysql') ? array_filter([ - (PHP_VERSION_ID >= 80500 ? \Pdo\Mysql::ATTR_SSL_CA : \PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'), + (PHP_VERSION_ID >= 80500 ? Mysql::ATTR_SSL_CA : PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], @@ -79,7 +80,7 @@ 'strict' => true, 'engine' => null, 'options' => extension_loaded('pdo_mysql') ? array_filter([ - (PHP_VERSION_ID >= 80500 ? \Pdo\Mysql::ATTR_SSL_CA : \PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'), + (PHP_VERSION_ID >= 80500 ? Mysql::ATTR_SSL_CA : PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], diff --git a/backend/config/sanctum.php b/backend/config/sanctum.php index 44527d6..cde73cf 100644 --- a/backend/config/sanctum.php +++ b/backend/config/sanctum.php @@ -1,5 +1,8 @@ [ - 'authenticate_session' => Laravel\Sanctum\Http\Middleware\AuthenticateSession::class, - 'encrypt_cookies' => Illuminate\Cookie\Middleware\EncryptCookies::class, - 'validate_csrf_token' => Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class, + 'authenticate_session' => AuthenticateSession::class, + 'encrypt_cookies' => EncryptCookies::class, + 'validate_csrf_token' => ValidateCsrfToken::class, ], ]; diff --git a/backend/database/factories/UserFactory.php b/backend/database/factories/UserFactory.php index 584104c..c4ceb07 100644 --- a/backend/database/factories/UserFactory.php +++ b/backend/database/factories/UserFactory.php @@ -2,12 +2,13 @@ namespace Database\Factories; +use App\Models\User; use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Str; /** - * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User> + * @extends Factory */ class UserFactory extends Factory { diff --git a/backend/tests/Pest.php b/backend/tests/Pest.php index 60f04a4..3834758 100644 --- a/backend/tests/Pest.php +++ b/backend/tests/Pest.php @@ -1,5 +1,7 @@ extend(Tests\TestCase::class) +pest()->extend(TestCase::class) // ->use(Illuminate\Foundation\Testing\RefreshDatabase::class) ->in('Feature');