[PHP-DEV] 2016 TestFest, did the tests written then ever get merged?

  104224
February 6, 2019 07:13 mark@lange.demon.co.uk (Mark Baker)
Looking at the Voting Eligibility discussion going on at the moment.

I, like many others, participated in the last testfest 18 months or so 
ago. Did the results from that ever get merged? Or have they simply been 
discarded or forgotten? If merged, they certainly don't show up in the 
contributions list posted aganst the Workflow and Voting RFC Eligibility 
list: yet all those who participated in the testfest care about the 
language enough to get involved


-- 
Mark Baker


  _________
|.  \     \-3
|_J_/ PHP |
|| |  __  |
|| |m| |m|


  I LOVE PHP
  104225
February 6, 2019 07:22 peterkokot@gmail.com (Peter Kokot)
Hello,

On Wed, 6 Feb 2019 at 08:13, Mark Baker <mark@lange.demon.co.uk> wrote:
> > Looking at the Voting Eligibility discussion going on at the moment. > > I, like many others, participated in the last testfest 18 months or so > ago. Did the results from that ever get merged? Or have they simply been > discarded or forgotten? If merged, they certainly don't show up in the > contributions list posted aganst the Workflow and Voting RFC Eligibility > list: yet all those who participated in the testfest care about the > language enough to get involved
No, they didn't. And longer we wait more file differences and "merge" conflicts will happen. I'd suggest to start adding one by one those that are accepted and confirmed [1]. I can help sort this mess. A separate fork out of the php/php-src was not such a good idea. Important thing is also that the author is recognised in the commit log properly and credits section is added as a recognition for the volunteers (as noted in the php test fest instructions and all). Let me know when we start adding those. Have a nice day. [1] https://github.com/phpcommunity/phptestfest-php-src/pulls -- Peter Kokot
  104247
February 6, 2019 15:13 ben@benramsey.com (Ben Ramsey)
> On Feb 6, 2019, at 01:22, Peter Kokot <peterkokot@gmail.com> wrote: > I can help sort this mess. A separate fork out of the php/php-src was > not such a good idea.
Sorry. I made many poor decisions around how I managed that entire event. It’s my own personal Fyre Festival. :-( I’m happy to help in any way I can to get these ready to merge into php-src. Let me know how I can help. -Ben
  104291
February 7, 2019 15:14 sjon@hortensius.net (Sjon Hortensius)
On Wed, Feb 6, 2019 at 4:14 PM Ben Ramsey <ben@benramsey.com> wrote:

> > On Feb 6, 2019, at 01:22, Peter Kokot <peterkokot@gmail.com> wrote: > > I can help sort this mess. A separate fork out of the php/php-src was > > not such a good idea. > > Sorry. I made many poor decisions around how I managed that entire event. > It’s my own personal Fyre Festival. :-( > > I’m happy to help in any way I can to get these ready to merge into > php-src. Let me know how I can help. > > -Ben >
anyone with access to the php-src git repo should be able to merge them pretty easily; it's a matter of running: curl -s ' https://github.com/phpcommunity/phptestfest-php-src/pulls?page=1&q=is%3Apr+is%3Aopen+review%3Aapproved'|grep -Po '(?<=
https://patch-diff.githubusercontent.com/raw/phpcommunity/phptestfest-php-src/pull/$id.patch|git am done and increase the page-number in the first URL to includes pages 2 & 3 as well. Run this in your checkout (possibly on a branch) and push that to github
  104292
February 7, 2019 15:52 cmbecker69@gmx.de ("Christoph M. Becker")
On 07.02.2019 at 16:14, Sjon Hortensius wrote:

> On Wed, Feb 6, 2019 at 4:14 PM Ben Ramsey <ben@benramsey.com> wrote: > >>> On Feb 6, 2019, at 01:22, Peter Kokot <peterkokot@gmail.com> wrote: >>> I can help sort this mess. A separate fork out of the php/php-src was >>> not such a good idea. >> >> Sorry. I made many poor decisions around how I managed that entire event. >> It’s my own personal Fyre Festival. :-( >> >> I’m happy to help in any way I can to get these ready to merge into >> php-src. Let me know how I can help. > > anyone with access to the php-src git repo should be able to merge them > pretty easily; it's a matter of running: > > curl -s ' > https://github.com/phpcommunity/phptestfest-php-src/pulls?page=1&q=is%3Apr+is%3Aopen+review%3Aapproved'|grep > -Po '(?<=
https://patch-diff.githubusercontent.com/raw/phpcommunity/phptestfest-php-src/pull/$id.patch|git > am > done > > and increase the page-number in the first URL to includes pages 2 & 3 as > well. Run this in your checkout (possibly on a branch) and push that to > github
It seems to me that the tests should be reviewed (again). The first one I've seen[1], should be removed, since it tests general ZPP behavior, and we're in the process to remove such tests generally[2]. [1] <https://github.com/phpcommunity/phptestfest-php-src/pull/155/files#diff-33e85609b0c12ee2d4b1c5f6190fdfa4> [2] <https://github.com/php/php-src/pull/3783> -- Christoph M. Becker
  104294
February 7, 2019 17:01 peterkokot@gmail.com (Peter Kokot)
Hello,

On Thu, 7 Feb 2019, 16:52 Christoph M. Becker <cmbecker69@gmx.de wrote:

> On 07.02.2019 at 16:14, Sjon Hortensius wrote: > > > On Wed, Feb 6, 2019 at 4:14 PM Ben Ramsey <ben@benramsey.com> wrote: > > > >>> On Feb 6, 2019, at 01:22, Peter Kokot <peterkokot@gmail.com> wrote: > >>> I can help sort this mess. A separate fork out of the php/php-src was > >>> not such a good idea. > >> > >> Sorry. I made many poor decisions around how I managed that entire > event. > >> It’s my own personal Fyre Festival. :-( > >> > >> I’m happy to help in any way I can to get these ready to merge into > >> php-src. Let me know how I can help. > > > > anyone with access to the php-src git repo should be able to merge them > > pretty easily; it's a matter of running: > > > > curl -s ' > > > https://github.com/phpcommunity/phptestfest-php-src/pulls?page=1&q=is%3Apr+is%3Aopen+review%3Aapproved'|grep > <https://github.com/phpcommunity/phptestfest-php-src/pulls?page=1&q=is%3Apr+is%3Aopen+review%3Aapproved'%7Cgrep> > > -Po '(?<=
https://patch-diff.githubusercontent.com/raw/phpcommunity/phptestfest-php-src/pull/$id.patch|git > > am > > done > > > > and increase the page-number in the first URL to includes pages 2 & 3 as > > well. Run this in your checkout (possibly on a branch) and push that to > > github > > It seems to me that the tests should be reviewed (again). The first one > I've seen[1], should be removed, since it tests general ZPP behavior, > and we're in the process to remove such tests generally[2]. > > [1] > < > https://github.com/phpcommunity/phptestfest-php-src/pull/155/files#diff-33e85609b0c12ee2d4b1c5f6190fdfa4 > > > [2] <https://github.com/php/php-src/pull/3783> > > -- > Christoph M. Becker >
Hello, thanks for the info. Yes, the suggested script might seem like this can be done in a simple way. However, I have no idea in what state the pull requests at the forked repository are so I suggest we start opening separate pull requests one by one to target PHP 7.4 branch. So overall, ~139 pull requests. With 1-5 per day, we can have this fixed in a month to several months or so. If more people can help opening pull requests, so much faster this can be done. Fetching remote branch from another fork is quite easy: git checkout -b patch-1 upstream/PHP-7.4 wget https://github.com/phpcommunity/phptestfest-php-src/pull/1.patch git am -3 1.patch # recheck commits, rebase, fix conflicts etc git push origin patch-1 # Open pull request to recheck and merge into PHP-7.4 and master. Example: https://github.com/php/php-src/pull/3802 -- Peter Kokot
>
  104296
February 7, 2019 19:36 peterkokot@gmail.com (Peter Kokot)
On Thu, 7 Feb 2019 at 18:01, Peter Kokot <peterkokot@gmail.com> wrote:
> > Hello, > > On Thu, 7 Feb 2019, 16:52 Christoph M. Becker <cmbecker69@gmx.de wrote: >> >> On 07.02.2019 at 16:14, Sjon Hortensius wrote: >> >> > On Wed, Feb 6, 2019 at 4:14 PM Ben Ramsey <ben@benramsey.com> wrote: >> > >> >>> On Feb 6, 2019, at 01:22, Peter Kokot <peterkokot@gmail.com> wrote: >> >>> I can help sort this mess. A separate fork out of the php/php-src was >> >>> not such a good idea. >> >> >> >> Sorry. I made many poor decisions around how I managed that entire event. >> >> It’s my own personal Fyre Festival. :-( >> >> >> >> I’m happy to help in any way I can to get these ready to merge into >> >> php-src. Let me know how I can help. >> > >> > anyone with access to the php-src git repo should be able to merge them >> > pretty easily; it's a matter of running: >> > >> > curl -s ' >> > https://github.com/phpcommunity/phptestfest-php-src/pulls?page=1&q=is%3Apr+is%3Aopen+review%3Aapproved'|grep >> > -Po '(?<=
https://patch-diff.githubusercontent.com/raw/phpcommunity/phptestfest-php-src/pull/$id.patch|git >> > am >> > done >> > >> > and increase the page-number in the first URL to includes pages 2 & 3 as >> > well. Run this in your checkout (possibly on a branch) and push that to >> > github >> >> It seems to me that the tests should be reviewed (again). The first one >> I've seen[1], should be removed, since it tests general ZPP behavior, >> and we're in the process to remove such tests generally[2]. >> >> [1] >> <https://github.com/phpcommunity/phptestfest-php-src/pull/155/files#diff-33e85609b0c12ee2d4b1c5f6190fdfa4> >> [2] <https://github.com/php/php-src/pull/3783> >> >> -- >> Christoph M. Becker > > > Hello, thanks for the info. Yes, the suggested script might seem like this can be done in a simple way. However, I have no idea in what state the pull requests at the forked repository are so I suggest we start opening separate pull requests one by one to target PHP 7.4 branch. So overall, ~139 pull requests. With 1-5 per day, we can have this fixed in a month to several months or so. If more people can help opening pull requests, so much faster this can be done. > > Fetching remote branch from another fork is quite easy: > git checkout -b patch-1 upstream/PHP-7.4 > wget https://github.com/phpcommunity/phptestfest-php-src/pull/1.patch > git am -3 1.patch > # recheck commits, rebase, fix conflicts etc > git push origin patch-1 > # Open pull request to recheck and merge into PHP-7.4 and master. > > Example: > https://github.com/php/php-src/pull/3802 > > -- > Peter Kokot
Additionally, majority of the pull requests there introduces a new test file. Which means that merging is simpler compared to pull requests where existing files are changed. Also, ~50% of the pull requests are already approved thanks to @krakjoe [1] (filtering that might help more). [1] https://github.com/phpcommunity/phptestfest-php-src/pulls?q=is%3Apr+is%3Aopen+review%3Aapproved -- Peter Kokot
  104318
February 9, 2019 08:08 mark@lange.demon.co.uk (Mark Baker)
On 06/02/2019 08:13, Mark Baker wrote:
> Looking at the Voting Eligibility discussion going on at the moment. > > I, like many others, participated in the last testfest 18 months or so > ago. Did the results from that ever get merged? Or have they simply been > discarded or forgotten? If merged, they certainly don't show up in the > contributions list posted aganst the Workflow and Voting RFC Eligibility > list: yet all those who participated in the testfest care about the > language enough to get involved > > Thank you. It's good to see merging has started. I appreciate your work,
as I'm sure will many of those who contributed through the TestFest -- Mark Baker _________ |. \ \-3 |_J_/ PHP | || | __ | || |m| |m| I LOVE PHP
  104324
February 9, 2019 16:38 carusogabriel34@gmail.com (Gabriel Caruso)
Em sáb, 9 de fev de 2019 às 06:08, Mark Baker <mark@lange.demon.co.uk>
escreveu:

> On 06/02/2019 08:13, Mark Baker wrote: > > Looking at the Voting Eligibility discussion going on at the moment. > > > > I, like many others, participated in the last testfest 18 months or so > > ago. Did the results from that ever get merged? Or have they simply been > > discarded or forgotten? If merged, they certainly don't show up in the > > contributions list posted aganst the Workflow and Voting RFC Eligibility > > list: yet all those who participated in the testfest care about the > > language enough to get involved > > > > > Thank you. It's good to see merging has started. I appreciate your work, > as I'm sure will many of those who contributed through the TestFest > > > -- > Mark Baker > > _________ > |. \ \-3 > |_J_/ PHP | > || | __ | > || |m| |m| > > I LOVE PHP > >
Hello everyone. I've reviewed a couple of those PRs, closing some ZPP Failures tests and duplicated ones and now we have 94 to go. Some of them I've left a comment to adjust the test to get merge, others, I'm not familiar with the extension/function/test to approve. If someone wants to take a look and help us finish this task, I'd appreciated it :) https://github.com/phpcommunity/phptestfest-php-src/pulls Best, -- Gabriel Caruso
  105584
May 4, 2019 01:05 peterkokot@gmail.com (Peter Kokot)
Hello,

On Sat, 9 Feb 2019 at 17:38, Gabriel Caruso <carusogabriel34@gmail.com> wrote:
> > Em sáb, 9 de fev de 2019 às 06:08, Mark Baker <mark@lange.demon..co.uk> > escreveu: > > > On 06/02/2019 08:13, Mark Baker wrote: > > > Looking at the Voting Eligibility discussion going on at the moment. > > > > > > I, like many others, participated in the last testfest 18 months or so > > > ago. Did the results from that ever get merged? Or have they simply been > > > discarded or forgotten? If merged, they certainly don't show up in the > > > contributions list posted aganst the Workflow and Voting RFC Eligibility > > > list: yet all those who participated in the testfest care about the > > > language enough to get involved > > > > > > > > Thank you. It's good to see merging has started. I appreciate your work, > > as I'm sure will many of those who contributed through the TestFest > > > > > > -- > > Mark Baker > > > > _________ > > |. \ \-3 > > |_J_/ PHP | > > || | __ | > > || |m| |m| > > > > I LOVE PHP > > > > > > Hello everyone. > > I've reviewed a couple of those PRs, closing some ZPP Failures tests and > duplicated ones and now we have 94 to go. Some of them I've left a comment > to adjust the test to get merge, others, I'm not familiar with the > extension/function/test to approve. If someone wants to take a look and > help us finish this task, I'd appreciated it :) > > https://github.com/phpcommunity/phptestfest-php-src/pulls > > Best, > -- > Gabriel Caruso
I want to thank everyone who have sent their pull requests to the test fest repository or have in any other way joined and participated in the PHP test fest event. I thought we could merge all the pull requests properly in few months but unfortunately that's it from my side in the given time frame that was set for this part. We have merged several pull requests that could be added in the upstream repository others should be done manually but I simply don't have time to go through each manually anymore. If anyone would like to see their contribution noted in the php-src repository, please reopen the pull request in the php-src repository directly. It's very simple (and in most cases hopefully welcoming enough) to send your pull request there. If not ping me up to check your pull requests per manual basis. A friendly nudge to the organizers... Next time, don't be shy and please please avoid doing forks of this repo and let's do the noise directly on the php-src repo. As we see, it is almost near impossible to solve this properly and give everyone credits they deserve and merge all the pull requests there without manual commits and rechecks without the help of the internals people. Cheers and thanks. -- Peter Kokot