Skip to content
Open
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
55 changes: 31 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
steps:
- name: Checkout
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
strategy:
matrix:
php:
- '8.3'
- '8.5'
fail-fast: false
steps:
- name: Checkout
Expand All @@ -80,7 +80,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
steps:
- name: Checkout
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
env:
APP_DEBUG: '1' # https://github.com/phpstan/phpstan-symfony/issues/37
Expand Down Expand Up @@ -186,10 +186,12 @@ jobs:
- '8.2'
- '8.3'
- '8.4'
- '8.5'
include:
- php: '8.2'
- php: '8.3'
- php: '8.4'
- php: '8.5'
coverage: true
fail-fast: false
steps:
Expand Down Expand Up @@ -257,10 +259,11 @@ jobs:
- version: '8.2'
- version: '8.3'
- version: '8.4'
- version: '8.5'
coverage: true
- version: '8.4'
- version: '8.5'
lowest: true
- version: '8.4'
- version: '8.5'
minimal-changes: true
component:
- api-platform/doctrine-common
Expand Down Expand Up @@ -341,7 +344,7 @@ jobs:
strategy:
matrix:
php:
- version: '8.4'
- version: '8.5'
component:
- api-platform/doctrine-common
- api-platform/doctrine-orm
Expand Down Expand Up @@ -394,10 +397,12 @@ jobs:
- '8.2'
- '8.3'
- '8.4'
- '8.5'
include:
- php: '8.2'
- php: '8.3'
- php: '8.4'
- php: '8.5'
coverage: true
fail-fast: false
steps:
Expand Down Expand Up @@ -472,7 +477,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
env:
APP_ENV: postgres
Expand Down Expand Up @@ -522,7 +527,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
services:
mysql:
Expand Down Expand Up @@ -572,7 +577,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
env:
APP_ENV: mongodb
Expand Down Expand Up @@ -660,7 +665,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
env:
APP_ENV: mercure
Expand Down Expand Up @@ -750,7 +755,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
env:
APP_ENV: elasticsearch
Expand Down Expand Up @@ -802,7 +807,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
env:
APP_ENV: elasticsearch
Expand Down Expand Up @@ -908,7 +913,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
steps:
- name: Checkout
Expand Down Expand Up @@ -947,7 +952,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
steps:
- name: Checkout
Expand Down Expand Up @@ -990,7 +995,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
steps:
- name: Checkout
Expand Down Expand Up @@ -1035,7 +1040,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
env:
APP_ENV: sqlite
Expand Down Expand Up @@ -1132,7 +1137,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
steps:
- name: Checkout
Expand Down Expand Up @@ -1178,9 +1183,9 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
include:
- php: '8.4'
- php: '8.5'
coverage: true
fail-fast: false
steps:
Expand Down Expand Up @@ -1256,7 +1261,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
steps:
- name: Checkout
Expand Down Expand Up @@ -1304,7 +1309,7 @@ jobs:
strategy:
matrix:
php:
- '8.4'
- '8.5'
fail-fast: false
steps:
- name: Checkout
Expand Down Expand Up @@ -1355,10 +1360,12 @@ jobs:
- '8.2'
- '8.3'
- '8.4'
- '8.5'
include:
- php: '8.2'
- php: '8.3'
- php: '8.4'
- php: '8.5'
coverage: true
fail-fast: false
steps:
Expand All @@ -1384,7 +1391,7 @@ jobs:
working-directory: 'src/Laravel'

laravel-e2e:
name: Laravel E2E installation (PHP 8.4)
name: Laravel E2E installation (PHP 8.5)
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
Expand All @@ -1393,7 +1400,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.4
php-version: 8.5
tools: pecl, composer
extensions: intl, bcmath, curl, openssl, mbstring, pdo_sqlite, mongodb
ini-values: memory_limit=-1
Expand Down
2 changes: 1 addition & 1 deletion src/Doctrine/Odm/Filter/ExistsFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public function __construct(?ManagerRegistry $managerRegistry = null, ?LoggerInt
public function apply(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
{
$parameter = $context['parameter'] ?? null;
if (null !== ($value = $context['filters'][$parameter?->getProperty()] ?? null)) {
if (null !== ($value = $context['filters'][$parameter?->getProperty() ?? ''] ?? null)) {
$this->filterProperty($this->denormalizePropertyName($parameter->getProperty()), $value, $aggregationBuilder, $resourceClass, $operation, $context);

return;
Expand Down
2 changes: 1 addition & 1 deletion src/Doctrine/Odm/Filter/OrderFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, ?Opera
}

$parameter = $context['parameter'] ?? null;
if (null !== ($value = $context['filters'][$parameter?->getProperty()] ?? null)) {
if (null !== ($value = $context['filters'][$parameter?->getProperty() ?? ''] ?? null)) {
$this->filterProperty($this->denormalizePropertyName($parameter->getProperty()), $value, $aggregationBuilder, $resourceClass, $operation, $context);

return;
Expand Down
2 changes: 1 addition & 1 deletion src/Doctrine/Orm/Filter/ExistsFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $q
{
$parameter = $context['parameter'] ?? null;

if (null !== ($value = $context['filters'][$parameter?->getProperty()] ?? null)) {
if (null !== ($value = $context['filters'][$parameter?->getProperty() ?? ''] ?? null)) {
$this->filterProperty($this->denormalizePropertyName($parameter->getProperty()), $value, $queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);

return;
Expand Down
2 changes: 1 addition & 1 deletion src/Doctrine/Orm/Filter/OrderFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $q
}

$parameter = $context['parameter'] ?? null;
if (null !== ($value = $context['filters'][$parameter?->getProperty()] ?? null)) {
if (null !== ($value = $context['filters'][$parameter?->getProperty() ?? ''] ?? null)) {
$this->filterProperty($this->denormalizePropertyName($parameter->getProperty()), $value, $queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);

return;
Expand Down
2 changes: 0 additions & 2 deletions src/Doctrine/Orm/Tests/Extension/PaginationExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,6 @@ public function testGetResultWithFetchJoinCollection(bool $paginationFetchJoinCo
$this->assertInstanceOf(PaginatorInterface::class, $result);

$doctrinePaginatorReflectionProperty = new \ReflectionProperty(AbstractPaginator::class, 'paginator');
$doctrinePaginatorReflectionProperty->setAccessible(true);

$doctrinePaginator = $doctrinePaginatorReflectionProperty->getValue($result);
$this->assertSame($expected, $doctrinePaginator->getFetchJoinCollection());
Expand Down Expand Up @@ -435,7 +434,6 @@ public function testGetResultWithUseOutputWalkers(bool $paginationUseOutputWalke
$this->assertInstanceOf(PaginatorInterface::class, $result);

$doctrinePaginatorReflectionProperty = new \ReflectionProperty(AbstractPaginator::class, 'paginator');
$doctrinePaginatorReflectionProperty->setAccessible(true);

$doctrinePaginator = $doctrinePaginatorReflectionProperty->getValue($result);
$this->assertSame($expected, $doctrinePaginator->getUseOutputWalkers());
Expand Down
1 change: 0 additions & 1 deletion src/Hal/Tests/Serializer/ItemNormalizerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ public function testMaxDepth(): void
{
$setId = function (MaxDepthDummy $dummy, int $id): void {
$prop = new \ReflectionProperty($dummy, 'id');
$prop->setAccessible(true);
$prop->setValue($dummy, $id);
};

Expand Down
1 change: 0 additions & 1 deletion src/Metadata/Extractor/PhpFileResourceExtractor.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ protected function extractPath(string $path): void
$resourceReflection = new \ReflectionClass($resource);

foreach ($resourceReflection->getProperties() as $property) {
$property->setAccessible(true);
$resolvedValue = $this->resolve($property->getValue($resource));
$property->setValue($resource, $resolvedValue);
}
Expand Down
Loading
Loading