Merge pull request #11 from emacs-php/feature/handling-errors

Add error handler

Author: zonuexe

php-runtime-test.el

@@ -68,5 +68,9 @@ while (($line = fgets(STDIN)) !== false) {
   (should (string= "200" (php-runtime-expr "(1+1)*100")))
   (should (string= "foo" (php-runtime-expr "'f' . 'oo'"))))
 
+(ert-deftest php-runtime-test-expr-syntax-error ()
+  "Test that PHP code syntax errors are reported as errors in Emacs."
+  (should-error (php-runtime-expr "a:b")))
+
 (provide 'php-runtime-test)
 ;;; php-runtime-test.el ends here

php-runtime.el

@@ -78,19 +78,25 @@ for example, (get-buffer \"foo-buffer\"), '(:file . \"/path/to/file\")."
        (member (car obj) (list :file :string))
        (stringp (cdr obj))))
 
+(defun php-runtime-default-handler (status output)
+  "Return `OUTPUT', and raise error when `STATUS' is not 0."
+  (if (eq 0 status)
+      output
+    (error output)))
 
 ;; PHP Execute class
 
 ;;;###autoload
 (defclass php-runtime-execute nil
   ((executable :initarg :executable :type string)
    (code   :initarg :code   :type (satisfies php-runtime--code-satisfied-p))
+   (handler :initarg :handler :type function :initform #'php-runtime-default-handler)
    (stdin  :initarg :stdin  :type (satisfies php-runtime--stdin-satisfied-p) :initform nil)
    (stdout :initarg :stdout :type (or null buffer-live list) :initform nil)
    (stderr :initarg :stderr :type (or null buffer-live list) :initform nil)))
 
 (cl-defmethod php-runtime-run ((php php-runtime-execute))
-  "Execute PHP process using `php -r' with code.
+  "Execute PHP process using `php -r' with code and return status code.
 
 This execution method is affected by the number of character limit of OS command arguments.
 You can check the limitation by command, for example \(shell-command-to-string \"getconf ARG_MAX\") ."
@@ -99,6 +105,13 @@ You can check the limitation by command, for example \(shell-command-to-string \
         (php-runtime--call-php-process-with-input-buffer php args)
       (php-runtime--call-php-process php args))))
 
+(cl-defmethod php-runtime-process ((php php-runtime-execute))
+  "Execute PHP process using `php -r' with code and return output."
+  (let ((status (php-runtime-run php))
+        (output (with-current-buffer (php-runtime-stdout-buffer php)
+                  (buffer-substring-no-properties (point-min) (point-max)))))
+    (funcall (oref php handler) status output)))
+
 (cl-defmethod php-runtime--call-php-process ((php php-runtime-execute) args)
   "Execute PHP Process by php-execute `PHP' and `ARGS'."
   (apply #'call-process (oref php executable)
@@ -162,13 +175,13 @@ Pass `INPUT-BUFFER' to PHP executable as STDIN."
   "Evalute PHP code `CODE' without open tag, and return buffer.
 
 Pass `INPUT-BUFFER' to PHP executable as STDIN."
-  (let ((execute (php-runtime-execute :code (cons :string code)
+  (let ((executor (php-runtime-execute :code (cons :string code)
                            :executable php-runtime-php-executable
                            :stderr (get-buffer-create php-runtime-error-buffer-name)))
         (temp-input-buffer (when (and input-buffer (not (bufferp input-buffer)))
                              (php-runtime--temp-buffer))))
     (when input-buffer
-      (oset execute stdin
+      (oset executor stdin
             (if (or (bufferp input-buffer)
                     (and (consp input-buffer) (eq :file (car input-buffer))))
                 input-buffer
@@ -177,13 +190,11 @@ Pass `INPUT-BUFFER' to PHP executable as STDIN."
                   (insert input-buffer))))))
 
     (unwind-protect
-        (progn (php-runtime-run execute)
-               (with-current-buffer (php-runtime-stdout-buffer execute)
-                 (buffer-substring-no-properties (point-min) (point-max))))
+        (php-runtime-process executor)
       (when (and temp-input-buffer (buffer-live-p temp-input-buffer))
         (kill-buffer temp-input-buffer))
       (when php-runtime--kill-temp-output-buffer
-        (kill-buffer (php-runtime-stdout-buffer execute))))))
+        (kill-buffer (php-runtime-stdout-buffer executor))))))
 
 (provide 'php-runtime)
 ;;; php-runtime.el ends here