ci: behat context + cs (#5651)

api-platform · Jul 5, 2023 · 0fe4f4d · 0fe4f4d
1 parent b8cbdb1
commit 0fe4f4d
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -54,7 +54,7 @@
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "ramsey/uuid": "^3.7 || ^4.0",
         "ramsey/uuid-doctrine": "^1.4",
-        "soyuka/contexts": "^3.3.6",
+        "soyuka/contexts": "v3.3.9",
         "soyuka/stubs-mongodb": "^1.0",
         "symfony/asset": "^6.1",
         "symfony/browser-kit": "^6.1",

diff --git a/features/main/put_collection.feature b/features/main/put_collection.feature
@@ -6,6 +6,7 @@ Feature: Update an embed collection with PUT
     Given I add "Content-Type" header equal to "application/ld+json"
 
   @createSchema
+  @!mongodb
   Scenario: Update embed collection
     And I send a "POST" request to "/issue5584_employees" with body:
     """

diff --git a/src/Elasticsearch/Serializer/DocumentNormalizer.php b/src/Elasticsearch/Serializer/DocumentNormalizer.php
@@ -30,7 +30,7 @@
  *
  * @author Baptiste Meyer <baptiste.meyer@gmail.com>
  */
-final class DocumentNormalizer extends ObjectNormalizer
+final class DocumentNormalizer extends ObjectNormalizer // @phpstan-ignore-line
 {
     public const FORMAT = 'elasticsearch';
 

diff --git a/src/Metadata/Delete.php b/src/Metadata/Delete.php
@@ -43,7 +43,7 @@ public function __construct(
         array $paginationViaCursor = null,
         array $hydraContext = null,
         array $openapiContext = null,
-        bool|OpenApiOperation|null $openapi = null,
+        bool|OpenApiOperation $openapi = null,
         array $exceptionToStatus = null,
         bool $queryParameterValidationEnabled = null,
 

diff --git a/src/Metadata/Get.php b/src/Metadata/Get.php
@@ -43,7 +43,7 @@ public function __construct(
         array $paginationViaCursor = null,
         array $hydraContext = null,
         array $openapiContext = null,
-        bool|OpenApiOperation|null $openapi = null,
+        bool|OpenApiOperation $openapi = null,
         array $exceptionToStatus = null,
         bool $queryParameterValidationEnabled = null,
 

diff --git a/src/Metadata/GetCollection.php b/src/Metadata/GetCollection.php
@@ -43,7 +43,7 @@ public function __construct(
         array $paginationViaCursor = null,
         array $hydraContext = null,
         array $openapiContext = null,
-        bool|OpenApiOperation|null $openapi = null,
+        bool|OpenApiOperation $openapi = null,
         array $exceptionToStatus = null,
         bool $queryParameterValidationEnabled = null,
 

diff --git a/src/Metadata/Patch.php b/src/Metadata/Patch.php
@@ -43,7 +43,7 @@ public function __construct(
         array $paginationViaCursor = null,
         array $hydraContext = null,
         array $openapiContext = null,
-        bool|OpenApiOperation|null $openapi = null,
+        bool|OpenApiOperation $openapi = null,
         array $exceptionToStatus = null,
         bool $queryParameterValidationEnabled = null,
 

diff --git a/src/Metadata/Post.php b/src/Metadata/Post.php
@@ -43,7 +43,7 @@ public function __construct(
         array $paginationViaCursor = null,
         array $hydraContext = null,
         array $openapiContext = null,
-        bool|OpenApiOperation|null $openapi = null,
+        bool|OpenApiOperation $openapi = null,
         array $exceptionToStatus = null,
         bool $queryParameterValidationEnabled = null,
 

diff --git a/src/Metadata/Put.php b/src/Metadata/Put.php
@@ -43,7 +43,7 @@ public function __construct(
         array $paginationViaCursor = null,
         array $hydraContext = null,
         array $openapiContext = null,
-        bool|OpenApiOperation|null $openapi = null,
+        bool|OpenApiOperation $openapi = null,
         array $exceptionToStatus = null,
         bool $queryParameterValidationEnabled = null,
 

diff --git a/src/Metadata/Resource/Factory/DeprecationResourceMetadataCollectionFactory.php b/src/Metadata/Resource/Factory/DeprecationResourceMetadataCollectionFactory.php
@@ -18,9 +18,10 @@
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
 
 /**
- * Triggers resource deprecations
- * 
+ * Triggers resource deprecations.
+ *
  * @final
+ *
  * @internal
  */
 class DeprecationResourceMetadataCollectionFactory implements ResourceMetadataCollectionFactoryInterface

diff --git a/src/Metadata/Tests/Property/PropertyInfoPropertyNameCollectionFactoryTest.php b/src/Metadata/Tests/Property/PropertyInfoPropertyNameCollectionFactoryTest.php
@@ -88,7 +88,7 @@ public function testCreateMethodReturnsProperPropertyNameCollectionForObjectWith
             ])
         );
 
-        self::assertObjectHasAttribute('ignored', new DummyIgnoreProperty());
+        $this->assertTrue((new \ReflectionObject(new DummyIgnoreProperty()))->hasProperty('ignored'));
 
         $collection = $factory->create(DummyIgnoreProperty::class, ['serializer_groups' => ['dummy']]);
 

diff --git a/...es/Symfony/Maker/CustomStateProcessor.php → ...ymfony/Maker/CustomStateProcessor.fixture b/...es/Symfony/Maker/CustomStateProcessor.php → ...ymfony/Maker/CustomStateProcessor.fixture
@@ -1,16 +1,3 @@
-<?php
-
-/*
- * This file is part of the API Platform project.
- *
- * (c) Kévin Dunglas <dunglas@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
 namespace App\State;
 
 use ApiPlatform\Metadata\Operation;

diff --git a/...res/Symfony/Maker/CustomStateProvider.php → ...Symfony/Maker/CustomStateProvider.fixture b/...res/Symfony/Maker/CustomStateProvider.php → ...Symfony/Maker/CustomStateProvider.fixture
@@ -1,16 +1,3 @@
-<?php
-
-/*
- * This file is part of the API Platform project.
- *
- * (c) Kévin Dunglas <dunglas@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
 namespace App\State;
 
 use ApiPlatform\Metadata\Operation;

diff --git a/tests/Fixtures/app/config/config_common.yml b/tests/Fixtures/app/config/config_common.yml
@@ -86,7 +86,7 @@ api_platform:
 
 parameters:
     container.autowiring.strict_mode: true
-    container.dumper.inline_class_loader: true
+    .container.dumper.inline_class_loader: true
 
 services:
     test.client:

diff --git a/tests/Symfony/Maker/MakeStateProcessorTest.php b/tests/Symfony/Maker/MakeStateProcessorTest.php
@@ -38,9 +38,9 @@ public function testMakeStateProcessor(bool $isInteractive): void
         $this->assertFileExists($newProcessorFile);
 
         // Unify line endings
-        $expected = preg_replace('~\R~u', "\r\n", file_get_contents(__DIR__.'/../../Fixtures/Symfony/Maker/CustomStateProcessor.php'));
+        $expected = preg_replace('~\R~u', "\r\n", file_get_contents(__DIR__.'/../../Fixtures/Symfony/Maker/CustomStateProcessor.fixture'));
         $result = preg_replace('~\R~u', "\r\n", file_get_contents($newProcessorFile));
-        $this->assertSame($expected, $result);
+        $this->assertStringContainsString($expected, $result);
 
         $display = $tester->getDisplay();
         $this->assertStringContainsString('Success!', $display);

diff --git a/tests/Symfony/Maker/MakeStateProviderTest.php b/tests/Symfony/Maker/MakeStateProviderTest.php
@@ -38,9 +38,9 @@ public function testMakeStateProvider(bool $isInteractive): void
         $this->assertFileExists($newProviderFile);
 
         // Unify line endings
-        $expected = preg_replace('~\R~u', "\r\n", file_get_contents(__DIR__.'/../../Fixtures/Symfony/Maker/CustomStateProvider.php'));
+        $expected = preg_replace('~\R~u', "\r\n", file_get_contents(__DIR__.'/../../Fixtures/Symfony/Maker/CustomStateProvider.fixture'));
         $result = preg_replace('~\R~u', "\r\n", file_get_contents($newProviderFile));
-        $this->assertSame($expected, $result);
+        $this->assertStringContainsString($expected, $result);
 
         $display = $tester->getDisplay();
         $this->assertStringContainsString('Success!', $display);