Skip to content

IBX-8534: Change deprecated path to inputUri #139

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

Merged
merged 4 commits into from
Dec 10, 2024
Merged

IBX-8534: Change deprecated path to inputUri #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08b2d91
renamed path to inputUri
ViniTou Dec 2, 2024
41d5bd8
Dropped removed Location::SORT_FIELD_MODIFIED_SUBNODE
ViniTou Dec 2, 2024
d67c517
replaced Criterion with interface
ViniTou Dec 2, 2024
a79ed84
fix unit tests
ViniTou Dec 2, 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
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"ext-xmlwriter": "*",
"hautelook/templated-uri-bundle": "^3.4",
"ibexa/core": "~5.0.x-dev",
"ibexa/polyfill-php82": "^1.0",
"lexik/jwt-authentication-bundle": "^2.8",
"symfony/config": "^5.3",
"symfony/dependency-injection": "^5.3",
Expand Down
15 changes: 0 additions & 15 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,11 +1010,6 @@ parameters:
count: 1
path: src/lib/Server/Controller/Content.php

-
message: "#^Parameter \\#1 \\$versions of class Ibexa\\\\Rest\\\\Server\\\\Values\\\\VersionList constructor expects array\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\>, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> given\\.$#"
count: 1
path: src/lib/Server/Controller/Content.php

-
message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Controller\\\\ContentType\\:\\:addContentTypeDraftFieldDefinition\\(\\) has parameter \\$contentTypeId with no type specified\\.$#"
count: 1
Expand Down Expand Up @@ -2205,16 +2200,6 @@ parameters:
count: 1
path: src/lib/Server/Input/Parser/Query.php

-
message: "#^Property Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\:\\:\\$filter \\(Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\) does not accept Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\|null\\.$#"
count: 1
path: src/lib/Server/Input/Parser/Query.php

-
message: "#^Property Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\:\\:\\$query \\(Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\) does not accept Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\Criterion\\|null\\.$#"
count: 1
path: src/lib/Server/Input/Parser/Query.php

-
message: "#^Method Ibexa\\\\Rest\\\\Server\\\\Input\\\\Parser\\\\RelationCreate\\:\\:parse\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
count: 1
Expand Down
2 changes: 0 additions & 2 deletions src/contracts/Output/ValueObjectVisitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ protected function serializeSortField($sortField)
return 'PRIORITY';
case Location::SORT_FIELD_NAME:
return 'NAME';
case Location::SORT_FIELD_MODIFIED_SUBNODE:
return 'MODIFIED_SUBNODE';
case Location::SORT_FIELD_NODE_ID:
return 'NODE_ID';
case Location::SORT_FIELD_CONTENTOBJECT_ID:
Expand Down
2 changes: 1 addition & 1 deletion src/lib/FieldTypeProcessor/ImageProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function postProcessValueHash($outgoingValueHash)
return $outgoingValueHash;
}

$outgoingValueHash['path'] = '/' . $outgoingValueHash['path'];
$outgoingValueHash['path'] = '/' . $outgoingValueHash['inputUri'];
foreach ($this->variations as $variationIdentifier) {
$outgoingValueHash['variations'][$variationIdentifier] = [
'href' => $this->router->generate(
Expand Down
2 changes: 0 additions & 2 deletions src/lib/Input/ParserTools.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ public function parseDefaultSortField($defaultSortFieldString)
return Values\Content\Location::SORT_FIELD_PRIORITY;
case 'NAME':
return Values\Content\Location::SORT_FIELD_NAME;
case 'MODIFIED_SUBNODE':
return Values\Content\Location::SORT_FIELD_MODIFIED_SUBNODE;
case 'NODE_ID':
return Values\Content\Location::SORT_FIELD_NODE_ID;
case 'CONTENTOBJECT_ID':
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Server/Controller/Content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Ibexa\Contracts\Core\Repository\Values\Content\Relation;
use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
use Ibexa\Contracts\Rest\Exceptions;
use function Ibexa\PolyfillPhp82\iterator_to_array;
use Ibexa\Rest\Message;
use Ibexa\Rest\Server\Controller as RestController;
use Ibexa\Rest\Server\Exceptions\BadRequestException;
Expand Down Expand Up @@ -359,7 +360,7 @@ public function loadContentVersions($contentId, Request $request)
$contentInfo = $this->repository->getContentService()->loadContentInfo($contentId);

return new Values\VersionList(
$this->repository->getContentService()->loadVersions($contentInfo),
iterator_to_array($this->repository->getContentService()->loadVersions($contentInfo)),
$request->getPathInfo()
);
}
Expand Down
6 changes: 2 additions & 4 deletions src/lib/Server/Input/Parser/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
namespace Ibexa\Rest\Server\Input\Parser;

use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion as CriterionValue;
use Ibexa\Contracts\Core\Repository\Values\Content\Query\CriterionInterface;
use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
use Ibexa\Rest\Server\Input\Parser\Criterion as CriterionParser;

Expand Down Expand Up @@ -89,11 +90,8 @@ abstract protected function buildQuery();

/**
* @param array $criteriaArray
* @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher
*
* @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion|null A criterion, or a LogicalAnd with a set of Criterion, or null if an empty array was given
*/
private function processCriteriaArray(array $criteriaArray, ParsingDispatcher $parsingDispatcher)
private function processCriteriaArray(array $criteriaArray, ParsingDispatcher $parsingDispatcher): ?CriterionInterface
{
if (count($criteriaArray) === 0) {
return null;
Expand Down
3 changes: 2 additions & 1 deletion tests/lib/FieldTypeProcessor/ImageProcessorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function testPostProcessValueHash()
$processor = $this->getProcessor();

$inputHash = [
'path' => 'var/some_site/223-1-eng-US/Cool-File.jpg',
'inputUri' => 'var/some_site/223-1-eng-US/Cool-File.jpg',
'imageId' => '223-12345',
];

Expand All @@ -46,6 +46,7 @@ public function testPostProcessValueHash()

self::assertEquals(
[
'inputUri' => 'var/some_site/223-1-eng-US/Cool-File.jpg',
'path' => '/var/some_site/223-1-eng-US/Cool-File.jpg',
'imageId' => '223-12345',
'variations' => $expectedVariations,
Expand Down
Loading