Use magic for tests of issues emacs-php#14, emacs-php#19, emacs-php#27, emacs-php#29, emacs-php#42

This massively cuts back on the elisp code needed.

Author: haxney

php-mode-test.el

@@ -108,17 +108,7 @@ have a string face."
 (ert-deftest php-mode-test-issue-14 ()
   "Array indentation."
   :expected-result :failed
-  (with-php-mode-test ("issue-14.php")
-    (let ((expected (concat "$post = Post::model()->find(array(\n"
-                            "    'select' => 'title',\n"
-                            "    'condition' => 'postID=:postID',\n"
-                            "    'params' => array(':postID'=>10),\n"
-                            "));")))
-      (indent-region (point-min) (point-max))
-      (goto-char (point-min))
-      (re-search-forward "^\\$post")
-      (should (string= (buffer-substring-no-properties (match-beginning 0) (point-max))
-                       expected)))))
+  (with-php-mode-test ("issue-14.php" :indent t :magic t)))
 
 (ert-deftest php-mode-test-issue-16 ()
   "Comma separated \"use\" (namespaces).
@@ -136,9 +126,7 @@ Gets the face of the text after the comma."
 (ert-deftest php-mode-test-issue-19 ()
   "Alignment of arrow operators."
   :expected-result :failed
-  (with-php-mode-test ("issue-19.php")
-    (indent-region (point-min) (point-max))
-    (goto-char (point-min))
+  (with-php-mode-test ("issue-19.php" :indent t)
     (while (re-search-forward "^\\s-*\\$object->")
       ;; Point is just after `->'
       (let ((col (current-column)))
@@ -166,11 +154,7 @@ This applies for both single and double quotes."
 
 (ert-deftest php-mode-test-issue-27 ()
   "Indentation in a file with a shebang."
-  (with-php-mode-test ("issue-27.php")
-    (re-search-forward "^\\s-*// Tab")
-    (indent-for-tab-command)
-    (back-to-indentation)
-    (should (eq (current-column) tab-width))))
+  (with-php-mode-test ("issue-27.php" :indent t :magic t)))
 
 (ert-deftest php-mode-test-issue-28 ()
   "Slowdown when scrolling.
@@ -186,16 +170,10 @@ This doesn't test anything, for now."
 (ert-deftest php-mode-test-issue-29 ()
   "Indentation of anonymous functions as arguments.
 The closing brace and parenthesis should be at column 0."
-  (with-php-mode-test ("issue-29.php")
-    (indent-region (point-min) (point-max))
-    (goto-char (point-min))
-    (re-search-forward "^\\s-*});")
-    (back-to-indentation)
-    (should (eq (current-column) 0))))
+  (with-php-mode-test ("issue-29.php" :indent t :magic t)))
 
 (ert-deftest php-mode-test-issue-42 ()
   "Error while indenting closures.
 If the bug has been fixed, indenting the buffer should not cause
 an error."
-  (with-php-mode-test ("issue-42.php")
-    (indent-region (point-min) (point-max))))
+  (with-php-mode-test ("issue-42.php" :indent t)))

tests/issue-14.php

@@ -15,7 +15,7 @@
  */
 
 $post = Post::model()->find(array(
-    'select' => 'title',
-    'condition' => 'postID=:postID',
-    'params' => array(':postID'=>10),
-));
+    'select' => 'title',              // ###php-mode-test### ((indent c-basic-offset))
+    'condition' => 'postID=:postID',  // ###php-mode-test### ((indent c-basic-offset))
+    'params' => array(':postID'=>10), // ###php-mode-test### ((indent c-basic-offset))
+));                                   // ###php-mode-test### ((indent 0))

tests/issue-27.php

@@ -12,5 +12,5 @@
  */
 
 if (1 == 1) {
-    // Tab
+    // Tab ###php-mode-test### ((indent c-basic-offset))
 }

tests/issue-29.php

@@ -12,5 +12,5 @@
  */
 
 $app->get("/index", function() {
-    $app->redirect("foo");
-});
+    $app->redirect("foo"); // ###php-mode-test### ((indent c-basic-offset))
+});                        // ###php-mode-test### ((indent 0))