Raise min version to PHP 7.3, check compatibility PHP 8.3.

yiisoft · Sep 27, 2023 · 1d3671a · 1d3671a
1 parent 2856c9e
commit 1d3671a
Show file tree

Hide file tree

Showing 30 changed files with 103 additions and 148 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,6 +1,26 @@
-name: build
+on:
+    pull_request:
+      paths-ignore:
+        - 'docs/**'
+        - 'README.md'
+        - 'CHANGELOG.md'
+        - '.gitignore'
+        - '.gitattributes'
+        - 'infection.json.dist'
+        - 'psalm.xml'
+
+    push:
+      branches: ['master']
+      paths-ignore:
+        - 'docs/**'
+        - 'README.md'
+        - 'CHANGELOG.md'
+        - '.gitignore'
+        - '.gitattributes'
+        - 'infection.json.dist'
+        - 'psalm.xml'
 
-on: [push, pull_request]
+name: build
 
 env:
     DEFAULT_COMPOSER_FLAGS: "--prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi"
@@ -18,7 +38,7 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-latest]
-                php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
+                php: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
                 mongo: ['3']
                 mongoext: ['1.8.2', '1.9.0']
 

diff --git a/composer.json b/composer.json
@@ -18,13 +18,12 @@
         }
     ],
     "require": {
-        "yiisoft/yii2": "~2.0.39",
+        "php": ">=7.3",
         "ext-mongodb": ">=1.0.0",
-        "paragonie/random_compat": ">=1"
+        "yiisoft/yii2": "~2.0.39"
     },
     "require-dev": {
-        "cweagans/composer-patches": "^1.7",
-        "phpunit/phpunit": "4.8.34"
+        "phpunit/phpunit": "^9.6"
     },
     "repositories": [
         {
@@ -38,22 +37,10 @@
     "extra": {
         "branch-alias": {
             "dev-master": "2.1.x-dev"
-        },
-        "composer-exit-on-patch-failure": true,
-        "patches": {
-            "phpunit/phpunit-mock-objects": {
-                "Fix PHP 7 and 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_mock_objects.patch"
-            },
-            "phpunit/phpunit": {
-                "Fix PHP 7 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php7.patch",
-                "Fix PHP 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php8.patch",
-                "Fix PHP 8.1 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php81.patch"
-            }
         }
     },
     "config": {
         "allow-plugins": {
-            "cweagans/composer-patches": true,
             "yiisoft/yii2-composer": true
         }
     }

diff --git a/tests/ActiveDataProviderTest.php b/tests/ActiveDataProviderTest.php
@@ -10,15 +10,15 @@
 
 class ActiveDataProviderTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->mockApplication();
         ActiveRecord::$db = $this->getConnection();
         $this->setUpTestRows();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection(Customer::collectionName());
         parent::tearDown();

diff --git a/tests/ActiveFixtureTest.php b/tests/ActiveFixtureTest.php
@@ -10,13 +10,13 @@
 
 class ActiveFixtureTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->mockApplication();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection(Customer::collectionName());
         FileHelper::removeDirectory(Yii::getAlias('@runtime/fixtures'));
@@ -163,4 +163,4 @@ class {$className} extends \yii\mongodb\ActiveFixture
         $rows = $this->findAll($this->getConnection()->getCollection(Customer::collectionName()));
         $this->assertCount(3, $rows);
     }
-}
+}
diff --git a/tests/ActiveRecordTest.php b/tests/ActiveRecordTest.php
@@ -19,14 +19,14 @@ class ActiveRecordTest extends TestCase
      */
     protected $testRows = [];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         ActiveRecord::$db = $this->getConnection();
         $this->setUpTestRows();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection(Customer::collectionName());
         parent::tearDown();
@@ -518,4 +518,4 @@ public function testEmulateExecution()
             ->distinct('name');
         $this->assertSame([], $values);
     }
-}
+}
diff --git a/tests/ActiveRelationTest.php b/tests/ActiveRelationTest.php
@@ -9,14 +9,14 @@
 
 class ActiveRelationTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         ActiveRecord::$db = $this->getConnection();
         $this->setUpTestRows();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection(Customer::collectionName());
         $this->dropCollection(CustomerOrder::collectionName());

diff --git a/tests/BatchQueryResultTest.php b/tests/BatchQueryResultTest.php
@@ -10,14 +10,14 @@
 
 class BatchQueryResultTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         ActiveRecord::$db = $this->getConnection();
         $this->setUpTestRows();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection(Customer::collectionName());
         $this->dropCollection(CustomerOrder::collectionName());
@@ -177,4 +177,4 @@ public function testActiveQuery()
         $this->assertEquals(2, count($customers[1]->orders));
         $this->assertEquals(2, count($customers[2]->orders));
     }
-}
+}
diff --git a/tests/CacheTest.php b/tests/CacheTest.php
@@ -12,7 +12,7 @@ class CacheTest extends TestCase
      */
     protected static $cacheCollection = '_test_cache';
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection(static::$cacheCollection);
         parent::tearDown();

diff --git a/tests/CollectionTest.php b/tests/CollectionTest.php
@@ -7,7 +7,7 @@
 
 class CollectionTest extends TestCase
 {
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection('customer');
         $this->dropCollection('mapReduceOut');

diff --git a/tests/CommandTest.php b/tests/CommandTest.php
@@ -8,7 +8,7 @@
 
 class CommandTest extends TestCase
 {
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection('customer');
         parent::tearDown();
@@ -343,7 +343,7 @@ public function testListCollections()
 
         $collections = $connection->createCommand()->listCollections();
         $collectionNames = ArrayHelper::getColumn($collections, 'name');
-        $this->assertContains('customer', $collectionNames);
+        $this->assertStringContainsString('customer', $collectionNames);
     }
 
     /**
@@ -372,4 +372,4 @@ public function testUpdateUpsert()
         $this->assertEquals(1, $result->getUpsertedCount());
         $this->assertEquals(2, $connection->createCommand()->count('customer'));
     }
-}
+}
diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
@@ -8,7 +8,7 @@
 
 class DatabaseTest extends TestCase
 {
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection('customer');
         $this->dropFileCollection('testfs');

diff --git a/tests/MigrationTest.php b/tests/MigrationTest.php
@@ -6,7 +6,7 @@
 
 class MigrationTest extends TestCase
 {
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection('customer');
         parent::tearDown();
@@ -132,4 +132,4 @@ protected function log($string)
     {
         $this->logs[] = $string;
     }
-}
+}
diff --git a/tests/QueryRunTest.php b/tests/QueryRunTest.php
@@ -7,13 +7,13 @@
 
 class QueryRunTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->setUpTestRows();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection('customer');
         parent::tearDown();
@@ -671,4 +671,4 @@ public function testAggregationShortcuts()
             ->average('status', $db);
         $this->assertEquals(6, $max);
     }
-}
+}
diff --git a/tests/SessionTest.php b/tests/SessionTest.php
@@ -13,7 +13,7 @@ class SessionTest extends TestCase
      */
     protected static $sessionCollection = '_test_session';
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->dropCollection(static::$sessionCollection);
         parent::tearDown();

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -24,7 +24,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
      */
     protected $mongodb;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (!extension_loaded('mongodb')) {
@@ -37,7 +37,7 @@ protected function setUp()
         //$this->mockApplication();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->mongodb) {
             $this->mongodb->close();
@@ -213,4 +213,4 @@ protected function invokeMethod($object, $method, $args = [])
         $method->setAccessible(true);
         return $method->invokeArgs($object, $args);
     }
-}
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -14,5 +14,3 @@
 
 Yii::setAlias('@yiiunit/extensions/mongodb', __DIR__);
 Yii::setAlias('@yii/mongodb', dirname(__DIR__) . '/src');
-
-require_once(__DIR__ . '/compatibility.php');
diff --git a/tests/compatibility.php b/tests/compatibility.php
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,5 +14,3 @@

		Yii::setAlias('@yiiunit/extensions/mongodb', __DIR__);
		Yii::setAlias('@yii/mongodb', dirname(__DIR__) . '/src');

		require_once(__DIR__ . '/compatibility.php');