Merge pull request #681 from lucatume/v4-3.5-fixes

v3.5 automated build fixes
lucatume · Dec 14, 2023 · 3ef32f8 · 3ef32f8
2 parents 4edec26 + ff87df6
commit 3ef32f8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/Adapters/Symfony/Component/Process/Process.php b/src/Adapters/Symfony/Component/Process/Process.php
@@ -79,4 +79,22 @@ public function createNewConsole(): void
         $options['bypass_shell'] = true;
         $optionsReflectionProperty->setValue($this, $options);
     }
+
+    /**
+     * @param array<mixed> $arguments
+     */
+    public static function __callStatic(string $name, array $arguments):mixed
+    {
+        if ($name === 'fromShellCommandline') {
+            $command = array_shift($arguments);
+            $process = new self([], ...$arguments); // @phpstan-ignore-line
+            $processCommandLineProperty = new \ReflectionProperty(SymfonyProcess::class, 'commandline');
+            $processCommandLineProperty->setAccessible(true);
+            $processCommandLineProperty->setValue($process, $command);
+
+            return $process;
+        }
+
+        return null;
+    }
 }
diff --git a/tests/Issue/BlogArchiveCest.php b/tests/Issue/BlogArchiveCest.php
diff --git a/tests/wploadersuite/AjaxTest.php b/tests/wploadersuite/AjaxTest.php
@@ -26,11 +26,15 @@ public function testAjaxCallbackWillFailIfNumberNotOnlyOnceIsInvalid(): void
     {
         $response = null;
         try {
+            global $wpdb;
+            $wpdb->suppress_errors = true; // Due to a WooCommerce activation issue in older versions.
             $this->_handleAjax('test_ajax_action');
         } catch (\WPAjaxDieContinueException) {
             $response = json_decode($this->_last_response);
         }
 
+        $wpdb->suppress_errors = false;
+
         $this->assertNotNull($response);
         $this->assertFalse($response->success);
         $this->assertEquals('Number not only once is invalid', $response->data);