diff --git a/.gitattributes b/.gitattributes
index 38df563e43ad9..d71a50b7b135b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -19,5 +19,7 @@
 *.php diff=php
 *.[ch] diff=cpp
 
-# Collapse the generated arginfo.h files within a pull request.
+# Collapse generated files within a pull request.
 **/*_arginfo.h linguist-generated
+/Zend/zend_vm_execute.h linguist-generated
+/Zend/zend_vm_opcodes.{h,c} linguist-generated
diff --git a/.github/actions/verify-generated-files/action.yml b/.github/actions/verify-generated-files/action.yml
index 4bd838f631728..a243a3b190af1 100644
--- a/.github/actions/verify-generated-files/action.yml
+++ b/.github/actions/verify-generated-files/action.yml
@@ -10,4 +10,5 @@ runs:
         Zend/zend_vm_gen.php
         build/gen_stub.php -f
         build/gen_stub.php --generate-optimizer-info
+        ext/tokenizer/tokenizer_data_gen.php
         git add . -Nu && git diff --exit-code
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 47da36881b54b..c8617ae794adf 100755
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -43,7 +43,7 @@
 DATA;
 
 /*
-    This script creates zend_vm_execute.h and zend_vm_opcodes.h
+    This script creates zend_vm_execute.h and zend_vm_opcodes.{h,c}
     from existing zend_vm_def.h and zend_vm_execute.skl
 */
 
diff --git a/ext/tokenizer/.gitattributes b/ext/tokenizer/.gitattributes
new file mode 100644
index 0000000000000..a6ffb4aa7449e
--- /dev/null
+++ b/ext/tokenizer/.gitattributes
@@ -0,0 +1,2 @@
+# Collapse generated files within a pull request.
+/tokenizer_data.c linguist-generated
diff --git a/ext/tokenizer/tokenizer_data_gen.php b/ext/tokenizer/tokenizer_data_gen.php
old mode 100644
new mode 100755
index b9659e9f19abc..2a2f71f567b5a
--- a/ext/tokenizer/tokenizer_data_gen.php
+++ b/ext/tokenizer/tokenizer_data_gen.php
@@ -1,8 +1,8 @@
+#!/usr/bin/env php
 <?php
 
-$rootDir = __DIR__ . '/../..';
-$infile = $rootDir . '/Zend/zend_language_parser.y';
-$outfile = $rootDir . '/ext/tokenizer/tokenizer_data.c';
+$infile = __DIR__ . '/../../Zend/zend_language_parser.y';
+$outfile = __DIR__ . '/tokenizer_data.c';
 
 if (!file_exists($infile)) {
     fwrite(STDERR, <<<ERROR