oni-php: Remove php-ts-mode: It's not quite ready

Rainbow delimiters mode breaks with large annotations. Functions work slightly
differently, so integrations don't work as well. Navigation is unpleasantly
different.

1 files changed, 25 insertions, 26 deletions

diff --git a/oni-php/oni-php.el b/oni-php/oni-php.el
index 9e7c458..5964c34 100644
--- a/oni-php/oni-php.el
+++ b/oni-php/oni-php.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2026.0327.110900
+;; Version: 2026.0327.111947
 ;; Package-Requires: (oni-yasnippet oni-flycheck oni-company oni-hydra oni-smartparens ggtags fic-mode company-php rainbow-delimiters rainbow-identifiers)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,6 @@
 (require 'align)
 (require 'company)
 (require 'hydra)
-(require 'php-ts-mode)
 (require 'project)
 (require 'whitespace)
 (require 'yasnippet)
@@ -148,27 +147,27 @@ Do the insert N times."
 
 ;; (advice-add 'comment-dwim :around #'oni-php-comment-dwim)
 
-(add-hook 'php-ts-mode-hook #'oni-php--set-require-final-newline)
-(add-hook 'php-ts-mode-hook #'oni-php--whitespace-mode)
-(add-hook 'php-ts-mode-hook 'company-mode)
-(add-hook 'php-ts-mode-hook 'display-fill-column-indicator-mode)
-(add-hook 'php-ts-mode-hook 'electric-indent-local-mode)
-(add-hook 'php-ts-mode-hook 'fic-mode)
-(add-hook 'php-ts-mode-hook 'flycheck-mode)
-(add-hook 'php-ts-mode-hook 'ggtags-mode)
-(add-hook 'php-ts-mode-hook 'oni-php--auto-fill-mode)
-(add-hook 'php-ts-mode-hook 'oni-php-set-rainbow-identifier-faces)
-(add-hook 'php-ts-mode-hook 'rainbow-delimiters-mode)
-(add-hook 'php-ts-mode-hook 'rainbow-identifiers-mode)
-(add-hook 'php-ts-mode-hook 'smartparens-mode)
-(add-hook 'php-ts-mode-hook 'subword-mode)
-(add-hook 'php-ts-mode-hook 'yas-minor-mode)
+(add-hook 'php-mode-hook #'oni-php--set-require-final-newline)
+(add-hook 'php-mode-hook #'oni-php--whitespace-mode)
+(add-hook 'php-mode-hook 'company-mode)
+(add-hook 'php-mode-hook 'display-fill-column-indicator-mode)
+(add-hook 'php-mode-hook 'electric-indent-local-mode)
+(add-hook 'php-mode-hook 'fic-mode)
+(add-hook 'php-mode-hook 'flycheck-mode)
+(add-hook 'php-mode-hook 'ggtags-mode)
+(add-hook 'php-mode-hook 'oni-php--auto-fill-mode)
+(add-hook 'php-mode-hook 'oni-php-set-rainbow-identifier-faces)
+(add-hook 'php-mode-hook 'rainbow-delimiters-mode)
+(add-hook 'php-mode-hook 'rainbow-identifiers-mode)
+(add-hook 'php-mode-hook 'smartparens-mode)
+(add-hook 'php-mode-hook 'subword-mode)
+(add-hook 'php-mode-hook 'yas-minor-mode)
 
 (with-eval-after-load 'company
   (add-to-list 'company-backends 'company-ac-php-backend))
 
-(define-key php-ts-mode-map (kbd "C-c m") #'php-mode-hydra/body)
-(define-key php-ts-mode-map (kbd ".") #'oni-php-insert-dot-dwim)
+(define-key php-mode-map (kbd "C-c m") #'php-mode-hydra/body)
+(define-key php-mode-map (kbd ".") #'oni-php-insert-dot-dwim)
 
 ;; In PHP code it's nice to have any ~=>~ aligned.
 
@@ -183,7 +182,7 @@ Do the insert N times."
              `(php-array-arrow
                (regexp . ,(rx any (group (zero-or-more whitespace)) "=>" any))
                (group . (1))
-               (modes . '(php-mode web-mode php-ts-mode))
+               (modes . '(php-mode web-mode php-mode))
                (repeat . t)))
 
 ;; The WordPress coding standards specify that multiple assignments
@@ -202,15 +201,15 @@ Do the insert N times."
                (modes . '(php-mode web-mode php-ts-mode))
                (repeat . t)))
 
-(with-eval-after-load 'php-ts-mode
+(with-eval-after-load 'php-mode
   (with-eval-after-load 'yasnippet
     (oni-php-snippets-initialize)))
 
 ;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.inc\\'" . php-ts-mode))
+(add-to-list 'auto-mode-alist '("\\.inc\\'" . php-mode))
 
 ;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.module\\'" . php-ts-mode))
+(add-to-list 'auto-mode-alist '("\\.module\\'" . php-mode))
 
 ;;;###autoload
 (with-eval-after-load 'grep
@@ -256,9 +255,9 @@ Do the insert N times."
          (map-elt grep-files-aliases "php")
          (project-root (project-current))))
 
-(define-key php-ts-mode-map (kbd "C-c .") nil t)
-(define-key php-ts-mode-map (kbd "C-c . g") '("Search for symbol at point" . oni-php-grep-symbol))
-(define-key php-ts-mode-map (kbd "C-c . a") '("Import symbol at point" . oni-php-add-use))
+(define-key php-mode-map (kbd "C-c .") nil t)
+(define-key php-mode-map (kbd "C-c . g") '("Search for symbol at point" . oni-php-grep-symbol))
+(define-key php-mode-map (kbd "C-c . a") '("Import symbol at point" . oni-php-add-use))
 
 (provide 'oni-php)
 ;;; oni-php.el ends here