Skip to content

Commit

Permalink
Pacify linter
Browse files Browse the repository at this point in the history
  • Loading branch information
rfay committed Dec 8, 2021
1 parent 3ceeaa3 commit 022f1fc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions .spellcheckwordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ Use
Uses
Uz
VCS
VM
VPN
VPNs
WAMP
Expand Down
5 changes: 4 additions & 1 deletion cmd/ddev/cmd/share_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ func TestShareCmd(t *testing.T) {
}
}
if logErr, ok := logData["err"]; ok && logErr != "<nil>" {
t.Fatalf("ngrok error: %v", logErr)
assert.Equal("<nil>", logErr)
err = pKill(cmd)
assert.NoError(err)
return
}
// If URL is provided, try to hit it and look for expected response
if url, ok := logData["url"]; ok {
Expand Down
4 changes: 2 additions & 2 deletions docs/users/step-debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ For each IDE the link to their documentation is provided, and the skeleton steps

[PhpStorm](https://www.jetbrains.com/phpstorm/download) is a leading PHP development IDE with extensive built-in debugging support. It provides two different ways to do debugging. One requires very little effort in the PhpStorm IDE (they call it zero-configuration debugging) and the other requires you to set up a "run configuration", and is basically identical to the Netbeans or Eclipse setup.

__If you are using PhpStorm inside WSL2 (or perhaps other Linux configurations), under Help→ Edit Custom VM Options, add an additional line: `-Djava.net.preferIPv4Stack=true` This makes PHPStorm listen for Xdebug using IPV4; the Linux version of PHPStorm seems to default to using only IPV6.__
__If you are using PhpStorm inside WSL2 (or perhaps other Linux configurations), under `Help→ Edit Custom VM Options`, add an additional line: `-Djava.net.preferIPv4Stack=true` This makes PhpStorm listen for Xdebug using IPV4; the Linux version of PhpStorm seems to default to using only IPV6.__

#### PhpStorm Zero-Configuration Debugging

Expand Down Expand Up @@ -145,4 +145,4 @@ Debugging Xdebug in any setup can be a little trouble, but here are the steps to
* `ddev ssh` and try the `telnet host.docker.internal 9000` again. It should connect. If not, maybe PhpStorm is not listening, or not configured to listen on port 9000?
* Check to make sure that Xdebug is enabled. You can use `php -i | grep Xdebug` inside the container, or use any other technique you want that gives the output of `phpinfo()`, including Drupal's admin/reports/status/php. You should see `with Xdebug v2.9.6, Copyright (c) 2002-2020` and `php -i | grep "xdebug.remote_enable"` should give you `xdebug.remote_enable: On`.
* Set a breakpoint in the first relevant line of the index.php of your project and then visit the site in a browser. It should stop at that first line.
* If you are using PhpStorm inside WSL2 (or perhaps other Linux configurations), under Help→ Edit Custom VM Options, add an additional line: `-Djava.net.preferIPv4Stack=true` This makes PHPStorm listen for Xdebug using IPV4; the Linux version of PHPStorm seems to default to using only IPV6.
* If you are using PhpStorm inside WSL2 (or perhaps other Linux configurations), under `Help→ Edit Custom VM Options`, add an additional line: `-Djava.net.preferIPv4Stack=true` This makes PhpStorm listen for Xdebug using IPV4; the Linux version of PhpStorm seems to default to using only IPV6.

0 comments on commit 022f1fc

Please sign in to comment.