[php-src] Issue #13990: binary diff generated for arginfo.h
| From: | remicollet | Date: | Wed, 17 Apr 2024 14:40:25 +0000 |
| Subject: | [php-src] Issue #13990: binary diff generated for arginfo.h | ||
| Groups: | php.bugs | ||
| Request: | Send a blank email to php-bugs+get-246778@lists.php.net to get a copy of this message | ||
Issue: https://github.com/php/php-src/issues/13990
Author: 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)
```
### PHP Version
N/A
### Operating System
N/A