From f6d7a4a0b271cb52abd4c5d8ee76e410976c4140 Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Wed, 12 Apr 2023 00:53:22 +0900 Subject: [PATCH 1/3] Fix quotations in doc strings --- lisp/php-ide.el | 2 +- lisp/php.el | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/php-ide.el b/lisp/php-ide.el index bd61e6ad..83d085a0 100644 --- a/lisp/php-ide.el +++ b/lisp/php-ide.el @@ -182,7 +182,7 @@ "Hook functions called when before activating or deactivating PHP-IDE. Notice that two arguments (FEATURE ACTIVATE) are given. -FEATURE: A symbol, like 'lsp-mode. +FEATURE: A symbol, like \\='lsp-mode. ACTIVATE: T is given when activeting, NIL when deactivating PHP-IDE." :tag "PHP-IDE Mode Functions" :group 'php-ide diff --git a/lisp/php.el b/lisp/php.el index ae6ad647..4e991287 100644 --- a/lisp/php.el +++ b/lisp/php.el @@ -261,12 +261,12 @@ an integer (the current comment nesting)." "Make a regular expression for methods with the given VISIBILITY. VISIBILITY must be a string that names the visibility for a PHP -method, e.g. \'public\'. The parameter VISIBILITY can itself also +method, e.g. `public'. The parameter VISIBILITY can itself also be a regular expression. The regular expression this function returns will check for other -keywords that can appear in method signatures, e.g. \'final\' and -\'static\'. The regular expression will have one capture group +keywords that can appear in method signatures, e.g. `final' and +`static'. The regular expression will have one capture group which will be the name of the method." (when (stringp visibility) (setq visibility (list visibility))) @@ -293,8 +293,8 @@ which will be the name of the method." '((* any) line-end)))))) (defun php-create-regexp-for-classlike (type) - "Accepts a `TYPE' of a \'classlike\' object as a string, such as -\'class\' or \'interface\', and returns a regexp as a string which + "Accepts a `TYPE' of a `classlike' object as a string, such as +`class' or `interface', and returns a regexp as a string which can be used to match against definitions for that classlike." (concat ;; First see if 'abstract' or 'final' appear, although really these From 062eb5c713aca6ae7452f8b36be982b834c83556 Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Wed, 12 Apr 2023 00:53:41 +0900 Subject: [PATCH 2/3] Fix GitHub Actions CI --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b6eed395..b333e2cb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,4 +40,4 @@ jobs: run: 'make .cask test' - name: Run tests (allow failure) if: matrix.allow_failure == true - run: 'make test || true' + run: 'make .cask test || true' From 3e9c75ac7e3bf2ff0f8ca8ab8c6e6c9cdc2fbb48 Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Wed, 12 Apr 2023 01:01:34 +0900 Subject: [PATCH 3/3] Fix wrong defcustom --- lisp/php-format.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/php-format.el b/lisp/php-format.el index 166975ff..61ddceae 100644 --- a/lisp/php-format.el +++ b/lisp/php-format.el @@ -97,12 +97,12 @@ (defcustom php-format-command 'auto "A formatter symbol, or a list of command and arguments." :tag "PHP Format Command" - :type '(choice (const nil :tag "Disabled reformat codes") - (const 'auto :tag "Auto") - (const 'ecs :tag "Easy Coding Standard") - (const 'php-cs-fixer :tag "PHP-CS-Fixer") - (const 'phpcbf :tag "PHP Code Beautifier and Fixer") - (repeat string :tag "Command and arguments")) + :type '(choice (const :tag "Disabled reformat codes" nil) + (const :tag "Auto" 'auto) + (const :tag "Easy Coding Standard" 'ecs) + (const :tag "PHP-CS-Fixer" 'php-cs-fixer) + (const :tag "PHP Code Beautifier and Fixer" 'phpcbf) + (repeat :tag "Command and arguments" string)) :safe (lambda (v) (or (symbolp v) (listp v))) :group 'php-format)