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

Jump to bottom

FEATURE: Require Flow 8 #6

Merged
merged 9 commits into from
Feb 12, 2024
Merged

FEATURE: Require Flow 8 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a8efdb6
FEATURE: Allow Flow 8
paxuclus May 25, 2023
5abb82e
BUGFIX: Make test provider static
paxuclus Jun 1, 2023
c6884d1
fix(deps): Require neos/fluid-adaptor for JsonViewHelper
paxuclus Aug 24, 2023
95c67e2
fix: Response interface changed
stephanschuler Oct 5, 2023
3790485
fix: Make use of specific "setContentType" method
stephanschuler Oct 5, 2023
54306a4
Merge pull request #5 from netlogix/bugfix/wrong-response-interface-c…
stephanschuler Oct 5, 2023
3b37d6a
fix: Run unit tests for Flow 8.3
paxuclus Feb 12, 2024
ec1f30e
Merge branch 'master' of github.com:netlogix/Netlogix.WebApi into fea…
paxuclus Feb 12, 2024
8e13f53
feat: Adjust package versions for netlogix jsonapi libs
paxuclus Feb 12, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/unittests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: [7.2, 7.3, 7.4]
flow-versions: [5.3]
php-versions: [8.2, 8.3]
flow-versions: [8.3]

env:
FLOW_CONTEXT: Testing/Unit
Expand Down
4 changes: 2 additions & 2 deletions Classes/Controller/GenericModelController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ protected function mapErrorResult($status, $result): array

protected function respondWithError(Error $error): string
{
$this->response->setHeader('Content-Type', current($this->supportedMediaTypes));
$this->response->setStatus(400);
$this->response->setContentType(current($this->supportedMediaTypes));
$this->response->setStatusCode(400);

return json_encode(
[
Expand Down
2 changes: 1 addition & 1 deletion Tests/Unit/Service/DefaultSortParametersParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function testParseQueryString(string $queryString, array $expectedResults
}
}

public function provideSortQueryStrings()
public static function provideSortQueryStrings(): iterable
{
return [
[
Expand Down
9 changes: 5 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
"homepage": "http://websolutions.netlogix.de/",
"license": ["MIT"],
"require": {
"neos/flow": "^5.0",
"netlogix/jsonapiorg": "^5.0",
"netlogix/jsonapiorg-annotationgenerics": "^7.3"
"neos/flow": "^8.3",
"neos/fluid-adaptor": "^8.3",
"netlogix/jsonapiorg": "^6.0",
"netlogix/jsonapiorg-annotationgenerics": "^8.0"
},
"suggest": {
"netlogix/cors": "Configure CORS headers in neos for different origins"
"sitegeist/offcors": "Configure CORS headers in neos for different origins"
},
"autoload": {
"psr-4": {
Expand Down
Loading