binary diff generated for arginfo.h

[remicollet]

Description

With current .gitattributes, change in arginfo are displayed as binary diff

Ex:

diff --git a/ext/openssl/openssl_pwhash.stub.php b/ext/openssl/openssl_pwhash.stub.php
index 85c2f04d55..19dbdf20b2 100644
--- a/ext/openssl/openssl_pwhash.stub.php
+++ b/ext/openssl/openssl_pwhash.stub.php
@@ -35,4 +35,3 @@ function openssl_password_hash(string $algo, #[\SensitiveParameter] string $pass
 function openssl_password_verify(string $algo, #[\SensitiveParameter] string $password, string $hash): bool {}
 
 #endif
-
diff --git a/ext/openssl/openssl_pwhash_arginfo.h b/ext/openssl/openssl_pwhash_arginfo.h
index f60a1f5b08..7a0b9b2ccc 100644
Binary files a/ext/openssl/openssl_pwhash_arginfo.h and b/ext/openssl/openssl_pwhash_arginfo.h differ

Changing .gitattributes allows to fix this

diff --git a/.gitattributes b/.gitattributes
index ccf0353eec..3d05613d86 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,7 +20,7 @@
 *.[ch] diff=cpp
 
 # Collapse generated files within git and pull request diff.
-**/*_arginfo.h linguist-generated -diff
+**/*_arginfo.h linguist-generated
 /Zend/zend_vm_execute.h linguist-generated -diff
 /Zend/zend_vm_handlers.h linguist-generated -diff
 /Zend/zend_vm_opcodes.[ch] linguist-generated -diff
diff --git a/ext/openssl/openssl_pwhash.stub.php b/ext/openssl/openssl_pwhash.stub.php
index 85c2f04d55..19dbdf20b2 100644
--- a/ext/openssl/openssl_pwhash.stub.php
+++ b/ext/openssl/openssl_pwhash.stub.php
@@ -35,4 +35,3 @@ function openssl_password_hash(string $algo, #[\SensitiveParameter] string $pass
 function openssl_password_verify(string $algo, #[\SensitiveParameter] string $password, string $hash): bool {}
 
 #endif
-
diff --git a/ext/openssl/openssl_pwhash_arginfo.h b/ext/openssl/openssl_pwhash_arginfo.h
index f60a1f5b08..7a0b9b2ccc 100644
--- a/ext/openssl/openssl_pwhash_arginfo.h
+++ b/ext/openssl/openssl_pwhash_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a01216f790c4c42499bd85448aacb3a6d58acc94 */
+ * Stub hash: c8e4053e76b4a4b483a38e2b7a30e8414a9470fa */
 
 #if PHP_OPENSSL_API_VERSION >= 0x30200
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_openssl_password_hash, 0, 2, IS_STRING, 0)

[remicollet]

So proposal is to apply

-**/*_arginfo.h linguist-generated -diff
+**/*_arginfo.h linguist-generated

But a github features expert review will be appreciated

[TimWolla]

Introduced in #11802.

[TimWolla]

But a github features expert review will be appreciated

The linguist part is sufficient to collapse those files in a PR. The diff part is just for git itself.

[iluuu1994]

@remicollet As Tim mentioned, the -diff is there to hide the file from git diff, rather GitHub PRs. If you would like to see all generated files in your diff, you can append the -a parameter (e.g. git show -a). Please let me know if that's not sufficient.

[remicollet]

Indeed -a|--text (supported by git diff, git format-patch...) works

BTW I still think this is very confusing, I don't see any reason why removing these file from diff.
While reviewing a change (before a commit, or for PR), all files have value.

My main need was to generate patches without binary diff to be applied with the patch command (no support for binary diff). And this can be workarounded by --text.

ok to close this one if everyone happy with current situation

[iluuu1994]

This was motivated by large diffs for small changes. A single line in some files (e.g. zend_vm_def.h) can result in hundreds of lines changed in the generated file. In that case, it's easy to miss the actual changes in the wall of text. In addition to this, we have added verification in CI that all generated files are up to date, and thus we essentially shouldn't have to think about them.

I have only heard one complaint from @kocsismate since this was introduced, and then pointed him to the -a flag. I'd prefer not removing this, but I won't resist if others feel the same.