fix: compatibility with PHP 8.2 (#5292)

api-platform · Dec 30, 2022 · af98b64 · af98b64
1 parent bdc1962
commit af98b64
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,6 +60,7 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
       fail-fast: false
     env:
       APP_DEBUG: '1' # https://github.com/phpstan/phpstan-symfony/issues/37
@@ -116,9 +117,12 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
         include:
           - php: '8.1'
             coverage: true
+          - php: '8.2'
+            coverage: true
       fail-fast: false
     steps:
       - name: Checkout
@@ -190,9 +194,12 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
         include:
           - php: '8.1'
             coverage: true
+          - php: '8.2'
+            coverage: true
       fail-fast: false
     steps:
       - name: Checkout
@@ -292,6 +299,7 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
       fail-fast: false
     env:
       APP_ENV: postgres
@@ -341,6 +349,7 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
       fail-fast: false
     services:
       mysql:
@@ -390,6 +399,7 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
       fail-fast: false
     env:
       APP_ENV: mongodb
@@ -480,6 +490,7 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
       fail-fast: false
     env:
       APP_ENV: elasticsearch
@@ -530,6 +541,7 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
       fail-fast: false
     env:
       SYMFONY_DEPRECATIONS_HELPER: max[total]=0
@@ -570,6 +582,7 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
       fail-fast: false
     # env:
       # See https://github.com/doctrine/DoctrineMongoDBBundle/pull/673
@@ -580,7 +593,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: ${{ matrix.php }}
           tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring
           coverage: none
@@ -615,14 +628,15 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
       fail-fast: false
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: ${{ matrix.php }}
           tools: pecl, composer
           extensions: intl, bcmath, curl, openssl, mbstring
           coverage: none
@@ -659,6 +673,7 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
       fail-fast: false
     env:
       APP_ENV: sqlite
@@ -701,6 +716,7 @@ jobs:
       matrix:
         php:
           - '8.1'
+          - '8.2'
       fail-fast: false
     env:
       APP_ENV: sqlite

diff --git a/src/Elasticsearch/Paginator.php b/src/Elasticsearch/Paginator.php
@@ -95,7 +95,7 @@ public function getIterator(): \Traversable
         $denormalizationContext = array_merge([AbstractNormalizer::ALLOW_EXTRA_ATTRIBUTES => true], $this->denormalizationContext);
 
         foreach ($this->documents['hits']['hits'] ?? [] as $document) {
-            $cacheKey = isset($document['_index'], $document['_type'], $document['_id']) ? md5("${document['_index']}_${document['_type']}_${document['_id']}") : null;
+            $cacheKey = isset($document['_index'], $document['_type'], $document['_id']) ? md5("{$document['_index']}_{$document['_type']}_{$document['_id']}") : null;
 
             if ($cacheKey && \array_key_exists($cacheKey, $this->cachedDenormalizedDocuments)) {
                 $object = $this->cachedDenormalizedDocuments[$cacheKey];

diff --git a/src/Metadata/Resource/Factory/UriTemplateResourceMetadataCollectionFactory.php b/src/Metadata/Resource/Factory/UriTemplateResourceMetadataCollectionFactory.php
@@ -139,7 +139,7 @@ private function configureUriVariables(ApiResource|HttpOperation $operation): Ap
             return $this->normalizeUriVariables($operation);
         }
 
-        $hasUserConfiguredUriVariables = !($operation->getExtraProperties['is_legacy_resource_metadata'] ?? false);
+        $hasUserConfiguredUriVariables = !($operation->getExtraProperties()['is_legacy_resource_metadata'] ?? false);
         if (!$operation->getUriVariables()) {
             $hasUserConfiguredUriVariables = false;
             $operation = $operation->withUriVariables($this->transformLinksToUriVariables($this->linkFactory->createLinksFromIdentifiers($operation)));

diff --git a/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLengthRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaLengthRestriction.php
@@ -27,6 +27,8 @@ class PropertySchemaLengthRestriction implements PropertySchemaRestrictionMetada
 {
     /**
      * {@inheritdoc}
+     *
+     * @param Length $constraint
      */
     public function create(Constraint $constraint, ApiProperty $propertyMetadata): array
     {

diff --git a/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRangeRestriction.php b/src/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaRangeRestriction.php
@@ -25,6 +25,8 @@ final class PropertySchemaRangeRestriction implements PropertySchemaRestrictionM
 {
     /**
      * {@inheritdoc}
+     *
+     * @param Range $constraint
      */
     public function create(Constraint $constraint, ApiProperty $propertyMetadata): array
     {