Skip to content

Commit 3f7ec69

Browse files
authored
Collapse more generated files in PRs (php#8754)
* The generated VM files * tokenizer_data.c
1 parent 13479ee commit 3f7ec69

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

Diff for: .gitattributes

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@
1919
*.php diff=php
2020
*.[ch] diff=cpp
2121

22-
# Collapse the generated arginfo.h files within a pull request.
22+
# Collapse generated files within a pull request.
2323
**/*_arginfo.h linguist-generated
24+
/Zend/zend_vm_execute.h linguist-generated
25+
/Zend/zend_vm_opcodes.{h,c} linguist-generated

Diff for: .github/actions/verify-generated-files/action.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ runs:
1010
Zend/zend_vm_gen.php
1111
build/gen_stub.php -f
1212
build/gen_stub.php --generate-optimizer-info
13+
ext/tokenizer/tokenizer_data_gen.php
1314
git add . -Nu && git diff --exit-code

Diff for: Zend/zend_vm_gen.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
DATA;
4444

4545
/*
46-
This script creates zend_vm_execute.h and zend_vm_opcodes.h
46+
This script creates zend_vm_execute.h and zend_vm_opcodes.{h,c}
4747
from existing zend_vm_def.h and zend_vm_execute.skl
4848
*/
4949

Diff for: ext/tokenizer/.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Collapse generated files within a pull request.
2+
/tokenizer_data.c linguist-generated

Diff for: ext/tokenizer/tokenizer_data_gen.php

100644100755
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
#!/usr/bin/env php
12
<?php
23

3-
$rootDir = __DIR__ . '/../..';
4-
$infile = $rootDir . '/Zend/zend_language_parser.y';
5-
$outfile = $rootDir . '/ext/tokenizer/tokenizer_data.c';
4+
$infile = __DIR__ . '/../../Zend/zend_language_parser.y';
5+
$outfile = __DIR__ . '/tokenizer_data.c';
66

77
if (!file_exists($infile)) {
88
fwrite(STDERR, <<<ERROR

0 commit comments

Comments
 (0)