diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el index bb09c887e..98afcd1b1 100644 --- a/modules/lang/php/config.el +++ b/modules/lang/php/config.el @@ -40,22 +40,6 @@ (set-lookup-handlers! 'php-mode :definition #'phpactor-goto-definition) - ;; TODO PR these for phpactor.el? - ;; company-phpactor breaks company if executable doesn't exist - (defun +php*company-phpactor-fail-silently (orig-fn &rest args) - (when (phpactor-find-executable) - (apply orig-fn args))) - (advice-add #'company-phpactor :around #'+php*company-phpactor-fail-silently) - - ;; `phpactor-get-working-dir' throws stringp errors if not in a project. - (defun +php*project-root (&rest _) - (setq phpactor-working-dir - (or phpactor-working-dir - (php-project-get-root-dir) - (doom-project-root) - default-directory))) - (advice-add #'phpactor-get-working-dir :before #'+php*project-root) - (map! :localleader :map php-mode-map :prefix "r" diff --git a/modules/lang/php/packages.el b/modules/lang/php/packages.el index c56946502..39f874bb5 100644 --- a/modules/lang/php/packages.el +++ b/modules/lang/php/packages.el @@ -11,7 +11,7 @@ (package! hack-mode :recipe (:fetcher github :repo "hhvm/hack-mode"))) (unless (featurep! +lsp) - (package! phpactor :recipe (:fetcher github :repo "emacs-php/phpactor.el" :files ("*")))) + (package! phpactor)) (when (featurep! :editor format) (package! php-cs-fixer))