Merge pull request #73 from gerarddevisser/fix-phpstorm-remote-call

mikimpe · web-flow · commit 2aa951ca2b6a · 2024-04-22T18:46:46.000+02:00
Fix remote calls to PhpStorm
diff --git a/Model/Config.php b/Model/Config.php
@@ -95,7 +95,7 @@ public function getPhpStormPort()
     {
         $port = (int) $this->scopeConfig->getValue(self::XML_PATH_PHPSTORM_PORT);
         if (!$port) {
-            $port = 8091;
+            $port = 63342;
         }
         return $port;
     }
@@ -112,7 +112,7 @@ public function getPhpStormUrl($file)
             return null;
         }
 
-        return 'http://127.0.0.1:' . $this->getPhpStormPort() . '?message=' . urlencode($file);
+        return 'http://127.0.0.1:' . $this->getPhpStormPort() . '/api/file?file=' . urlencode(ltrim($file, '/'));
     }
 
     /**
diff --git a/etc/config.xml b/etc/config.xml
@@ -29,7 +29,7 @@
             </general>
             <phpstorm>
                 <enabled>0</enabled>
-                <port>8091</port>
+                <port>63342</port>
             </phpstorm>
         </msp_devtools>
     </default>

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function getPhpStormPort()`
`95`	`95`	`{`
`96`	`96`	`$port = (int) $this->scopeConfig->getValue(self::XML_PATH_PHPSTORM_PORT);`
`97`	`97`	`if (!$port) {`
`98`		`- $port = 8091;`
	`98`	`+ $port = 63342;`
`99`	`99`	`}`
`100`	`100`	`return $port;`
`101`	`101`	`}`
`@@ -112,7 +112,7 @@ public function getPhpStormUrl($file)`
`112`	`112`	`return null;`
`113`	`113`	`}`
`114`	`114`
`115`		`- return 'http://127.0.0.1:' . $this->getPhpStormPort() . '?message=' . urlencode($file);`
	`115`	`+ return 'http://127.0.0.1:' . $this->getPhpStormPort() . '/api/file?file=' . urlencode(ltrim($file, '/'));`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`/**`