From f5f5260991473a9590095461e38e307976643e73 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Sun, 16 Oct 2022 17:05:07 +0100
Subject: [PATCH] #2370 - Adjust tests

---
 tests/Extension/ArrayAccessTest.php |  5 +++++
 tests/Extension/ArrayObjectTest.php | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/Extension/ArrayAccessTest.php b/tests/Extension/ArrayAccessTest.php
index 97a40d729e..edc90470cc 100644
--- a/tests/Extension/ArrayAccessTest.php
+++ b/tests/Extension/ArrayAccessTest.php
@@ -92,6 +92,11 @@ public function testIssue1094(): void
      */
     public function testIssue1086StaticallyCalledFunctionWithArrayAsArgMustReturnArray(): void
     {
+        if (version_compare(PHP_VERSION, '8.1.0', '>')) {
+            $this->markTestSkipped('Deprecated Callable Patterns');
+            return;
+        }
+
         $class = new \Stub\ArrayAccessTest();
 
         $actual = $class->issue1086WontNullArrayAfterPassViaStaticWithStrictParams();
diff --git a/tests/Extension/ArrayObjectTest.php b/tests/Extension/ArrayObjectTest.php
index c5dc6d3e4f..a4f90aacff 100644
--- a/tests/Extension/ArrayObjectTest.php
+++ b/tests/Extension/ArrayObjectTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Extension;
 
 use PHPUnit\Framework\TestCase;
@@ -23,8 +23,10 @@ public function testSetGet(): void
         $test = new ArrayObject();
         $this->assertInstanceOf('\ArrayObject', $test);
 
-        $test->test_1 = 1;
-        $this->assertSame(1, $test->test_1);
+        if (version_compare(PHP_VERSION, '8.2.0', '<')) {
+            $test->test_1 = 1;
+            $this->assertSame(1, $test->test_1);
+        }
 
         $test['test_2'] = 1;
         $this->assertSame(1, $test['test_2']);