Fix blade ftdetect

ftdetect/polyglot.vim

@@ -78,11 +78,6 @@ if index(g:polyglot_disabled, 'autohotkey') == -1
   au BufNewFile,BufRead *.ahkl set ft=autohotkey
 endif
 
-if index(g:polyglot_disabled, 'blade') == -1
-  au BufNewFile,BufRead *.blade set ft=blade
-  au BufNewFile,BufRead *.blade.php set ft=blade
-endif
-
 if index(g:polyglot_disabled, 'c/c++') == -1
   au BufNewFile,BufRead *.c set ft=c
   au BufNewFile,BufRead *.cats set ft=c
@@ -737,6 +732,11 @@ if index(g:polyglot_disabled, 'php') == -1
   au BufNewFile,BufRead Phakefile set ft=php
 endif
 
+if index(g:polyglot_disabled, 'blade') == -1
+  au BufNewFile,BufRead *.blade set ft=blade
+  au BufNewFile,BufRead *.blade.php set ft=blade
+endif
+
 if index(g:polyglot_disabled, 'plantuml') == -1
   au BufNewFile,BufRead *.iuml set ft=plantuml
   au BufNewFile,BufRead *.plantuml set ft=plantuml

packages.yaml

@@ -40,12 +40,6 @@ filetypes:
 - name: autohotkey
   linguist: AutoHotkey
 ---
-name: blade
-remote: jwalton512/vim-blade
-filetypes:
-- name: blade
-  linguist: Blade
----
 name: c/c++
 remote: vim-jp/vim-cpp
 filetypes:
@@ -750,6 +744,13 @@ remote: StanAngeloff/php.vim
 filetypes:
 - name: php
   linguist: PHP
+# Needs to be after .php (can be .blade.php)
+---
+name: blade
+remote: jwalton512/vim-blade
+filetypes:
+- name: blade
+  linguist: Blade
 ---
 name: plantuml
 remote: aklt/plantuml-syntax