Merge pull request #3913 from dunglas/fix/merge-2.5 · Codevate/core@75deb1a · GitHub
Skip to content

Commit 75deb1a

Browse files
authored
Merge pull request api-platform#3913 from dunglas/fix/merge-2.5
Fix/merge 2.5
2 parents 76ca535 + 9d2244b commit 75deb1a

34 files changed

Lines changed: 88 additions & 105 deletions

‎.github/workflows/ci.yml‎

Lines changed: 14 additions & 10 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/build/
66
/composer.lock
77
/composer.phar
8+
/phpstan.neon
89
/phpunit.xml
910
/swagger.json
1011
/swagger.yaml

‎.php_cs.dist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ $finder = PhpCsFixer\Finder::create()
1717
'tests/Fixtures/app/var',
1818
])
1919
->notPath('src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php')
20+
->notPath('tests/Fixtures/TestBundle/Entity/DummyPhp8.php') // temporary
2021
->append([
2122
'tests/Fixtures/app/console',
2223
]);
@@ -98,6 +99,7 @@ return PhpCsFixer\Config::create()
9899
'phpdoc_add_missing_param_annotation' => [
99100
'only_untyped' => true,
100101
],
102+
'phpdoc_no_alias_tag' => false, // Set the rule to true when https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/5357 is fixed
101103
'phpdoc_order' => true,
102104
'phpdoc_trim_consecutive_blank_line_separation' => true,
103105
'phpdoc_var_annotation_correct_order' => true,

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@
5858
* Validator:Query filters and parameters are validated (#1723)
5959
* `ExceptionInterface` now extends `\Throwable` (#3217)
6060

61+
## 2.5.9
62+
63+
* Fix a warning when preloading the `AbstractPaginator` class (#3827)
64+
* OpenAPI: prevent `additionalProp1` from showing in example values (#3888)
65+
* Varnish: fix a bug when passing an empty list of tags to the purger (#3827)
66+
* JSON Schema: mark `hydra:mapping` properties as nullable (#3877)
67+
6168
## 2.5.8
6269

6370
* PHP 8 support (#3791, #3745, #3855)

‎phpstan.neon.dist‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ parameters:
4646
message: '#Strict comparison using !== between .+ and .+ will always evaluate to false\.#'
4747
paths:
4848
- src/Bridge/Doctrine/Common/PropertyHelperTrait.php
49-
-
50-
message: '#Variable \$iri might not be defined\.#'
51-
path: src/JsonApi/Serializer/ItemNormalizer.php
52-
-
53-
message: '#Variable \$positionPm might not be defined\.#'
54-
path: src/Util/ClassInfoTrait.php
5549
- '#Access to an undefined property Prophecy\\Prophecy\\ObjectProphecy<(\\?[a-zA-Z0-9_]+)+>::\$[a-zA-Z0-9_]+#'
5650
-
5751
message: '#Call to an undefined method Doctrine\\Persistence\\ObjectManager::getConnection\(\)#'

‎src/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function postFlush(): void
103103
return;
104104
}
105105

106-
$this->purger->purge($this->tags);
106+
$this->purger->purge(array_values($this->tags));
107107
$this->tags = [];
108108
}
109109

‎src/Bridge/Doctrine/MongoDbOdm/Extension/OrderExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
*/
3232
final class OrderExtension implements AggregationCollectionExtensionInterface
3333
{
34-
use PropertyHelperTrait;
3534
use MongoDbOdmPropertyHelperTrait;
35+
use PropertyHelperTrait;
3636

3737
private $order;
3838
private $resourceMetadataFactory;

‎src/Bridge/Doctrine/MongoDbOdm/Filter/AbstractFilter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
*/
3333
abstract class AbstractFilter implements FilterInterface
3434
{
35-
use PropertyHelperTrait;
3635
use MongoDbOdmPropertyHelperTrait;
36+
use PropertyHelperTrait;
3737

3838
protected $managerRegistry;
3939
protected $logger;

‎src/Bridge/Doctrine/Orm/Extension/PaginationExtension.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
use Symfony\Component\HttpFoundation\Request;
2929
use Symfony\Component\HttpFoundation\RequestStack;
3030

31+
// Help opcache.preload discover always-needed symbols
32+
class_exists(AbstractPaginator::class);
33+
3134
/**
3235
* Applies pagination on the Doctrine query for resource collection when enabled.
3336
*

‎src/Bridge/Doctrine/Orm/Filter/AbstractFilter.php‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)