Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump phpseclib/phpseclib from 2.0.27 to 2.0.31 #253

Merged
merged 4 commits into from
Apr 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
tools: composer, prestissimo
tools: composer:v1, prestissimo
extensions: ast
coverage: none

Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
tools: composer, prestissimo
tools: composer:v1, prestissimo
extensions: ast
coverage: none

Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
tools: composer, prestissimo
tools: composer:v1, prestissimo
extensions: ast
coverage: none

Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
tools: composer, prestissimo
tools: composer:v1, prestissimo
extensions: ast
coverage: none

Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
tools: composer, prestissimo, pecl
tools: composer:v1, prestissimo, pecl
coverage: none

- name: Install AST extension
run: sudo pecl install -f ast

#https://github.com/actions/cache/blob/master/examples.md#php---composer
- name: Cache composer packages
id: composer-cache
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/phan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
tools: composer, prestissimo, pecl
tools: composer:v1, prestissimo, pecl
coverage: none

- name: Install AST extension
run: sudo pecl install -f ast

#https://github.com/actions/cache/blob/master/examples.md#php---composer
- name: Cache composer packages
id: composer-cache
Expand Down
6 changes: 3 additions & 3 deletions Components/Model/Order/Buyer.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ public function loadData(Customer $customer)
$this->setPhone($address->getPhone());
$this->setCountry($address->getCountry()->getIso());
}
} else {
} elseif (method_exists('\Shopware\Models\Customer\Customer', 'getBilling')) {
/** @phan-suppress-next-line UndeclaredTypeInInlineVar */
/** @var Billing $address */
/** @phan-suppress-next-line PhanUndeclaredMethod */
$address = $customer->getBilling();
/** @noinspection PhpUndefinedMethodInspection */
$address = $customer->getBilling(); /** @phan-suppress-current-line PhanUndeclaredMethod */
if ($address instanceof Billing) {
$this->setFirstName($address->getFirstName());
$this->setLastName($address->getLastName());
Expand Down
66 changes: 51 additions & 15 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.