Skip to content

Bump psr/log and psr/http-client#526

Merged
ChristophWurst merged 1 commit into
masterfrom
enh/psr-updates
Dec 30, 2020
Merged

Bump psr/log and psr/http-client#526
ChristophWurst merged 1 commit into
masterfrom
enh/psr-updates

Conversation

@rullzer

@rullzer rullzer commented Nov 20, 2020

Copy link
Copy Markdown
Member

Signed-off-by: Roeland Jago Douma roeland@famdouma.nl

*
* @return void
*
* @throws \Psr\Log\InvalidArgumentException

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👀

'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib/Doctrine/Common/Cache'),
'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib/Doctrine/Common/Annotations'),
'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib/Doctrine/Common', $vendorDir . '/doctrine/event-manager/lib/Doctrine/Common', $vendorDir . '/doctrine/persistence/lib/Doctrine/Common', $vendorDir . '/doctrine/reflection/lib/Doctrine/Common'),
'Doctrine\\Common\\' => array($vendorDir . '/doctrine/event-manager/lib/Doctrine/Common'),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the React, GuzzleHttp and Doctrine changes are unexpected

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's also weird when I reset the file and do the vendoring locally …

@MorrisJobke

Copy link
Copy Markdown
Member

CI says "no"

@ChristophWurst

Copy link
Copy Markdown
Member

ai, I think because of composer v2. it does some platform checks

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

@ChristophWurst ChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rebased

@ChristophWurst

Copy link
Copy Markdown
Member

CI failure is expected, it's the usual hashes that don't match

@ChristophWurst ChristophWurst merged commit 225c515 into master Dec 30, 2020
@delete-merged-branch delete-merged-branch Bot deleted the enh/psr-updates branch December 30, 2020 18:42
@rullzer rullzer mentioned this pull request Jan 4, 2021
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants