75549[TASK] Ensure php files contain correct legal file header
Commit message
Review
-
Code review CR +2 Done
- Stefan Bürk +2
- Benjamin Franzke +1
- Christian Kuhn +1
- Andreas Kienast +1
-
Verified V +2 Done
- Stefan Bürk +2
- Benjamin Franzke +1
- Christian Kuhn +1
- Andreas Kienast +1
- core-ci +1 CI
Issues 2
Files 8
- Build/git-hooks/unix+mac/pre-commit+48 −19
- Build/gitlab-ci/nightly/integrity.yml+1 −0
- Build/gitlab-ci/pre-merge/integrity.yml3+1 −0
- Build/php-cs-fixer/header-comment.php3+6 −1
- Build/Scripts/cglFixMyCommitFileHeader.batnew+4 −0
- Build/Scripts/cglFixMyCommitFileHeader.shnew+145 −0
- Build/Scripts/runTests.sh+19 −1
- Build/testing-docker/local/docker-compose.yml+29 −0
Review log 2331
Show 36 earlier messages
-
Stefan Bürk uploaded patch set 1 08/25/22, 08:29
-
core-ci voted on patch set 1 V +1 08/25/22, 08:37 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/30437
-
Stefan Bürk commented on patch set 1 08/25/22, 08:40
Needs pre-patch to fix already errors in core files which will crash otherwise nightly). To verify this, running nightly on it: https://git.typo3.org/typo3/CI/cms/-/pipelines/30438 -
core-ci voted on patch set 1 V -1 08/25/22, 09:08 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/30438
-
Stefan Bürk uploaded patch set 2 08/25/22, 09:22
-
core-ci voted on patch set 2 V +1 08/25/22, 09:31 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/30439
-
Stefan Bürk uploaded patch set 3 08/25/22, 09:49
-
Stefan Bürk updated the commit message in patch set 4 08/25/22, 09:51
-
Stefan Bürk commented on patch set 4 CR -1 08/25/22, 09:52
Reply
-1 until pre-patch has been merged -
core-ci voted on patch set 3 V +1 08/25/22, 09:57 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/30441
-
core-ci voted on patch set 4 V +1 08/25/22, 09:59 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/30442
-
Benjamin Franzke uploaded patch set 5 08/25/22, 12:07
-
core-ci voted on patch set 5 V +1 08/25/22, 12:16 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/30445
-
Benjamin Franzke commented on patch set 5 08/25/22, 12:20
Reply
Done -
Stefan Bürk commented on patch set 5 08/25/22, 13:57
Thanks Benjamin for rebase/fix. Re-running nightly to be safe: https://git.typo3.org/typo3/CI/cms/-/pipelines/30446 -
core-ci commented on patch set 5 08/25/22, 14:20 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/30446
-
Christian Kuhn commented on patch set 5 08/25/22, 16:15
integrity.yml:29maybe merge into the 'various' job below to save one job? -
Stefan Bürk commented on patch set 5 08/25/22, 16:26
integrity.yml:29ReplyAck. But I think it is better to move it into the "cgl" as second cgl check. Original added as dedicated job to get hidden by a prior failures. -
Stefan Bürk uploaded patch set 6 08/25/22, 16:28
-
Stefan Bürk commented on patch set 6 08/25/22, 16:28
integrity.yml:29ReplyMoved it into "cgl". -
core-ci voted on patch set 6 V +1 08/25/22, 16:35 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/30447
-
Benjamin Franzke voted on patch set 6 V +1 CR +1 08/25/22, 17:05
-
Andreas Kienast commented on patch set 6 08/26/22, 05:44
Something is off here, perhaps that's how php-cs-fixer works that's why I don't give a -1: In one file, I moved the "namespace" line below declare(strict_types=1); and ended up with two headers. -
Christian Kuhn commented on patch set 6 08/26/22, 06:20
Reply
yeah. that's a php-cs-fixer. stumbled upon that as well already. i fear there isn't much we can do about it? -
Christian Kuhn voted on patch set 6 V +1 CR +1 08/26/22, 06:21
-
Andreas Kienast commented on patch set 6 V +1 CR +1 08/26/22, 07:11
Reply
I see, thanks for the clarification. -
Nikita Hovratov commented on patch set 6 08/26/22, 16:34
header-comment.php:58isn't this already tested in php-cs-fixer.php ? -
Stefan Bürk commented on patch set 6 08/26/22, 17:18
Reply
Yeah - thus I removed the old missplaced header by hand after the "fixer" run in the pre-patch.header-comment.php:58ReplyYes it is. But it is needed here also, otherwise it has the effect that for example the comment was first and then the declare strict line (and namespace third) it changed that (declare - comment - namespace ) but wrong count of spacelines. Thus executing the normal fixer script afterwards it would fix something again. Added this here to avoid the additional roundtrip if the header run fixes/moves that and having the full style check "first". Special for local "pre-commit" hook execution. -
Stefan Bürk voted on patch set 6 V +2 CR +2 08/26/22, 17:19
-
Stefan Bürk merged patch set 7 08/26/22, 17:19
-
Nikita Hovratov commented on patch set 7 08/26/22, 18:22
header-comment.php:58Replythanks for the explanation