Skip to content
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
1 change: 1 addition & 0 deletions .github/workflows/appstore-build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ jobs:
with:
php-version: ${{ env.PHP_VERSION }}
coverage: none
extensions: gd
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lint-php-cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
php-version: 8.2
coverage: none
ini-file: development
extensions: gd
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
php-version: 8.2
coverage: none
ini-file: development
extensions: gd
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
73 changes: 46 additions & 27 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*
* @author affan98 <[email protected]>
* @author Christian Hartmann <[email protected]>
* @author Ferdinand Thiessen <[email protected]>
* @author John Molakvoæ (skjnldsv) <[email protected]>
* @author Jonas Rittershofer <[email protected]>
*
Expand Down Expand Up @@ -73,7 +74,7 @@
'verb' => 'OPTIONS',
'requirements' => [
'path' => '.+',
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],

Expand All @@ -83,31 +84,31 @@
'url' => '/api/{apiVersion}/forms',
'verb' => 'GET',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'api#newForm',
'url' => '/api/{apiVersion}/form',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'api#getForm',
'url' => '/api/{apiVersion}/form/{id}',
'verb' => 'GET',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'api#cloneForm',
'url' => '/api/{apiVersion}/form/clone/{id}',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
// TODO: Remove POST in next API release
Expand All @@ -124,39 +125,39 @@
'url' => '/api/{apiVersion}/form/update',
'verb' => 'PATCH',
'requirements' => [
'apiVersion' => 'v2\.[2-3]'
'apiVersion' => 'v2\.[2-4]'
]
],
[
'name' => 'api#transferOwner',
'url' => '/api/{apiVersion}/form/transfer',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v2\.[2-3]'
'apiVersion' => 'v2\.[2-4]'
]
],
[
'name' => 'api#deleteForm',
'url' => '/api/{apiVersion}/form/{id}',
'verb' => 'DELETE',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'api#getPartialForm',
'url' => '/api/{apiVersion}/partial_form/{hash}',
'verb' => 'GET',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'api#getSharedForms',
'url' => '/api/{apiVersion}/shared_forms',
'verb' => 'GET',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],

Expand All @@ -166,7 +167,7 @@
'url' => '/api/{apiVersion}/question',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
// TODO: Remove POST in next API release
Expand All @@ -183,7 +184,7 @@
'url' => '/api/{apiVersion}/question/update',
'verb' => 'PATCH',
'requirements' => [
'apiVersion' => 'v2\.[2-3]'
'apiVersion' => 'v2\.[2-4]'
]
],
// TODO: Remove POST in next API release
Expand All @@ -200,23 +201,23 @@
'url' => '/api/{apiVersion}/question/reorder',
'verb' => 'PUT',
'requirements' => [
'apiVersion' => 'v2\.[2-3]'
'apiVersion' => 'v2\.[2-4]'
]
],
[
'name' => 'api#deleteQuestion',
'url' => '/api/{apiVersion}/question/{id}',
'verb' => 'DELETE',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'api#cloneQuestion',
'url' => '/api/{apiVersion}/question/clone/{id}',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v2.3'
'apiVersion' => 'v2\.[3-4]'
]
],

Expand All @@ -226,7 +227,7 @@
'url' => '/api/{apiVersion}/option',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
// TODO: Remove POST in next API release
Expand All @@ -243,15 +244,15 @@
'url' => '/api/{apiVersion}/option/update',
'verb' => 'PATCH',
'requirements' => [
'apiVersion' => 'v2\.[2-3]'
'apiVersion' => 'v2\.[2-4]'
]
],
[
'name' => 'api#deleteOption',
'url' => '/api/{apiVersion}/option/{id}',
'verb' => 'DELETE',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],

Expand All @@ -261,15 +262,15 @@
'url' => '/api/{apiVersion}/share',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'shareApi#deleteShare',
'url' => '/api/{apiVersion}/share/{id}',
'verb' => 'DELETE',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
// TODO: Remove POST in next API release
Expand All @@ -286,7 +287,7 @@
'url' => '/api/{apiVersion}/share/update',
'verb' => 'PATCH',
'requirements' => [
'apiVersion' => 'v2\.[2-3]'
'apiVersion' => 'v2\.[2-4]'
]
],

Expand All @@ -296,48 +297,66 @@
'url' => '/api/{apiVersion}/submissions/{hash}',
'verb' => 'GET',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'api#exportSubmissions',
'url' => '/api/{apiVersion}/submissions/export/{hash}',
'verb' => 'GET',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'api#exportSubmissionsToCloud',
'url' => '/api/{apiVersion}/submissions/export',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'api#deleteAllSubmissions',
'url' => '/api/{apiVersion}/submissions/{formId}',
'verb' => 'DELETE',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'api#insertSubmission',
'url' => '/api/{apiVersion}/submission/insert',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
[
'name' => 'api#deleteSubmission',
'url' => '/api/{apiVersion}/submission/{id}',
'verb' => 'DELETE',
'requirements' => [
'apiVersion' => 'v2(\.[1-3])?'
'apiVersion' => 'v2(\.[1-4])?'
]
],
// Submissions linking with file in cloud
[
'name' => 'api#linkFile',
'url' => '/api/{apiVersion}/form/link/{fileFormat}',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v2.4',
'fileFormat' => 'csv|ods|xlsx'
]
],
[
'name' => 'api#unlinkFile',
'url' => '/api/{apiVersion}/form/unlink',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v2.4',
]
]
]
];
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"phpunit/phpunit": "^9"
},
"require": {
"league/csv": "^9.8.0"
"phpoffice/phpspreadsheet": "^1.29"
},
"extra": {
"bamarni-bin": {
Expand Down
Loading