neovim

commit 06625f9b3af22a2971cbd21274138c9653f2f723
parent 5c2f2a0c65dfe7bbab0ae0a75293f3bcbd04f7ff
Author: Christian Clason <c.clason@uni-graz.at>
Date:   Sat, 12 Oct 2024 17:28:56 +0200

vim-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: vim/vim#15840

https://github.com/vim/vim/commit/367499c5c39057bca267716d9aad20554d4d83fd

Co-authored-by: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com>

Diffstat:
M
runtime/lua/vim/filetype.lua
 | 
2
++
M
test/old/testdir/test_filetype.vim
 | 
2
+-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
@@ -2296,6 +2296,8 @@ local pattern = {
     ['^crontab%.'] = starsetf('crontab'),
     ['^cvs%d+$'] = 'cvs',
     ['^php%.ini%-'] = 'dosini',
+    ['^php%-fpm%.conf'] = 'dosini',
+    ['^www%.conf'] = 'dosini',
     ['^drac%.'] = starsetf('dracula'),
     ['/dtrace/.*%.d$'] = 'dtrace',
     ['esmtprc$'] = 'esmtprc',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
@@ -227,7 +227,7 @@ func s:GetFilenameChecks() abort
     \ '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',