Merge branch 'pt-11763/5.6/remove-php7-syntax' into 'master'

PT-11763 - Remove PHP7 syntax See merge request shopware/5/services/swagpaymentpaypalunified!39
shopware5 · Aug 4, 2020 · 0f28e42 · 0f28e42
2 parents 23d5bde + f9390c9
commit 0f28e42
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -78,8 +78,6 @@ SW 5.2:
     variables:
         CHECKOUT_SHOPWARE_BRANCH: "5.2"
         CHECKOUT_COOKIE_CONSENT_MANAGER_BRANCH: "5.2.11-5.2.27"
-    only:
-        - master
     script:
         - zip -rq plugin.zip .
         - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.shopware.com/shopware/5/product/shopware.git shopware --depth=1 -b ${CHECKOUT_SHOPWARE_BRANCH}

diff --git a/Subscriber/ExpressCheckout.php b/Subscriber/ExpressCheckout.php
@@ -394,7 +394,7 @@ private function handlePaymentPatchException(Exception $exception)
         return $redirectData;
     }
 
-    private function isUserLoggedIn(): bool
+    private function isUserLoggedIn()
     {
         return (bool) $this->session->get('sUserId');
     }

diff --git a/Tests/Functional/Setup/FirstRunWizardInstallerTest.php b/Tests/Functional/Setup/FirstRunWizardInstallerTest.php
@@ -38,7 +38,10 @@ public function test_installation_landingPageType_should_be_set()
         static::assertSame('Login', $result['landing_page_type']);
     }
 
-    private function getDefaultConfig(): array
+    /**
+     * @return array
+     */
+    private function getDefaultConfig()
     {
         return [
             'clientId' => 'testClientId',
@@ -48,12 +51,18 @@ private function getDefaultConfig(): array
         ];
     }
 
-    private function getFirstRunWizardInstaller(): FirstRunWizardInstaller
+    /**
+     * @return FirstRunWizardInstaller
+     */
+    private function getFirstRunWizardInstaller()
     {
         return new FirstRunWizardInstaller();
     }
 
-    private function getConnection(): ?Connection
+    /**
+     * @return Connection
+     */
+    private function getConnection()
     {
         return Shopware()->Container()->get('dbal_connection');
     }