Merge pull request #2043 from dpfaffenbauer/pimcore10-5-tests

[Pimcore] add tests for ^10.5
coreshop · Jul 21, 2022 · 2a8b6d4 · 2a8b6d4
2 parents 921e0fb + 5b20279
commit 2a8b6d4
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/behat.yml b/.github/workflows/behat.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.4, 10.x-dev ]
+        pimcore: [ ^10.4, ^10.5 ]
         dependencies: [ highest, lowest ]
         exclude:
           - php: 8.1

diff --git a/.github/workflows/behat_ui.yml b/.github/workflows/behat_ui.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.4, 10.x-dev ]
+        pimcore: [ ^10.4, ^10.5 ]
         dependencies: [ highest, lowest ]
         exclude:
           - php: 8.1

diff --git a/.github/workflows/packages_bundles.yml b/.github/workflows/packages_bundles.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.4, 10.x-dev ]
+        pimcore: [ ^10.4, ^10.5 ]
         dependencies: [ highest, lowest ]
         package: "${{ fromJson(needs.list.outputs.packages) }}"
         exclude:

diff --git a/.github/workflows/packages_components.yml b/.github/workflows/packages_components.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.4, 10.x-dev ]
+        pimcore: [ ^10.4, ^10.5 ]
         dependencies: [ highest, lowest ]
         package: "${{ fromJson(needs.list.outputs.packages) }}"
         exclude:

diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         php: [ 8.0, 8.1 ]
-        pimcore: [ ^10.4, 10.x-dev ]
+        pimcore: [ ^10.4, ^10.5 ]
         dependencies: [ highest, lowest ]
         exclude:
           - php: 8.1

diff --git a/src/CoreShop/Behat/Service/Tracking/ConfigResolver.php b/src/CoreShop/Behat/Service/Tracking/ConfigResolver.php
@@ -21,6 +21,9 @@ class ConfigResolver implements ConfigResolverInterface
 {
     public function getGoogleConfig(): ConfigObject
     {
+        /**
+         * @psalm-suppress DeprecatedClass
+         */
         return new ConfigObject([]);
     }
 }
diff --git a/src/CoreShop/Bundle/TrackingBundle/Resolver/ConfigResolver.php b/src/CoreShop/Bundle/TrackingBundle/Resolver/ConfigResolver.php
@@ -20,12 +20,18 @@
 
 class ConfigResolver implements ConfigResolverInterface
 {
+    /**
+     * @psalm-suppress DeprecatedClass
+     */
     private ?ConfigObject $googleConfig;
 
     public function __construct(private SiteIdProvider $siteIdProvider, private GoogleConfigProvider $goggleConfigProvider)
     {
     }
 
+    /**
+     * @psalm-suppress DeprecatedClass
+     */
     public function getGoogleConfig(): ?ConfigObject
     {
         if (isset($this->googleConfig)) {

diff --git a/src/CoreShop/Bundle/TrackingBundle/Resolver/ConfigResolverInterface.php b/src/CoreShop/Bundle/TrackingBundle/Resolver/ConfigResolverInterface.php
@@ -18,5 +18,8 @@
 
 interface ConfigResolverInterface
 {
+    /**
+     * @psalm-suppress DeprecatedClass
+     */
     public function getGoogleConfig(): ?ConfigObject;
 }