Skip to content

Commit

Permalink
Merge pull request #743 from emacs-php/fix/emacs29-warnings
Browse files Browse the repository at this point in the history
Fix Emacs 29 warnings
  • Loading branch information
zonuexe authored Apr 23, 2023
2 parents a8194bc + 3e9c75a commit 37b2b88
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
12 changes: 6 additions & 6 deletions lisp/php-format.el
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion lisp/php-ide.el
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions lisp/php.el
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand All @@ -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
Expand Down

0 comments on commit 37b2b88

Please sign in to comment.