Merge branch '6.4' into 7.0

* 6.4:
  Windows native support for phpstorm urls

Author: javiereguiluz

reference/configuration/framework.rst

@@ -244,8 +244,8 @@ following values: ``phpstorm``, ``sublime``, ``textmate``, ``macvim``, ``emacs``
 
 .. note::
 
-    The ``phpstorm`` option is supported natively by PhpStorm on MacOS,
-    Windows requires `PhpStormProtocol`_ and Linux requires `phpstorm-url-handler`_.
+    The ``phpstorm`` option is supported natively by PhpStorm on macOS and
+    Windows; Linux requires installing `phpstorm-url-handler`_.
 
 If you use another editor, the expected configuration value is a URL template
 that contains an ``%f`` placeholder where the file path is expected and ``%l``
@@ -298,7 +298,10 @@ Another alternative is to set the ``xdebug.file_link_format`` option in your
     // example for PhpStorm
     xdebug.file_link_format="phpstorm://open?file=%f&line=%l"
 
-    // example for Sublime
+    // example for PhpStorm with Jetbrains Toolbox
+    xdebug.file_link_format="jetbrains://php-storm/navigate/reference?project=example&file=%f:%l"
+
+    // example for Sublime Text
     xdebug.file_link_format="subl://open?url=file://%f&line=%l"
 
 .. note::
@@ -3799,7 +3802,6 @@ the ``#[WithLogLevel]`` attribute::
 
 .. _`HTTP Host header attacks`: https://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html
 .. _`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
-.. _`PhpStormProtocol`: https://github.com/aik099/PhpStormProtocol
 .. _`phpstorm-url-handler`: https://github.com/sanduhrs/phpstorm-url-handler
 .. _`blue/green deployment`: https://martinfowler.com/bliki/BlueGreenDeployment.html
 .. _`gulp-rev`: https://www.npmjs.com/package/gulp-rev