diff --git a/lisp/php.el b/lisp/php.el
index c08227b1..2e05d2a5 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -664,17 +664,15 @@ Currently there are `php-mode' and `php-ts-mode'."
 (defun php-current-class ()
   "Insert current class name if cursor in class context."
   (interactive)
-  (let ((matched (php-get-current-element php--re-classlike-pattern)))
-    (when matched
-      (insert (concat matched php-class-suffix-when-insert)))))
+  (when-let* ((matched (php-get-current-element php--re-classlike-pattern)))
+    (insert (concat matched php-class-suffix-when-insert))))
 
 ;;;###autoload
 (defun php-current-namespace ()
   "Insert current namespace if cursor in namespace context."
   (interactive)
-  (let ((matched (php-get-current-element php--re-namespace-pattern)))
-    (when matched
-      (insert (concat matched php-namespace-suffix-when-insert)))))
+  (when-let* ((matched (php-get-current-element php--re-namespace-pattern)))
+    (insert (concat matched php-namespace-suffix-when-insert))))
 
 ;;;###autoload
 (defun php-copyit-fqsen ()