patch 9.1.0777: filetype: Some upstream php files are not recognized

Problem:  filetype: Some upstream php files are not recognized
Solution: Detect more config files from the PHP source
          distribution as filetype ini (nisbet-hubbard).

closes: #15840

Signed-off-by: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 676994f78aa764e34c18837f6fa4bac498d79e0e..a0f3f4afd43ceba1917a345c691df94a6d95869e 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1800,7 +1800,7 @@ au BufNewFile,BufRead *.pod                       setf pod
 au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp,*.phpt,*.theme       setf php
 
 " PHP config
-au BufNewFile,BufRead php.ini-*                        setf dosini
+au BufNewFile,BufRead php.ini-*,php-fpm.conf*,www.conf*                setf dosini
 
 " Pike and Cmod
 au BufNewFile,BufRead *.pike,*.pmod            setf pike

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 74167cb5fb0dc3110427f8b0542c169c194e5430..474d5131244adac977153b52e0720d3bc8b76fec 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -226,7 +226,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     dockerfile: ['Containerfile', 'Dockerfile', 'dockerfile', 'file.Dockerfile', 'file.dockerfile', 'Dockerfile.debian', 'Containerfile.something'],
     dosbatch: ['file.bat'],
     dosini: ['/etc/yum.conf', '/etc/nfs.conf', '/etc/nfsmount.conf', 'file.ini',
-             'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file',
+             'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', 'php-fpm.conf', 'php-fpm.conf.default', 'www.conf', 'www.conf.default',
              '/etc/yum.repos.d/file', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file', 'file.wrap',
              'file.vbp', 'ja2.ini', 'JA2.INI', 'mimeapps.list', 'pip.conf', 'setup.cfg', 'pudb.cfg',
              '.coveragerc', '.pypirc', '.gitlint', '.oelint.cfg', 'pylintrc', '.pylintrc',

diff --git a/src/version.c b/src/version.c
index 5dbd50044f59baa85d717ede020bbfc7fe017815..53af2406b41125eaa77f307b975df868cb5e9189 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    777,
 /**/
     776,
 /**/