Skip to content

Commit 3e9e6b9

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: Windows native support for phpstorm urls
2 parents f7e3d58 + cc61936 commit 3e9e6b9

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

reference/configuration/framework.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ following values: ``phpstorm``, ``sublime``, ``textmate``, ``macvim``, ``emacs``
289289

290290
.. note::
291291

292-
The ``phpstorm`` option is supported natively by PhpStorm on MacOS,
293-
Windows requires `PhpStormProtocol`_ and Linux requires `phpstorm-url-handler`_.
292+
The ``phpstorm`` option is supported natively by PhpStorm on macOS and
293+
Windows; Linux requires installing `phpstorm-url-handler`_.
294294

295295
If you use another editor, the expected configuration value is a URL template
296296
that contains an ``%f`` placeholder where the file path is expected and ``%l``
@@ -347,7 +347,10 @@ Another alternative is to set the ``xdebug.file_link_format`` option in your
347347
// example for PhpStorm
348348
xdebug.file_link_format="phpstorm://open?file=%f&line=%l"
349349
350-
// example for Sublime
350+
// example for PhpStorm with Jetbrains Toolbox
351+
xdebug.file_link_format="jetbrains://php-storm/navigate/reference?project=example&file=%f:%l"
352+
353+
// example for Sublime Text
351354
xdebug.file_link_format="subl://open?url=file://%f&line=%l"
352355
353356
.. note::
@@ -3909,7 +3912,6 @@ the ``#[WithLogLevel]`` attribute::
39093912

39103913
.. _`HTTP Host header attacks`: https://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html
39113914
.. _`Security Advisory Blog post`: https://symfony.com/blog/security-releases-symfony-2-0-24-2-1-12-2-2-5-and-2-3-3-released#cve-2013-4752-request-gethost-poisoning
3912-
.. _`PhpStormProtocol`: https://github.com/aik099/PhpStormProtocol
39133915
.. _`phpstorm-url-handler`: https://github.com/sanduhrs/phpstorm-url-handler
39143916
.. _`blue/green deployment`: https://martinfowler.com/bliki/BlueGreenDeployment.html
39153917
.. _`gulp-rev`: https://www.npmjs.com/package/gulp-rev

0 commit comments

Comments
 (0)