Skip to content

Commit 37b2b88

Browse files
authored
Merge pull request #743 from emacs-php/fix/emacs29-warnings
Fix Emacs 29 warnings
2 parents a8194bc + 3e9c75a commit 37b2b88

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ jobs:
4040
run: 'make .cask test'
4141
- name: Run tests (allow failure)
4242
if: matrix.allow_failure == true
43-
run: 'make test || true'
43+
run: 'make .cask test || true'

lisp/php-format.el

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@
9797
(defcustom php-format-command 'auto
9898
"A formatter symbol, or a list of command and arguments."
9999
:tag "PHP Format Command"
100-
:type '(choice (const nil :tag "Disabled reformat codes")
101-
(const 'auto :tag "Auto")
102-
(const 'ecs :tag "Easy Coding Standard")
103-
(const 'php-cs-fixer :tag "PHP-CS-Fixer")
104-
(const 'phpcbf :tag "PHP Code Beautifier and Fixer")
105-
(repeat string :tag "Command and arguments"))
100+
:type '(choice (const :tag "Disabled reformat codes" nil)
101+
(const :tag "Auto" 'auto)
102+
(const :tag "Easy Coding Standard" 'ecs)
103+
(const :tag "PHP-CS-Fixer" 'php-cs-fixer)
104+
(const :tag "PHP Code Beautifier and Fixer" 'phpcbf)
105+
(repeat :tag "Command and arguments" string))
106106
:safe (lambda (v) (or (symbolp v) (listp v)))
107107
:group 'php-format)
108108

lisp/php-ide.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
"Hook functions called when before activating or deactivating PHP-IDE.
183183
Notice that two arguments (FEATURE ACTIVATE) are given.
184184
185-
FEATURE: A symbol, like 'lsp-mode.
185+
FEATURE: A symbol, like \\='lsp-mode.
186186
ACTIVATE: T is given when activeting, NIL when deactivating PHP-IDE."
187187
:tag "PHP-IDE Mode Functions"
188188
:group 'php-ide

lisp/php.el

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,12 @@ an integer (the current comment nesting)."
261261
"Make a regular expression for methods with the given VISIBILITY.
262262
263263
VISIBILITY must be a string that names the visibility for a PHP
264-
method, e.g. \'public\'. The parameter VISIBILITY can itself also
264+
method, e.g. `public'. The parameter VISIBILITY can itself also
265265
be a regular expression.
266266
267267
The regular expression this function returns will check for other
268-
keywords that can appear in method signatures, e.g. \'final\' and
269-
\'static\'. The regular expression will have one capture group
268+
keywords that can appear in method signatures, e.g. `final' and
269+
`static'. The regular expression will have one capture group
270270
which will be the name of the method."
271271
(when (stringp visibility)
272272
(setq visibility (list visibility)))
@@ -293,8 +293,8 @@ which will be the name of the method."
293293
'((* any) line-end))))))
294294

295295
(defun php-create-regexp-for-classlike (type)
296-
"Accepts a `TYPE' of a \'classlike\' object as a string, such as
297-
\'class\' or \'interface\', and returns a regexp as a string which
296+
"Accepts a `TYPE' of a `classlike' object as a string, such as
297+
`class' or `interface', and returns a regexp as a string which
298298
can be used to match against definitions for that classlike."
299299
(concat
300300
;; First see if 'abstract' or 'final' appear, although really these

0 commit comments

Comments
 (0)