Skip to content

phpunit9 and php8#127

Closed
delboy1978uk wants to merge 39 commits intolaminas:2.13.xfrom
delboy1978uk:2.13.x
Closed

phpunit9 and php8#127
delboy1978uk wants to merge 39 commits intolaminas:2.13.xfrom
delboy1978uk:2.13.x

Conversation

@delboy1978uk
Copy link
Copy Markdown

@delboy1978uk delboy1978uk commented Jan 13, 2021

This cant be merged until the following are PHP 8 ready, as I have changed the repos/branches in the composer.json in order that we could work on this:
laminas/laminas-crypt#11
laminas/laminas-mime#14
laminas/laminas-math#5

Q A
Documentation /no
Bugfix /no
BC Break /no
New Feature yes/
RFC /no
QA /no

Description

get mail working on php8 and phpunit9

@delboy1978uk
Copy link
Copy Markdown
Author

This cant be merged until the following are PHP 8 ready, as I have changed the repos/branches in the composer.json in order that we could work on this:
laminas/laminas-crypt#11
laminas/laminas-mime#14
laminas/laminas-math#5

@glensc
Copy link
Copy Markdown
Contributor

glensc commented Jan 14, 2021

@delboy1978uk, my 0.2c:

  1. you should rebase, not merge upstream changes. it's difficult to review if your PR commits 59 commits that are not even yours. git push -f to update branch after rebase (don't create another PR!)
  2. you can mark PR as "draft", if it's not ready for merge (waiting for dependencies)
  3. you can probably put the waiting for merge note in PR body, more visible than single comment at bottom of the PR after tons of changes (most of the noise is due merge commits included in PR).

delboy1978uk and others added 27 commits January 15, 2021 16:54
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
- Update Folder\Mbox construct param types
- Update Storage\Imap construct param types
- Update Storage\Maildir construct param types
- Update Storage\Mbox construct param types
- Update Storage\Pop3 construct param types

Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Signed-off-by: Derek Stephen McLean <delboy1978uk@gmail.com>
Comment thread composer.json
"repositories": [
{
"type": "git",
"url": "https://github.com/delboy1978uk/laminas-crypt.git"
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.

To be dropped before merge

Comment thread composer.json
},
{
"type": "git",
"url": "https://github.com/bfoosness/laminas-mime"
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.

To be dropped before merge

Comment thread composer.json
},
{
"type": "git",
"url": "https://github.com/bfoosness/laminas-math.git"
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.

To be dropped before merge

Comment thread composer.json Outdated
@delboy1978uk
Copy link
Copy Markdown
Author

delboy1978uk commented Jan 20, 2021

Hi @Ocramius , I'm a little confused as to why the build is failing on that last commit e4f70ed? Also it passes on my own travis page? https://travis-ci.com/github/delboy1978uk/laminas-mail/builds/213443818
Do I need to keep rebasing it periodically?

@Ocramius
Copy link
Copy Markdown
Member

@delboy1978uk don't really understand the failure either:

1) Error

The data provider specified for LaminasTest\Mail\Header\ContentDispositionTest::testParameterWrapping is invalid.

PHPUnit\Framework\InvalidDataProviderException: The key "With two ordered items" has already been defined in the data provider "parameterWrappingProvider".

This seems to be related with a phpunit upgrade, perhaps.

The warning on opening a temporary file is more complex, but unsure if related to travis-ci infrastructure.

@glensc
Copy link
Copy Markdown
Contributor

glensc commented Jan 20, 2021

@Ocramius For #127 (comment)

I already replied via #117 (comment), it's fixed with this PR:

why there are two PR's doing the same?

@delboy1978uk
Copy link
Copy Markdown
Author

@glensc that might have been my fault, I see the other PR was there first now. I was loading one of my own packages into PHP8 and I noticed it still wasn't ready, so without a thought I just downloaded to help where I can. What's the vibe to get your data provider key PR into my branch, do I cherry pick it or just wait for the merges to happen?

@glensc
Copy link
Copy Markdown
Contributor

glensc commented Jan 21, 2021

I pinged @Ocramius to merge #129 (comment), he's been active recently in this project. So I'd rebase once that','s merged, or if want to fix CI, cherry-pick and convert PR to Draft to prevent premature merge.

This project does not have a CONTRIBUTING.md guide, so I'm don't what's the procedures. If this ould be my project, I would ask first to rebase and squash some commits, maybe even extract changes to separate PR to merge ahead. usually, I've pointed people to these guides, how to make good commits and commit messages. 39 commits here seems way too much.

@froschdesign
Copy link
Copy Markdown
Member

froschdesign commented Jan 21, 2021

@glensc

This project does not have a CONTRIBUTING.md guide…

This project uses the GitHub functionality for this and therefore, under each text field you will find:

Remember, contributions to this repository should follow its contributing guidelines and code of conduct.

@Ocramius Ocramius added the Duplicate This issue or pull request already exists label Jan 26, 2021
@Ocramius
Copy link
Copy Markdown
Member

These changes are now included through #117, thanks @delboy1978uk!

@Ocramius Ocramius self-assigned this Jan 26, 2021
@Ocramius Ocramius closed this Jan 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Duplicate This issue or pull request already exists Enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants