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 icewind/streams from 0.7.2 to 0.7.5 #730

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Aug 19, 2021

Bumps icewind/streams from 0.7.2 to 0.7.5.

Release notes

Sourced from icewind/streams's releases.

0.7.5

  • Add optional mode parameter to wrapSource

0.7.4

  • Don't throw an error when calling fclose on a wrapped stream that is already closed trough the inner stream

0.7.3

  • Improve type hinting
  • Supports php >= 7.1
Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@@ -8,6 +8,28 @@
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.3.0". You are running ' . PHP_VERSION . '.';
}

$missingExtensions = array();
extension_loaded('ctype') || $missingExtensions[] = 'ctype';
Copy link
Member

Choose a reason for hiding this comment

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

those are strange. do you also get them when you try to re-vendor deps on the base branch?

Copy link
Member

Choose a reason for hiding this comment

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

I do not get them on stable21. Only the following files are touched.

        modified:   composer/ClassLoader.php
        modified:   composer/InstalledVersions.php
        modified:   composer/autoload_files.php
        modified:   composer/autoload_static.php
        modified:   composer/installed.json
        modified:   composer/installed.php
        modified:   composer/package-versions-deprecated/src/PackageVersions/Versions.php

@PVince81 PVince81 self-assigned this Oct 8, 2021
@PVince81
Copy link
Member

PVince81 commented Oct 8, 2021

@ChristophWurst @juliushaertl I've rerun composer update with composer composer 2.1.9

hopefully the diff is now cleaner

@PVince81
Copy link
Member

PVince81 commented Oct 8, 2021

damn, conflicts...

@PVince81
Copy link
Member

PVince81 commented Oct 8, 2021

@dependabot-bot rebase

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Oct 8, 2021

Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry!

If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

@PVince81
Copy link
Member

PVince81 commented Oct 8, 2021

@dependabot recreate

@dependabot dependabot bot force-pushed the dependabot/composer/stable21/icewind/streams-0.7.5 branch from c5bca48 to 4f52e30 Compare October 8, 2021 08:39
@PVince81
Copy link
Member

PVince81 commented Oct 8, 2021

what ? why are there no file changes ??
does it even make sense to use dependabot here ?

I'll do the update again locally and push

@PVince81 PVince81 force-pushed the dependabot/composer/stable21/icewind/streams-0.7.5 branch from e7d0280 to 4303b74 Compare October 8, 2021 08:45
@PVince81
Copy link
Member

PVince81 commented Oct 8, 2021

alright, now it looks good. Please review!

@PVince81 PVince81 force-pushed the dependabot/composer/stable21/icewind/streams-0.7.5 branch from 4303b74 to f1eae7f Compare October 8, 2021 08:57
@PVince81
Copy link
Member

PVince81 commented Oct 8, 2021

why is it so difficult to update the lib ?

this is what I did:

  1. install composer locally with php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" (this is borrowed from build/autoloaderchecker.sh)
  2. php composer-setup.php --2
  3. php -r "unlink('composer-setup.php');"
  4. enter the 3rdparty directory
  5. Edit composer.json to have icewind/streams point at 0.7.5
  6. reset and rebase to be on the state of stable21
  7. php ../build/composer.phar update icewind/streams
  8. php ../build/composer.phar install --no-dev
  9. commit
  10. force push

let's see...

@CarlSchwan CarlSchwan force-pushed the dependabot/composer/stable21/icewind/streams-0.7.5 branch from e3e81ef to 917807d Compare October 8, 2021 09:09
Signed-off-by: Vincent Petry <[email protected]>
@PVince81 PVince81 force-pushed the dependabot/composer/stable21/icewind/streams-0.7.5 branch from 917807d to d12a875 Compare October 8, 2021 09:24
@PVince81
Copy link
Member

PVince81 commented Oct 8, 2021

finally green... I had to do exactly the same thing that CI is doing.

I'll put that in the README in a separate PR

@kesselb
Copy link
Contributor

kesselb commented Oct 8, 2021

Don't forget to update https://github.com/nextcloud/server/tree/stable21/apps/files_external/3rdparty

@PVince81 PVince81 merged commit 70082d0 into stable21 Oct 8, 2021
@delete-merged-branch delete-merged-branch bot deleted the dependabot/composer/stable21/icewind/streams-0.7.5 branch October 8, 2021 09:33
@blizzz blizzz mentioned this pull request Nov 3, 2021
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants