Try to fix the self-update command

netz98 · Jun 6, 2024 · 2aac1f8 · 2aac1f8
1 parent 8ba70ba
commit 2aac1f8
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "fakerphp/faker": "^1.20",
         "n98/junit-xml": "~1.0",
         "psy/psysh": "~0.4",
-        "rmccue/requests": "^2.0",
+        "rmccue/requests": "^2.0.11",
         "symfony/console": "~5.4",
         "symfony/event-dispatcher": "~5.4",
         "symfony/finder": "~5.4",

diff --git a/composer.lock b/composer.lock
diff --git a/src/N98/Magento/Command/SelfUpdateCommand.php b/src/N98/Magento/Command/SelfUpdateCommand.php
@@ -49,14 +49,6 @@ protected function configure()
             );
     }
 
-    /**
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        return $this->getApplication()->isPharMode();
-    }
-
     /**
      * @param \Symfony\Component\Console\Input\InputInterface $input
      * @param \Symfony\Component\Console\Output\OutputInterface $output
@@ -66,6 +58,13 @@ public function isEnabled()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $isDryRun = $input->getOption('dry-run');
+
+        if (!$this->getApplication()->isPharMode()) {
+            $isDryRun = true;
+            $output->writeln('<warning>Self-update is supported only for phar files.</warning>');
+            $output->writeln('Dry-run mode is enabled.');
+        }
+
         $localFilename = realpath($_SERVER['argv'][0]) ?: $_SERVER['argv'][0];
         $tempFilename = dirname($localFilename) . '/' . basename($localFilename, '.phar') . '-temp.phar';
 
@@ -92,7 +91,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $remotePharDownloadUrl = self::MAGERUN_DOWNLOAD_URL_STABLE;
         }
 
-        $response = Requests::get($versionTxtUrl, [], ['verify' => false]);
+        $response = Requests::get(
+            $versionTxtUrl,
+            [],
+            [
+                'verify' => true,
+            ]
+        );
 
         if (!$response->success) {
             throw new RuntimeException('Cannot get version: ' . $response->status_code);
@@ -162,7 +167,16 @@ private function downloadNewPhar(OutputInterface $output, string $remoteUrl, str
 
         $hooks = new Hooks();
 
-        $response = Requests::head($remoteUrl, [], ['verify' => false]);
+        $response = Requests::head(
+            $remoteUrl,
+            [],
+            [
+                'verify' => true,
+                'headers' => [
+                    'Accept-Encoding' => 'deflate, gzip, br, zstd'
+                ]
+            ]
+        );
 
         if (!$response->success) {
             throw new RuntimeException('Cannot download phar file: ' . $response->status_code);
@@ -183,7 +197,18 @@ function ($data, $responseBytes, $responseByteLimit) use ($progressBar) {
             }
         );
 
-        $response = Requests::get($remoteUrl, [], ['blocking' => true, 'hooks' => $hooks, 'verify' => false]);
+        $response = Requests::get(
+            $remoteUrl,
+            [],
+            [
+                'blocking' => true,
+                'hooks' => $hooks,
+                'verify' => true,
+                'headers' => [
+                    'Accept-Encoding' => 'deflate, gzip, br, zstd'
+                ]
+            ]
+        );
 
         if (!$response->success) {
             throw new RuntimeException('Cannot download phar file: ' . $response->status_code);
@@ -240,7 +265,17 @@ private function getChangelog(OutputInterface $output, $loadUnstable)
         } else {
             $changeLogUrl = self::CHANGELOG_DOWNLOAD_URL_STABLE;
         }
-        $response = Requests::get($changeLogUrl, [], ['verify' => false]);
+
+        $response = Requests::get(
+            $changeLogUrl,
+            [],
+            [
+                'verify' => true,
+                'headers' => [
+                    'Accept-Encoding' => 'deflate, gzip, br, zstd'
+                ]
+            ]
+        );
 
         if (!$response->success) {
             throw new RuntimeException('Cannot download changelog: ' . $response->status_code);