Fix company-php configuration

layers/+lang/php/config.el

@@ -11,4 +11,5 @@
 
 ;; variables
 
-(spacemacs|define-jump-handlers php-mode ac-php-find-symbol-at-point)
+
+(spacemacs|define-jump-handlers php-mode)

layers/+lang/php/packages.el

@@ -11,7 +11,6 @@
 
 (setq php-packages
       '(
-        company
         drupal-mode
         eldoc
         flycheck
@@ -22,18 +21,9 @@
         php-mode
         phpcbf
         phpunit
-        company-php
+        (company-php :toggle (configuration-layer/package-usedp 'company))
         ))
 
-(defun php/post-init-company ()
-  (spacemacs|add-company-backends
-    :modes php-mode
-    :variables
-    company-minimum-prefix-length 1000
-    :backends  company-ac-php-backend
-    )
-  )
-
 (defun php/init-drupal-mode ()
   (use-package drupal-mode
     :defer t))
@@ -71,12 +61,15 @@
   (use-package phpunit
     :defer t))
 
-(defun phpplus/init-company-php ()
+(defun php/init-company-php ()
   (use-package company-php
     :defer t
     :init
     (progn
-      (add-hook 'php-mode-hook  'ac-php-core-eldoc-setup  )
-      )
-    )
-  )
+      (push 'ac-php-find-symbol-at-point spacemacs-jump-handlers-php-mode)
+      (add-hook 'php-mode-hook 'ac-php-core-eldoc-setup)
+      (spacemacs|add-company-backends
+        :modes php-mode
+        :variables
+        company-minimum-prefix-length 1000
+        :backends company-ac-php-backend))))