1.1.1

xrdebug · Mar 18, 2024 · e632e4b · e632e4b
1 parent be9cc69
commit e632e4b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ["8.2"]
+        php-versions: ["8.3"]
     name: Build on PHP ${{ matrix.php-versions }} ${{ matrix.operating-system }}
     steps:
       - name: Checkout

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
     permissions:
       contents: write
     env:
-      phpVer: "8.2"
+      phpVer: "8.3"
       tools: composer
       ini-values: default_charset='UTF-8'
     steps:

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: ["8.2"]
+        php: ["8.3"]
     env:
       tools: composer
       ini-values: default_charset='UTF-8'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: ["8.1", "8.2"]
+        php: ["8.1", "8.2", "8.3"]
     env:
       tools: composer, phpstan, infection
       ini-values: default_charset='UTF-8'

diff --git a/app/meta.php b/app/meta.php
@@ -11,4 +11,4 @@
 
 declare(strict_types=1);
 
-const XRDEBUG_VERSION = '1.1.0';
+const XRDEBUG_VERSION = '1.1.1';
diff --git a/src/functions.php b/src/functions.php
@@ -247,10 +247,9 @@ function getCipher(
     $encryptionKeyDisplay = base64_encode($symmetricKey);
     $logger->write(<<<LOG
 
-    ENCRYPTION KEY
+    > ENCRYPTION KEY
     {$encryptionKeyDisplay}
 
-
     LOG);
 
     return $cipher;
@@ -264,7 +263,7 @@ function getPrivateKey(
     if ($privateKey === null) {
         $privateKey = EC::createKey('ed25519');
         $logger->write(
-            $color('INFO: Generated private key (empty -s)')->magenta() . "\n"
+            $color('INFO: Generated private key (empty -x)')->magenta() . "\n"
         );
     } else {
         $privateKey = EC::load($privateKey);
@@ -273,10 +272,9 @@ function getPrivateKey(
     $logger->write(
         <<<LOG
 
-        PRIVATE KEY
+        > PRIVATE KEY
         {$privateKeyDisplay}
 
-
         LOG
     );
     /** @var PrivateKey */

diff --git a/xrdebug b/xrdebug
@@ -75,9 +75,9 @@ if (array_key_exists('h', $options) || array_key_exists('help', $options)) {
 
         <yellow>Cipher options</yellow>
           <cyan>-e</cyan> Enable end-to-end encryption
-          <cyan>-x</cyan> Enable sign verification
           <cyan>-k</cyan> <dark_gray>[for -e option]</dark_gray> Symmetric key
-          <cyan>-s</cyan> <dark_gray>[for -x option]</dark_gray> Private key
+          <cyan>-s</cyan> Enable sign verification
+          <cyan>-x</cyan> <dark_gray>[for -x option]</dark_gray> Private key
 
         <yellow>Session options</yellow>
           <cyan>-n</cyan> Session name <red>(default xrDebug)</red>
@@ -108,7 +108,7 @@ $sessionName = $options['n'] ?? 'xrDebug';
 $localCert = $options['c'] ?? null;
 $localPk = $options['z'] ?? null;
 $isEncryptionEnabled = $options['e'] ?? false;
-$isSignVerificationEnabled = $options['x'] ?? false;
+$isSignVerificationEnabled = $options['s'] ?? false;
 $scheme = isset($localCert) ? 'tls' : 'tcp';
 $editor = $options['i'] ?? 'vscode';
 $uri = "{$scheme}://{$address}:{$port}";
@@ -139,7 +139,7 @@ if ($isEncryptionEnabled) {
 }
 $privateKey = null;
 if ($isSignVerificationEnabled) {
-    $privateKey = $options['s'] ?? null;
+    $privateKey = $options['x'] ?? null;
     if ($privateKey === true) {
         $privateKey = null;
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,4 @@

		declare(strict_types=1);

		const XRDEBUG_VERSION = '1.1.0';
		const XRDEBUG_VERSION = '1.1.1';