Commit Graph

31 Commits

Author SHA1 Message Date
Christoph M. Becker
37043e07df Sync mysqlnd version with PHP version
Since mysqlnd is solely developed in the php-src repository, it makes
not much sense to have its own version number, particularly since
nobody cares to update it.  Therefore we use PHP's version number, but
stick with the "mysqlnd" prefix which can be important to distinguish
the mysqli driver (libmysqlclient vs. mysqlnd).
2019-07-15 14:20:58 +02:00
Peter Kokot
04be076a5d Fix .gitattributes
The `crlf` Git attribute has been long deprecated and made obsolete. A
replacement for using `-crlf` is `-text`. That way Git doesn't do
newlines normalization on any system.

Since the phpt files don't need specific line endings in any files
except for some special CR characters in some, this can be also removed
and line normalization can happen on all phpt files. The run-tests.php
file converts the CRLF to LF before running the test.

This patch also sets a `diff` attributes for all *.phpt files. It
helps showing diffs for some phpt files with special characters such
as ASCII control characters which makes Git recognize them as binary and
stops showing commit diffs otherwise

Some additional short info about used Git attributes has been also added
as comments for easier understanding.

Remove -text gitattribute
2018-10-20 22:58:27 +02:00
Peter Kokot
5651b1a7ca Remove Git ident attribute from the iconv extension 2018-06-16 12:49:55 +02:00
Peter Kokot
7bf091c5c2 Remove SVN revision from phar phpinfo output
The SVN revision was utilized with Subversion. The Git ident
attribute applies only for particular file and since other core
extensions don't output this information anymore this patch
removes it from the phpinfo output to sync and make the phpinfo
core extensions more consistent.
2018-06-16 12:47:33 +02:00
Peter Kokot
eebad01672 Remove revision from OCI8 extension
The revisions were used in SVN. Other core extensions don't
provide this information in the phpinfo output anymore so
this patch removes it from the OCI8 info output to make it
consistent with other extensions.
2018-06-10 21:22:12 +02:00
Peter Kokot
7bb741cad9 Remove exif version from the phpinfo output
This patch removes the exif version in the phpinfo output to sync it
with the rest of the php bundled extensions. Also in the past the
revision id from the version control system was used and is today not
needed anymore.
2018-06-09 15:32:21 +02:00
Peter Kokot
25c35ab30a Sync phpinfo output for pdo_pgsql
This patch removes the module version and revision from the phpinfo
output to sync the phpinfo with the rest of the bundled extensions.
2018-06-08 23:06:22 +02:00
Peter Kokot
279498564f Remove enchant version from the phpinfo output
This patch syncs the phpinfo output with other bundled extensions.
2018-06-04 18:40:38 +02:00
Peter Kokot
cf6b24ccda Sync tidy phpinfo extension version
This patch removes the tidy extension Git ident attribute blob name from
the phpinfo output to be synced with other extensions versioning system
and replaces table header with normal row in the first tidy info table.
2018-06-04 17:10:49 +02:00
Peter Kokot
cb64696ca6 Normalize the ldap extension version in phpinfo output
This patch normalizes the phpinfo output for the ldap extension and
removes the displayed Git attribute ident blob object name.
2018-06-04 17:06:41 +02:00
Peter Kokot
ede39739fd Normalize Reflection phpinfo() output
This patch normalizes the Reflection extension version in the phpinfo
output. It removes the Git attributes ident blob object name from Git
repository as an extension version.

Also the table output is synced with other extensions (i.e. enabled
in a row instead of table header).
2018-06-04 16:28:16 +02:00
Peter Kokot
07257a59d0 Normalize SimpleXML phpinfo output 2018-06-02 13:44:41 +02:00
Peter Kokot
c71433a774 Remove revision for recode from phpinfo 2018-06-02 13:43:49 +02:00
Peter Kokot
c03ee19230 Normalize the POSIX phpinfo output
Instead of the Git attributes ident blob object name display only
extension status (enabled).
2018-06-02 13:35:22 +02:00
Peter Kokot
40c1d5d4e2 Normalize filter phpinfo() output
This patch normalizes the filter extension version in the php info
output. Instead of the Git attributes ident blob object name from Git
repository only extension status is displayed.
2018-06-02 13:35:22 +02:00
Peter Kokot
0a37b48284 Normalize sysvmsg phpinfo() output
This patch normalizes the sysvmsg extension version in the php info
output. Instead of the Git attributes ident blob object name from Git
repository it only displays the extension status.

Remove sysvmsg version
2018-06-02 13:35:21 +02:00
Peter Kokot
cb2fdb08d6 Remove ident gitattribute for Zend/RFC/ 2017-10-05 12:36:09 +02:00
Peter Kokot
900aeedd44
Change ident gitattribute for ext/ext_skel.php 2017-10-03 07:17:44 +01:00
Peter Kokot
7b248a1b32
Remove ident gitattribute for ext/zip/php_zip.c 2017-10-03 07:14:50 +01:00
Peter Kokot
3752d18ffe Remove some old sapi/apache_hooks and sapi/apache leftovers 2017-09-25 21:56:39 +02:00
Nikita Popov
a60efc5e11 Remove set_magic_quotes_runtime
And the alias magic_quotes_runtime
2015-01-17 18:26:45 +01:00
Lior Kaplan
842fde2827 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  Update NEWS
2014-07-21 01:47:19 +03:00
Lior Kaplan
0678dc8d91 Enable $ replacement in exif, ldap, pdo_pgsql and tidy 2014-07-21 01:45:36 +03:00
Nikita Popov
9a56dce83f Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS 2013-03-23 18:26:11 +01:00
Xinchen Hui
d4f9bbfae2 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-11 16:00:00 +08:00
Xinchen Hui
e1180b4f1a Fixed bug #62795 (Zip extension version not defined) 2012-08-11 15:59:06 +08:00
Gustavo André dos Santos Lopes
112a476b68 Merge .gitattributes EOL commit from 5.3.
This merge commit includes several changes from the 5.3 commit.
This is because of 1) different tests between the two branches
and 2) the svn:eol-style attributes differing between the two
branches.
2012-04-10 19:45:18 +01:00
Gustavo André dos Santos Lopes
1c8fccdf6d Disabled EOL conversions on certain tests 2012-04-10 19:41:07 +01:00
David Soria Parra
ca797ca31e Use the NEWS merge driver if available
As described in https://wiki.php.net/vcs/gitworkflow#the_news_file it
is possible to setup a custom merge driver for NEWS so git doesnt try
to merge it.  This commit sets the default merge driver for the NEWS
file to the merge driver called NEWS.
2012-03-21 18:11:41 +01:00
David Soria Parra
944e622821 Always keep the NEWS file from the branch when merging
We usually don't want to touch the NEWS files when we merge and have the
news items not merged by git. Therefore we tell git to use the 'ours' strategy
for the NEWS file.
2012-03-21 12:38:43 +01:00
David Soria Parra
eb8812e58b Enable $Id$ expansion for files with the $Revision$ keyword
Git supports a limited $Id$ keyword expansion. This $Id$ tag is similar to
$Revision$ in SVN. We enable the $Id$ expansion only for files that use
$Revision$.
2012-03-20 17:49:42 +01:00