Merge branch 'ntr/5.7/fix-php-8-ci-failures' into '5.7'

NTR - Fix PHP 8 CI failures See merge request shopware/5/product/shopware!460
shopware5 · Nov 10, 2020 · 70a03f1 · 70a03f1
2 parents 18779de + a9a9f48
commit 70a03f1
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -111,7 +111,6 @@ PHP 7.4:
 PHP 8.0:
     extends: .phpunit_base
     image: gitlab.shopware.com:5005/shopware/5/product/image/continuous:8.0
-    allow_failure: true
     stage: Unit
     services:
         -   name: mysql:5.7

diff --git a/engine/Shopware/Core/sAdmin.php b/engine/Shopware/Core/sAdmin.php
@@ -267,7 +267,7 @@ public function sGetPaymentMeanById($id, $user = false)
         $sEsd = $this->moduleManager->Basket()->sCheckForESD();
         $isMobile = $this->front->Request()->getDeviceType() === 'mobile';
 
-        if (!count($user)) {
+        if (!is_array($user)) {
             $user = [];
         }
 

diff --git a/tests/Functional/Api/ArticleTest.php b/tests/Functional/Api/ArticleTest.php
@@ -435,7 +435,7 @@ public function testPutArticlesShouldBeSuccessful(string $id): void
         static::assertCount(2, $article['related']);
 
         // Similar should be removed
-        static::assertEquals(0, count($article['similar']));
+        static::assertCount(0, $article['similar'] ?? []);
     }
 
     /**

diff --git a/tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php b/tests/Functional/Bundle/AttributeBundle/SchemaOperatorTest.php
@@ -27,12 +27,9 @@
 use Exception;
 use PHPUnit\Framework\TestCase;
 use Shopware\Bundle\AttributeBundle\Service\ConfigurationStruct;
-use Shopware\Tests\Functional\Traits\DatabaseTransactionBehaviour;
 
 class SchemaOperatorTest extends TestCase
 {
-    use DatabaseTransactionBehaviour;
-
     public function testDefaultValues(): void
     {
         $types = [

diff --git a/...undle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php b/...undle/CustomerSearchBundleDBAL/ConditionHandler/CustomerAttributeConditionHandlerTest.php
@@ -34,9 +34,9 @@ class CustomerAttributeConditionHandlerTest extends TestCase
 {
     protected function setUp(): void
     {
-        parent::setUp();
         $service = Shopware()->Container()->get(\Shopware\Bundle\AttributeBundle\Service\CrudServiceInterface::class);
         $service->update('s_user_attributes', 'test', 'integer');
+        parent::setUp();
     }
 
     protected function tearDown(): void