Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:104296 Return-Path: Delivered-To: mailing list internals@lists.php.net Received: (qmail 35244 invoked from network); 7 Feb 2019 22:54:37 -0000 Received: from unknown (HELO mail-ot1-f41.google.com) (209.85.210.41) by pb1.pair.com with SMTP; 7 Feb 2019 22:54:37 -0000 Received: by mail-ot1-f41.google.com with SMTP id e12so1865480otl.5 for ; Thu, 07 Feb 2019 11:36:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=9COD+RvtGJ1ZocTAshhOEeNNP0/CLm6BURWR7TOeXVU=; b=k91xdHLg9Bq4YO88UNo+LZsXuLUAU7GlIWVdywha1HeI2MCqIBi7J6369b+uws7ks/ x6/RN8VVnYAOHOOOgDfXQEMBE8374wVKNNBdmOMGBUY+kQ1IlbVjcWaqBi7HswSMzdJU hwnH7+MPBhJLuQdebKMiChPEsmpjwrk78rj/h/9jY9ZA9Tr2/Itqn6k0qXzUu9CF6dmV Kt9KxAJyUsEvbvSpBXp9WsPTWf/rDs6pFsgMW+tYamXjEjmWxSpCXSPAe3Dmh/w3bZZh NLObou5CFyC62Vfc/+RR0b9lKhMucFP1H338oX7W1opjDFl/htK7gZM/T0v213Vr7Ngn lkdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=9COD+RvtGJ1ZocTAshhOEeNNP0/CLm6BURWR7TOeXVU=; b=JeYT+kZO4Ft0ppJ18UIIpcyrqZFECtjiojL4fQvXqje5Fx2B85VaNYREUrwN4JXhbQ zbE7zjqTkABip3+N4A5DY9q6QIqaxNTmWXoO8luP7ufNa5zWGOA8CG4paqcstzi7NNZ6 HhfQ7ruDgyIJARSpRyN/wGn2BS3nZwwNe3rNttg4xZo6bOa6ZJYCl0BHmh38FjwWTBAF UYrTsgkmsYSL5YjS1KvVH7juqq1gGuo5/AHcTrMJkLjNXAD9FC9heAaYp5g6KKdRoA01 f7p7pah5memG3iiE9DJ248meKgPe9tABCr4O3dCfsrewJ+Rhs0B5ZrougLvTrQh1pRBI 0Zxw== X-Gm-Message-State: AHQUAuYGBuJjhKW0UiMc0o0PIDjhu5g6RH6dwXTXHZD6Mr0uD+3ceDFk MGscJEVhiZKU21RNjl71NIRD99sJ0TfJWpHjg10= X-Google-Smtp-Source: AHgI3IYPNxTWghUW42DCOXxW65cWqk1/kEZrDrTrRrWocKVpicmbzfIanS6o96gPFBmDp/hZ2GfoqM1SbXm5387ZC+M= X-Received: by 2002:aca:758c:: with SMTP id q134mr1261564oic.40.1549568179244; Thu, 07 Feb 2019 11:36:19 -0800 (PST) MIME-Version: 1.0 References: <3f5873fe-3fe9-d230-28eb-a20d67550b45@lange.demon.co.uk> <25859B0A-1633-4FB7-8192-EADBA99A0013@benramsey.com> In-Reply-To: Date: Thu, 7 Feb 2019 20:36:08 +0100 Message-ID: To: "Christoph M. Becker" Cc: Sjon Hortensius , Internals , Ben Ramsey , Mark Baker Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [PHP-DEV] 2016 TestFest, did the tests written then ever get merged? From: peterkokot@gmail.com (Peter Kokot) On Thu, 7 Feb 2019 at 18:01, Peter Kokot wrote: > > Hello, > > On Thu, 7 Feb 2019, 16:52 Christoph M. Becker > >> On 07.02.2019 at 16:14, Sjon Hortensius wrote: >> >> > On Wed, Feb 6, 2019 at 4:14 PM Ben Ramsey wrote: >> > >> >>> On Feb 6, 2019, at 01:22, Peter Kokot wrote: >> >>> I can help sort this mess. A separate fork out of the php/php-src wa= s >> >>> not such a good idea. >> >> >> >> Sorry. I made many poor decisions around how I managed that entire ev= ent. >> >> It=E2=80=99s my own personal Fyre Festival. :-( >> >> >> >> I=E2=80=99m happy to help in any way I can to get these ready to merg= e into >> >> php-src. Let me know how I can help. >> > >> > anyone with access to the php-src git repo should be able to merge the= m >> > pretty easily; it's a matter of running: >> > >> > curl -s ' >> > https://github.com/phpcommunity/phptestfest-php-src/pulls?page=3D1&q= =3Dis%3Apr+is%3Aopen+review%3Aapproved'|grep >> > -Po '(?<=3D
> > do >> > curl >> > 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 t= o >> > 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] >> >> [2] >> >> -- >> Christoph M. Becker > > > Hello, thanks for the info. Yes, the suggested script might seem like thi= s can be done in a simple way. However, I have no idea in what state the pu= ll requests at the forked repository are so I suggest we start opening sepa= rate pull requests one by one to target PHP 7.4 branch. So overall, ~139 pu= ll 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 faste= r 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=3Dis%3Apr+i= s%3Aopen+review%3Aapproved -- Peter Kokot