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.

Sign up for GitHub

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

Fix matrix variable reference in Github static-analysis action #2308

Merged
merged 2 commits into from
Apr 19, 2022
+3 −3
Merged

Fix matrix variable reference in Github static-analysis action #2308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97518b9
Fix matrix variable reference in Github static-analysis action
mejo- Apr 19, 2022
4dc2a77
ImageController: Fix issues spotted by psalm
mejo- Apr 19, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up php
uses: shivammathur/setup-php@master
with:
php-version: {{ matrix.php-version }}
php-version: ${{ matrix.php-version }}
tools: composer:v1
coverage: none
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions lib/Controller/ImageController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public function uploadImage(int $documentId, int $sessionId, string $sessionToke
$userId = $this->getUserIdFromSession($documentId, $sessionId, $sessionToken);
$uploadResult = $this->imageService->uploadImage($documentId, $newFileName, $newFileResource, $userId);
}
if (isset($insertResult['error'])) {
if (isset($uploadResult['error'])) {
return new DataResponse($uploadResult, Http::STATUS_BAD_REQUEST);
} else {
return new DataResponse($uploadResult);
Expand Down Expand Up @@ -220,7 +220,7 @@ public function getImage(int $documentId, int $sessionId, string $sessionToken,
return $imageFile !== null
? new DataDownloadResponse(
$imageFile->getContent(),
Http::STATUS_OK,
(string) Http::STATUS_OK,
$this->getSecureMimeType($imageFile->getMimeType())
)
: new DataResponse('', Http::STATUS_NOT_FOUND);
Expand Down