fix test conflict (#198)

dachcom-digital · Feb 13, 2024 · 23f20f6 · 23f20f6
1 parent 8156c64
commit 23f20f6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 0 deletions.
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -123,6 +123,7 @@ jobs:
                     TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
                     TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
                 run: |
+                    sed -i 's,\"require-dev"\: {,\"conflict"\: {\"league/csv"\: \">=9.11.0"\}\, \"require-dev"\: {,g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
@@ -103,6 +103,7 @@ jobs:
                     TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
                     TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
                 run: |
+                    sed -i 's,\"require-dev"\: {,\"conflict"\: {\"league/csv"\: \">=9.11.0"\}\, \"require-dev"\: {,g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
@@ -103,6 +103,7 @@ jobs:
                     TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
                     TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
                 run: |
+                    sed -i 's,\"require-dev"\: {,\"conflict"\: {\"league/csv"\: \">=9.11.0"\}\, \"require-dev"\: {,g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

diff --git a/src/MembersBundle/DependencyInjection/MembersExtension.php b/src/MembersBundle/DependencyInjection/MembersExtension.php
@@ -24,6 +24,7 @@ public function prepend(ContainerBuilder $container): void
         $configs = $container->getExtensionConfig($this->getAlias());
         $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);
 
+        /** @phpstan-ignore-next-line */
         if (!$container->hasParameter('members.firewall_name')) {
             $container->setParameter('members.firewall_name', 'members_fe');
         }

diff --git a/src/MembersBundle/Security/OAuth/AccountConnectorInterface.php b/src/MembersBundle/Security/OAuth/AccountConnectorInterface.php
@@ -8,4 +8,6 @@
 interface AccountConnectorInterface
 {
     public function connectToSsoIdentity(UserInterface $user, OAuthResponseInterface $oAuthResponse): SsoIdentityInterface;
+
+    public function refreshSsoIdentityUser(UserInterface $user, OAuthResponseInterface $oAuthResponse): void;
 }