Skip to content

[WIP] Update guzzle to 6.3#32532

Closed
phil-davis wants to merge 6 commits into
masterfrom
update-guzzle-5
Closed

[WIP] Update guzzle to 6.3#32532
phil-davis wants to merge 6 commits into
masterfrom
update-guzzle-5

Conversation

@phil-davis

Copy link
Copy Markdown
Contributor

Rebased with latest master acceptance test code.

@codecov

codecov Bot commented Aug 31, 2018

Copy link
Copy Markdown

Codecov Report

Merging #32532 into master will decrease coverage by 16.2%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff              @@
##             master   #32532       +/-   ##
=============================================
- Coverage      64.1%   47.89%   -16.21%     
=============================================
  Files          1176      109     -1067     
  Lines         70206    10445    -59761     
  Branches       1270     1270               
=============================================
- Hits          45004     5003    -40001     
+ Misses        24832     5072    -19760     
  Partials        370      370
Flag Coverage Δ Complexity Δ
#javascript 52.89% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 36.93% <ø> (-28.45%) 0 <ø> (-18646)
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Storage/DAV.php 59.45% <ø> (-21.64%) 0 <0> (ø)
apps/updatenotification/templates/admin.php
lib/private/Encryption/Keys/Storage.php
lib/private/App/CodeChecker/NodeVisitor.php
lib/private/RedisFactory.php
apps/dav/lib/Avatars/AvatarNode.php
...s/dav/appinfo/Migrations/Version20170202213905.php
apps/dav/lib/Upload/ChunkLocationProvider.php
apps/files/lib/AppInfo/Application.php
... and 1058 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 35751f9...5bd4645. Read the comment docs.

public function post($uri, array $options = []) {
$this->setDefaultOptions();
if (isset($options['body']) && is_array($options['body'])) {
if (isset($options['body']) && \is_array($options['body'])) {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This should happen in an earlier commit.

Comment thread .htaccess
<IfModule pagespeed_module>
ModPagespeed Off
</IfModule>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Need to get rid of this accidental change.

*
* @return SimpleXMLElement
*/
public function getResponseXml($response = null) {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ToDo: there are a few copies of these getResponseXml() functions in this PR. Sort out 1 place to put it.

}

if ($headers !== null) {
if ($headers === null) {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ToDo: I don't think making this an empty array is needed. Should be able to pass null straight through OK.

private function createGuzzleClientException($statusCode) {
$request = $this->createMock(\GuzzleHttp\Message\RequestInterface::class);
$response = $this->createMock(\GuzzleHttp\Message\ResponseInterface::class);
$request = $this->createMock(RequestInterface::class);

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

These changes should go in an earlier commit - they are not acceptance test stuff.

@phil-davis

Copy link
Copy Markdown
Contributor Author

Next Guzzle V6 PR is #32537
That addresses the comments above, fixes up more new code added in LoggingHelper just today, and updates composer.lock for the Symfony 3.4.15 version bump that was just merged to master.

@phil-davis phil-davis closed this Aug 31, 2018
@phil-davis phil-davis deleted the update-guzzle-5 branch August 31, 2018 13:52
@lock lock Bot locked as resolved and limited conversation to collaborators Aug 31, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant