Fix problem

m3m0r7 · Dec 25, 2023 · c335afb · c335afb
1 parent ec08043
commit c335afb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/VM/Core/Runtime/RubyVM.php b/src/VM/Core/Runtime/RubyVM.php
@@ -27,13 +27,13 @@ public function __construct(public readonly Option $option)
     {
         // Register default kernels
         $this->register(
-            rubyVersion: RubyVersion::VERSION_3_2,
-            kernelClass: \RubyVM\VM\Core\Runtime\Kernel\Ruby3_2\Kernel::class,
+            rubyVersion: RubyVersion::VERSION_3_3,
+            kernelClass: \RubyVM\VM\Core\Runtime\Kernel\Ruby3_3\Kernel::class,
         );
 
         $this->register(
-            rubyVersion: RubyVersion::VERSION_3_3,
-            kernelClass: \RubyVM\VM\Core\Runtime\Kernel\Ruby3_3\Kernel::class,
+            rubyVersion: RubyVersion::VERSION_3_2,
+            kernelClass: \RubyVM\VM\Core\Runtime\Kernel\Ruby3_2\Kernel::class,
         );
     }
 

diff --git a/tests/Helper/TestApplication.php b/tests/Helper/TestApplication.php
@@ -15,14 +15,25 @@
  */
 class TestApplication extends TestCase
 {
+    protected int $major = -1;
+    protected int $minor = -1;
+    protected int $patch = -1;
+
     protected function createRubyVMFromCode(string $code, string $extraData = '', string $binaryPath = 'ruby'): RubyVMManager
     {
         $handle = tmpfile();
         if ($handle === false) {
             throw new \RuntimeException('tmpfile did not created');
         }
 
-        [$major, $minor, $patch] = sscanf(exec("{$binaryPath} -v"), 'ruby %d.%d.%d');
+        if ($this->major !== -1) {
+            $version = sscanf(exec("{$binaryPath} -v") ?: 'ruby 3.2.0', 'ruby %d.%d.%d');
+            if (!is_array($version)) {
+                throw new \RuntimeException('The version is incorrect6');
+            }
+
+            [$this->major, $this->minor, $this->patch] = $version;
+        }
 
         fwrite($handle, $code);
         $uri = stream_get_meta_data($handle)['uri'];
@@ -62,7 +73,7 @@ protected function createRubyVMFromCode(string $code, string $extraData = '', st
         );
 
         $rubyVM->setDefaultVersion(
-            RubyVersion::from("{$major}.{$minor}"),
+            RubyVersion::from("{$this->major}.{$this->minor}"),
         );
 
         return new RubyVMManager(

diff --git a/tests/Version/RubyVM/YARB/YARBStructureTest.php b/tests/Version/RubyVM/YARB/YARBStructureTest.php
@@ -21,7 +21,7 @@ public function testHeader(): void
             _,
         );
         $rubyVMManager->rubyVM->runtime()->setup();
-        $this->assertSame('3.2', $rubyVMManager->rubyVM->runtime()->rubyVersion());
+        $this->assertSame("{$this->major}.{$this->minor}", $rubyVMManager->rubyVM->runtime()->rubyVersion());
         if ($this->isCI()) {
             $this->assertSame('x86_64-linux', $rubyVMManager->rubyVM->runtime()->rubyPlatform());
         } else {