Signed-off-by: Katsuki Shuto <stk2k@sazysoft.com>

stk2k · Jun 5, 2021 · 0f9e216 · 0f9e216
1 parent b66af39
commit 0f9e216
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/test/ArrayListTest.php b/test/ArrayListTest.php
@@ -218,9 +218,14 @@ public function testSort()
 
         $list = new ArrayList([12, 3, -1, 0, 4, 1.2, 'kiwi', 'apple']);
         $ret = $list->sort();
-        print_r($list->toArray());
-        $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $list->toArray());
-        $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $ret->toArray());
+        if (version_compare(PHP_VERSION, '8.0.0') >= 0) {
+            $this->assertSame([-1, 0, 1.2, 3, 4, 12, 'apple', 'kiwi'], $list->toArray());
+            $this->assertSame([-1, 0, 1.2, 3, 4, 12, 'apple', 'kiwi'], $ret->toArray());
+        }
+        else{
+            $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $list->toArray());
+            $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $ret->toArray());
+        }
         $this->assertInstanceOf(ArrayList::class, $ret);
 
         $list = new ArrayList([12, 3, -1, 0, 4, 1.2, 'kiwi', 'apple']);

diff --git a/test/QueueTest.php b/test/QueueTest.php
@@ -47,8 +47,14 @@ public function testSort()
 
         $queue = new Queue([12, 3, -1, 0, 4, 1.2, 'kiwi', 'apple']);
         $ret = $queue->sort();
-        $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $queue->toArray());
-        $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $ret->toArray());
+        if (version_compare(PHP_VERSION, '8.0.0') >= 0) {
+            $this->assertSame([-1, 0, 1.2, 3, 4, 12, 'apple', 'kiwi'], $queue->toArray());
+            $this->assertSame([-1, 0, 1.2, 3, 4, 12, 'apple', 'kiwi'], $ret->toArray());
+        }
+        else{
+            $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $queue->toArray());
+            $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $ret->toArray());
+        }
         $this->assertInstanceOf(Queue::class, $ret);
 
         $queue = new Queue([12, 3, -1, 0, 4, 1.2, 'kiwi', 'apple']);

diff --git a/test/StackTest.php b/test/StackTest.php
@@ -98,8 +98,14 @@ public function testSort()
 
         $list = new Stack([12, 3, -1, 0, 4, 1.2, 'kiwi', 'apple']);
         $ret = $list->sort();
-        $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $list->toArray());
-        $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $ret->toArray());
+        if (version_compare(PHP_VERSION, '8.0.0') >= 0) {
+            $this->assertSame([-1, 0, 1.2, 3, 4, 12, 'apple', 'kiwi'], $list->toArray());
+            $this->assertSame([-1, 0, 1.2, 3, 4, 12, 'apple', 'kiwi'], $ret->toArray());
+        }
+        else{
+            $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $list->toArray());
+            $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $ret->toArray());
+        }
         $this->assertInstanceOf(Stack::class, $ret);
 
         $list = new Stack([12, 3, -1, 0, 4, 1.2, 'kiwi', 'apple']);

diff --git a/test/VectorTest.php b/test/VectorTest.php
@@ -290,8 +290,14 @@ public function testSort()
 
         $vec = new Vector([12, 3, -1, 0, 4, 1.2, 'kiwi', 'apple']);
         $ret = $vec->sort();
-        $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $vec->toArray());
-        $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $ret->toArray());
+        if (version_compare(PHP_VERSION, '8.0.0') >= 0) {
+            $this->assertSame([-1, 0, 1.2, 3, 4, 12, 'apple', 'kiwi'], $vec->toArray());
+            $this->assertSame([-1, 0, 1.2, 3, 4, 12, 'apple', 'kiwi'], $ret->toArray());
+        }
+        else{
+            $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $vec->toArray());
+            $this->assertSame([-1, 0, 'apple', 'kiwi', 1.2, 3, 4, 12], $ret->toArray());
+        }
         $this->assertInstanceOf(Vector::class, $ret);
 
         $vec = new Vector([12, 3, -1, 0, 4, 1.2, 'kiwi', 'apple']);