Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vimeo/psalm requirement from ^4.18 to ^5.8 #165

Merged
merged 6 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ jobs:
- ubuntu-latest

php:
- 8.0
- 8.1
- "8.0"
- "8.1"
- "8.2"

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"phpunit/phpunit": "^9.5",
"roave/infection-static-analysis-plugin": "^1.16",
"spatie/phpunit-watcher": "^1.23",
"vimeo/psalm": "^4.18",
"vimeo/psalm": "^4.30|^5.8",
"yiisoft/json": "^1.0",
"yiisoft/yii-debug-api": "^3.0@dev",
"yiisoft/yii-debug-viewer": "^3.0@dev",
Expand Down
6 changes: 5 additions & 1 deletion psalm.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
<psalm
errorLevel="6"
resolveFromConfigFile="true"
findUnusedBaselineEntry="true"
findUnusedCode="false"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
Expand All @@ -15,4 +16,7 @@
<directory name="vendor" />
</ignoreFiles>
</projectFiles>
<issueHandlers>
<MixedAssignment errorLevel="suppress" />
</issueHandlers>
</psalm>
13 changes: 13 additions & 0 deletions src/Auth/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,17 @@ public function __construct(
* path="/auth/",
* summary="Authenticate by params",
* description="",
*
* @OA\Response(
* response="200",
* description="Success",
*
* @OA\JsonContent(
* allOf={
*
* @OA\Schema(ref="#/components/schemas/Response"),
* @OA\Schema(
*
* @OA\Property(
* property="data",
* type="object",
Expand All @@ -58,15 +62,20 @@ public function __construct(
* },
* )
* ),
*
* @OA\Response(
* response="400",
* description="Bad request",
*
* @OA\JsonContent(ref="#/components/schemas/BadResponse")
* ),
*
* @OA\RequestBody(
* required=true,
*
* @OA\MediaType(
* mediaType="application/json",
*
* @OA\Schema(ref="#/components/schemas/AuthRequest"),
* ),
* ),
Expand All @@ -90,14 +99,18 @@ public function login(AuthRequest $request): ResponseInterface
* summary="Logout",
* description="",
* security={{"ApiKey": {}}},
*
* @OA\Response(
* response="200",
* description="Success",
*
* @OA\JsonContent(ref="#/components/schemas/Response")
* ),
*
* @OA\Response(
* response="400",
* description="Bad request",
*
* @OA\JsonContent(ref="#/components/schemas/BadResponse")
* ),
* )
Expand Down
1 change: 1 addition & 0 deletions src/Auth/AuthRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/**
* @OA\Schema(
* schema="AuthRequest",
*
* @OA\Property(example="Opal1144", property="login", format="string"),
* @OA\Property(example="Opal1144", property="password", format="string"),
* )
Expand Down
1 change: 1 addition & 0 deletions src/Dto/ApiResponseData.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* allOf={
* @OA\Schema(ref="#/components/schemas/Response"),
* @OA\Schema(
*
* @OA\Property(
* property="status",
* example="failed",
Expand Down
1 change: 1 addition & 0 deletions src/Formatter/PaginatorFormatter.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/**
* @OA\Schema(
* schema="Paginator",
*
* @OA\Property(example="10", property="pageSize", format="int"),
* @OA\Property(example="1", property="currentPage", format="int"),
* @OA\Property(example="3", property="totalPages", format="int"),
Expand Down
4 changes: 4 additions & 0 deletions src/InfoController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,17 @@ class InfoController
* path="/",
* summary="Returns info about the API",
* description="",
*
* @OA\Response(
* response="200",
* description="Success",
*
* @OA\JsonContent(
* allOf={
*
* @OA\Schema(ref="#/components/schemas/Response"),
* @OA\Schema(
*
* @OA\Property(
* property="data",
* type="object",
Expand Down
3 changes: 3 additions & 0 deletions src/User/UserRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
use Yiisoft\Auth\IdentityRepositoryInterface;
use Yiisoft\Auth\IdentityWithTokenRepositoryInterface;

/**
* @extends Select\Repository<User>
*/
final class UserRepository extends Select\Repository implements IdentityWithTokenRepositoryInterface, IdentityRepositoryInterface
{
private ORMInterface $orm;
Expand Down
Loading