summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* Sync mysqlnd version with PHP versionChristoph M. Becker2019-07-151-1/+0
| | | | | | | | 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).
* Fix .gitattributesPeter Kokot2018-10-201-159/+20
| | | | | | | | | | | | | | | | | | | | | 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
* Remove Git ident attribute from the iconv extensionPeter Kokot2018-06-161-1/+0
|
* Remove SVN revision from phar phpinfo outputPeter Kokot2018-06-161-1/+0
| | | | | | | | 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.
* Remove revision from OCI8 extensionPeter Kokot2018-06-101-1/+0
| | | | | | | 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.
* Remove exif version from the phpinfo outputPeter Kokot2018-06-091-1/+0
| | | | | | | 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.
* Sync phpinfo output for pdo_pgsqlPeter Kokot2018-06-081-1/+0
| | | | | This patch removes the module version and revision from the phpinfo output to sync the phpinfo with the rest of the bundled extensions.
* Remove enchant version from the phpinfo outputPeter Kokot2018-06-041-1/+0
| | | | This patch syncs the phpinfo output with other bundled extensions.
* Sync tidy phpinfo extension versionPeter Kokot2018-06-041-1/+0
| | | | | | 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.
* Normalize the ldap extension version in phpinfo outputPeter Kokot2018-06-041-1/+0
| | | | | This patch normalizes the phpinfo output for the ldap extension and removes the displayed Git attribute ident blob object name.
* Normalize Reflection phpinfo() outputPeter Kokot2018-06-041-1/+0
| | | | | | | | | 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).
* Normalize SimpleXML phpinfo outputPeter Kokot2018-06-021-1/+0
|
* Remove revision for recode from phpinfoPeter Kokot2018-06-021-1/+0
|
* Normalize the POSIX phpinfo outputPeter Kokot2018-06-021-1/+0
| | | | | Instead of the Git attributes ident blob object name display only extension status (enabled).
* Normalize filter phpinfo() outputPeter Kokot2018-06-021-2/+0
| | | | | | 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.
* Normalize sysvmsg phpinfo() outputPeter Kokot2018-06-021-1/+0
| | | | | | | | 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
* Remove ident gitattribute for Zend/RFC/Peter Kokot2017-10-051-2/+0
|
* Change ident gitattribute for ext/ext_skel.phpPeter Kokot2017-10-031-1/+1
|
* Remove ident gitattribute for ext/zip/php_zip.cPeter Kokot2017-10-031-1/+0
|
* Remove some old sapi/apache_hooks and sapi/apache leftoversPeter Kokot2017-09-251-3/+0
|
* Remove set_magic_quotes_runtimeNikita Popov2015-01-171-1/+0
| | | | And the alias magic_quotes_runtime
* Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-07-211-0/+4
|\ | | | | | | | | | | * PHP-5.4: Enable $ replacement in exif, ldap, pdo_pgsql and tidy Update NEWS
| * Enable $ replacement in exif, ldap, pdo_pgsql and tidyLior Kaplan2014-07-211-0/+4
| |
* | Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALSNikita Popov2013-03-231-0/+2
|/
* Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-08-111-0/+1
|\
| * Fixed bug #62795 (Zip extension version not defined)Xinchen Hui2012-08-111-0/+1
| |
* | Merge .gitattributes EOL commit from 5.3.Gustavo André dos Santos Lopes2012-04-101-0/+150
|\ \ | |/ | | | | | | | | | | 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.
| * Disabled EOL conversions on certain testsGustavo André dos Santos Lopes2012-04-101-0/+149
|/
* Use the NEWS merge driver if availableDavid Soria Parra2012-03-211-1/+1
| | | | | | | 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.
* Always keep the NEWS file from the branch when mergingDavid Soria Parra2012-03-211-0/+1
| | | | | | 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.
* Enable $Id$ expansion for files with the $Revision$ keywordDavid Soria Parra2012-03-201-0/+23
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$.
View Lorry Controller Status