diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ed1ed4f..9d8ac633 100644 --- 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 index 1f68c2f0..914532c0 100644 --- 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 index 9125ff74..56386bcb 100644 --- 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'); }