Skip to content

Commit 0f28e42

Browse files
committed
Merge branch 'pt-11763/5.6/remove-php7-syntax' into 'master'
PT-11763 - Remove PHP7 syntax See merge request shopware/5/services/swagpaymentpaypalunified!39
2 parents 23d5bde + f9390c9 commit 0f28e42

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ SW 5.2:
7878
variables:
7979
CHECKOUT_SHOPWARE_BRANCH: "5.2"
8080
CHECKOUT_COOKIE_CONSENT_MANAGER_BRANCH: "5.2.11-5.2.27"
81-
only:
82-
- master
8381
script:
8482
- zip -rq plugin.zip .
8583
- git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.shopware.com/shopware/5/product/shopware.git shopware --depth=1 -b ${CHECKOUT_SHOPWARE_BRANCH}

Subscriber/ExpressCheckout.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ private function handlePaymentPatchException(Exception $exception)
394394
return $redirectData;
395395
}
396396

397-
private function isUserLoggedIn(): bool
397+
private function isUserLoggedIn()
398398
{
399399
return (bool) $this->session->get('sUserId');
400400
}

Tests/Functional/Setup/FirstRunWizardInstallerTest.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ public function test_installation_landingPageType_should_be_set()
3838
static::assertSame('Login', $result['landing_page_type']);
3939
}
4040

41-
private function getDefaultConfig(): array
41+
/**
42+
* @return array
43+
*/
44+
private function getDefaultConfig()
4245
{
4346
return [
4447
'clientId' => 'testClientId',
@@ -48,12 +51,18 @@ private function getDefaultConfig(): array
4851
];
4952
}
5053

51-
private function getFirstRunWizardInstaller(): FirstRunWizardInstaller
54+
/**
55+
* @return FirstRunWizardInstaller
56+
*/
57+
private function getFirstRunWizardInstaller()
5258
{
5359
return new FirstRunWizardInstaller();
5460
}
5561

56-
private function getConnection(): ?Connection
62+
/**
63+
* @return Connection
64+
*/
65+
private function getConnection()
5766
{
5867
return Shopware()->Container()->get('dbal_connection');
5968
}

0 commit comments

Comments
 (0)