From: Vincenzo Pupillo <v.pupillo@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 72966@debbugs.gnu.org
Subject: bug#72966: 30.0.90; [PATCH] php-ts-mode: custom php.ini config for the built-in php webserver
Date: Thu, 05 Sep 2024 21:16:29 +0200 [thread overview]
Message-ID: <26551738.1r3eYUQgxm@fedora> (raw)
In-Reply-To: <86bk16877q.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1694 bytes --]
Hi Eli, I followed your suggestion and moved the CONFIG argument. I also added
a new entry to the NEWS file.
Thanks.
Vincenzo
In data lunedì 2 settembre 2024 16:23:53 CEST, Eli Zaretskii ha scritto:
> > From: Vincenzo Pupillo <v.pupillo@gmail.com>
> > Date: Mon, 02 Sep 2024 15:29:23 +0200
> >
> > Ciao,
> > this patch adds a new CONFIG attribute to 'php-ts-mode-run-php-webserver'
> > that allows you to specify an alternative php.ini file to the default (or
> > whatever is specified in 'php-ts-mode-php-config').
>
> Thanks.
>
> > -(defun php-ts-mode-run-php-webserver (&optional port hostname
> > document-root -
> > router-script num-of-workers) +(defun php-ts-mode-run-php-webserver
> > (&optional port
> > + hostname
> > + document-root
> > + router-script
> > + config
> > + num-of-workers)
> >
> > "Run PHP built-in web server.
>
> This changes a public API in backward-incompatible way, something we
> don't do, because it could break someone's code out there. (It is
> true that php-ts-mode was introduced in Emacs 30, but that version is
> already in pretest and will be released soon, so I don't think we can
> change this there, either.)
>
> So please find a backward-compatible way of adding this feature,
> perhaps add the new CONFIG argument as the last one?
>
> Also, I think this needs a NEWS entry describing the change in
> behavior.
[-- Attachment #2: 0001-Support-for-custom-php.ini-for-the-built-in-PHP-web-.patch --]
[-- Type: text/x-patch, Size: 8863 bytes --]
From ae9182be63bfa8625c8c8486c1856dced4fb9152 Mon Sep 17 00:00:00 2001
From: Vincenzo Pupillo <v.pupillo@gmail.com>
Date: Mon, 2 Sep 2024 14:11:01 +0200
Subject: [PATCH] Support for custom php.ini for the built-in PHP web server.
A new CONFIG attribute, which defaults to 'php-ts-mode-php-config',
allows an alternative php.ini file to be specified for the built-in web
server. The 'php-ts-mode-run-php-webserver' function, when called
interactively with a prefix argument, also requires this new attribute.
* etc/NEWS: Described the new CONFIG attribute and the different
behavior of 'php-ts-mode-run-php-webserver'.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--parent-html-bol):
Fix docstring.
* lisp/progmodes/php-ts-mode.el (php-ts-mode-run-php-webserver):
New CONFIG attribute. Update docstring.
* lisp/progmodes/php-ts-mode.el (php-ts-mode--webserver-read-args):
Support the new TYPE. Update docstring.
---
etc/NEWS | 10 +++++
lisp/progmodes/php-ts-mode.el | 75 +++++++++++++++++++++++++++--------
2 files changed, 69 insertions(+), 16 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index f2c999a3955..0539bf47479 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1965,6 +1965,16 @@ the 'widget-inactive' face).
If non-nil, moving point forward or backward between widgets by typing
'TAB' or 'S-TAB' skips over inactive widgets. The default value is nil.
+** PHP-ts mode
+
+---
+*** 'php-ts-mode-run-php-webserver' now accepts a custom php.ini.
+A new attribute, CONFIG, allows you to specify an custom php.ini.
+By default it retains the previous behavior: prompt for HOSTNAME
+and PORT only if their respective values are nil.
+Interactively, when invoked with prefix argument, always prompt for
+PORT, HOSTNAME, DOCUMENT-ROOT, ROUTER-SCRIPT, NUM-OF-WORKERS and CONFIG.
+
** Ruby mode
---
diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el
index 3f89de14075..f8d240b746b 100644
--- a/lisp/progmodes/php-ts-mode.el
+++ b/lisp/progmodes/php-ts-mode.el
@@ -490,7 +490,7 @@ php-ts-mode--parent-html-bol
(treesit-node-start parent)))))
(defun php-ts-mode--parent-html-heuristic (node parent _bol &rest _)
- "Returns position based on html indentation.
+ "Return position based on html indentation.
Returns 0 if the NODE is after the </html>, otherwise returns the
indentation point of the last word before the NODE, plus the
@@ -1469,8 +1469,12 @@ php-ts-mode
\f
;;;###autoload
-(defun php-ts-mode-run-php-webserver (&optional port hostname document-root
- router-script num-of-workers)
+(defun php-ts-mode-run-php-webserver (&optional port
+ hostname
+ document-root
+ router-script
+ num-of-workers
+ config)
"Run PHP built-in web server.
PORT: Port number of built-in web server, default `php-ts-mode-ws-port'.
@@ -1484,10 +1488,12 @@ php-ts-mode-run-php-webserver
see `https://www.php.net/manual/en/features.commandline.webserver.php'
NUM-OF-WORKERS: Before run the web server set the
PHP_CLI_SERVER_WORKERS env variable useful for testing code against
-multiple simultaneous requests.
+multiple simultaneous requests
+CONFIG: Alternative php.ini config, default `php-ts-mode-php-config'.
-Interactively, when invoked with prefix argument, always prompt
-for PORT, HOSTNAME, DOCUMENT-ROOT and ROUTER-SCRIPT."
+Interactively, when invoked with prefix argument, always prompt for
+PORT, HOSTNAME, DOCUMENT-ROOT, ROUTER-SCRIPT, NUM-OF-WORKERS and
+CONFIG."
(interactive (when current-prefix-arg
(php-ts-mode--webserver-read-args)))
(let* ((port (or
@@ -1502,6 +1508,9 @@ php-ts-mode-run-php-webserver
document-root
php-ts-mode-ws-document-root
(php-ts-mode--webserver-read-args 'document-root)))
+ (config (or config
+ (when php-ts-mode-php-config
+ (expand-file-name php-ts-mode-php-config))))
(host (format "%s:%d" hostname port))
(name (format "PHP web server on: %s" host))
(buf-name (format "*%s*" name))
@@ -1509,12 +1518,18 @@ php-ts-mode-run-php-webserver
nil
(list "-S" host
"-t" document-root
+ (when config
+ (format "-c %s" config))
router-script)))
(process-environment
- (cons (cond
- (num-of-workers (format "PHP_CLI_SERVER_WORKERS=%d" num-of-workers))
- (php-ts-mode-ws-workers (format "PHP_CLI_SERVER_WORKERS=%d" php-ts-mode-ws-workers)))
- process-environment)))
+ (nconc (cond
+ (num-of-workers
+ (list
+ (format "PHP_CLI_SERVER_WORKERS=%d" num-of-workers)))
+ (php-ts-mode-ws-workers
+ (list
+ (format "PHP_CLI_SERVER_WORKERS=%d" php-ts-mode-ws-workers))))
+ process-environment)))
(if (get-buffer buf-name)
(message "Switch to already running web server into buffer %s" buf-name)
(message "Run PHP built-in web server with args %s into buffer %s"
@@ -1529,12 +1544,17 @@ php-ts-mode-run-php-webserver
(defun php-ts-mode--webserver-read-args (&optional type)
"Helper for `php-ts-mode-run-php-webserver'.
-The optional TYPE can be the symbol \"port\", \"hostname\", \"document-root\" or
-\"router-script\", otherwise it requires all of them."
+The optional TYPE can be the symbol \"port\", \"hostname\", \"document-root\",
+\"router-script\", \"num-workers\" or \"config\", otherwise it requires all of them."
(let ((ask-port (lambda ()
- (read-number "Port: " 3000)))
+ (read-number "Port: " (or
+ php-ts-mode-ws-port
+ 3000))))
(ask-hostname (lambda ()
- (read-string "Hostname: " "localhost")))
+ (read-string "Hostname: "
+ (or
+ php-ts-mode-ws-hostname
+ "localhost"))))
(ask-document-root (lambda ()
(expand-file-name
(read-directory-name "Document root: "
@@ -1546,17 +1566,40 @@ php-ts-mode--webserver-read-args
(read-file-name "Router script: "
(file-name-directory
(or (buffer-file-name)
- default-directory)))))))
+ default-directory))))))
+ (ask-num-workers (lambda ()
+ (let ((num-workers
+ (read-number
+ "Number of workers (less then 2 means no workers): "
+ (or php-ts-mode-ws-workers 0))))
+ ;; num-workers must be >= 2 or nil
+ ;; otherwise PHP's built-in web server will not start.
+ (if (> num-workers 1)
+ num-workers
+ nil))))
+ (ask-config (lambda()
+ (let ((file-name (expand-file-name
+ (read-file-name "Alternative php.ini: "
+ (file-name-directory
+ (or (buffer-file-name)
+ default-directory))))))
+ (if (string= "" (file-name-directory file-name))
+ nil
+ file-name)))))
(cl-case type
(port (funcall ask-port))
(hostname (funcall ask-hostname))
(document-root (funcall ask-document-root))
(router-script (funcall ask-router-script))
+ (num-of-workers (funcall ask-num-workers))
+ (config (funcall ask-config))
(t (list
(funcall ask-port)
(funcall ask-hostname)
(funcall ask-document-root)
- (funcall ask-router-script))))))
+ (funcall ask-router-script)
+ (funcall ask-num-workers)
+ (funcall ask-config))))))
(define-derived-mode inferior-php-ts-mode comint-mode "Inferior PHP"
"Major mode for PHP inferior process."
--
2.46.0
next prev parent reply other threads:[~2024-09-05 19:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-02 13:29 bug#72966: 30.0.90; [PATCH] php-ts-mode: custom php.ini config for the built-in php webserver Vincenzo Pupillo
2024-09-02 14:23 ` Eli Zaretskii
2024-09-02 14:52 ` Vincenzo Pupillo
2024-09-05 19:16 ` Vincenzo Pupillo [this message]
2024-09-08 6:48 ` Eli Zaretskii
2024-09-08 10:52 ` Vincenzo Pupillo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=26551738.1r3eYUQgxm@fedora \
--to=v.pupillo@gmail.com \
--cc=72966@debbugs.gnu.org \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).