Skip to content

Update to API Platform v3 compatibility #1

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
izzywdev merged 1 commit into from
Jul 4, 2024
Merged

Update to API Platform v3 compatibility #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"cs": "vendor/bin/php-cs-fixer fix src"
},
"suggest": {
"doctrine/orm": "^2.9",
"api-platform/core": "^2.6",
"symfony/messenger": "^5.3|^6.0|^6.2"
"doctrine/orm": "^2.10",
"api-platform/api-pack": "^3.0",
"symfony/messenger": "^6.4"
},
"autoload": {
"psr-4": {
Expand All @@ -30,23 +30,23 @@
}
},
"require": {
"php": "^8.0|^8.1",
"php": "^8.3",
"ext-intl": "*",
"giggsey/libphonenumber-for-php": "^8.11",
"myclabs/php-enum": "^1.7",
"moneyphp/money": "^3",
"symfony/intl": "^5.3|^6.0|^6.2",
"symfony/intl": "^6.4",
"symfony/polyfill-uuid": "^1.23",
"phpdocumentor/reflection-docblock": "^5.2",
"symfony/serializer": "^5.3|6.0.1|^6.2"
"symfony/serializer": "^6.4"
},
"require-dev": {
"phpstan/phpstan": "^1.9",
"friendsofphp/php-cs-fixer": "^3.0",
"doctrine/orm": "^2.9",
"symfony/messenger": "^5.3|^6.0|^6.2",
"api-platform/core": "^2.6",
"symfony/validator": "^5.3|^6.0|^6.2",
"doctrine/orm": "^2.10",
"symfony/messenger": "^6.4",
"api-platform/core": "^3.0",
"symfony/validator": "^6.4",
"phpunit/phpunit": "^9.5",
"spatie/phpunit-snapshot-assertions": "^4.2"
}
Expand Down
9 changes: 5 additions & 4 deletions src/ApiPlatform/Filter/AbstractFullTextSearchFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

namespace Riverwaysoft\ApiTools\ApiPlatform\Filter;

use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractContextAwareFilter;
use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
use ApiPlatform\Doctrine\Orm\Filter\AbstractContextAwareFilter;
use ApiPlatform\Doctrine\Orm\Util\QueryNameGeneratorInterface;
use Doctrine\ORM\QueryBuilder;
use ApiPlatform\Metadata;

abstract class AbstractFullTextSearchFilter extends AbstractContextAwareFilter
{
Expand All @@ -16,8 +17,8 @@ protected function filterProperty(
QueryBuilder $queryBuilder,
QueryNameGeneratorInterface $queryNameGenerator,
string $resourceClass,
string $operationName = null
) {
Operation $operation = null,
) : void {
if ($property !== 'fullText') {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/ApiPlatform/Filter/RiverAdminBooleanFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Riverwaysoft\ApiTools\ApiPlatform\Filter;

use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter;
use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;

class RiverAdminBooleanFilter extends SearchFilter
{
Expand Down
6 changes: 3 additions & 3 deletions src/ApiPlatform/Filter/RiverAdminEntityDropdownFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace Riverwaysoft\ApiTools\ApiPlatform\Filter;

use ApiPlatform\Core\Api\IdentifiersExtractorInterface;
use ApiPlatform\Core\Api\IriConverterInterface;
use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter;
use ApiPlatform\Api\IdentifiersExtractorInterface;
use ApiPlatform\Api\IriConverterInterface;
use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
use Doctrine\Persistence\ManagerRegistry;
use Psr\Log\LoggerInterface;
use Symfony\Component\HttpFoundation\RequestStack;
Expand Down
6 changes: 3 additions & 3 deletions src/ApiPlatform/Filter/RiverAdminEnumSearchFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace Riverwaysoft\ApiTools\ApiPlatform\Filter;

use ApiPlatform\Core\Api\IdentifiersExtractorInterface;
use ApiPlatform\Core\Api\IriConverterInterface;
use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter;
use ApiPlatform\Api\IdentifiersExtractorInterface;
use ApiPlatform\Api\IriConverterInterface;
use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
use Doctrine\Persistence\ManagerRegistry;
use Psr\Log\LoggerInterface;
use Symfony\Component\HttpFoundation\RequestStack;
Expand Down
2 changes: 1 addition & 1 deletion src/ApiPlatform/Filter/RiverAdminSearchFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Riverwaysoft\ApiTools\ApiPlatform\Filter;

use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\SearchFilter;
use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;

class RiverAdminSearchFilter extends SearchFilter
{
Expand Down
7 changes: 7 additions & 0 deletions src/ApiPlatform/Serializer/EnumNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,11 @@ public function supportsNormalization($data, string $format = null): bool
{
return $data instanceof Enum;
}

public function getSupportedTypes($format)
{
return [
Enum::class => true,
];
}
}