feat: add replacements for deprecated assertContainsOnly() and assertsNoContainsOnly() + drop support for lib-asserts < 3.1 (#35)

Author: W0rma

composer.json

@@ -24,7 +24,7 @@
     "require": {
         "php": "^8.2",
         "codeception/codeception": "*@dev",
-        "codeception/lib-asserts": "^2.2 | ^3.0.1"
+        "codeception/lib-asserts": "^3.1"
     },
     "conflict": {
         "codeception/codeception": "<5.0"

src/Codeception/Module/AbstractAsserts.php

@@ -18,8 +18,35 @@ abstract class AbstractAsserts extends Module
         assertClassNotHasStaticAttribute as public;
         assertContains as public;
         assertContainsEquals as public;
+        assertContainsNotOnlyArray as public;
+        assertContainsNotOnlyBool as public;
+        assertContainsNotOnlyCallable as public;
+        assertContainsNotOnlyClosedResource as public;
+        assertContainsNotOnlyFloat as public;
+        assertContainsNotOnlyInstancesOf as public;
+        assertContainsNotOnlyInt as public;
+        assertContainsNotOnlyIterable as public;
+        assertContainsNotOnlyNull as public;
+        assertContainsNotOnlyNumeric as public;
+        assertContainsNotOnlyObject as public;
+        assertContainsNotOnlyResource as public;
+        assertContainsNotOnlyScalar as public;
+        assertContainsNotOnlyString as public;
         assertContainsOnly as public;
+        assertContainsOnlyArray as public;
+        assertContainsOnlyBool as public;
+        assertContainsOnlyCallable as public;
+        assertContainsOnlyClosedResource as public;
+        assertContainsOnlyFloat as public;
         assertContainsOnlyInstancesOf as public;
+        assertContainsOnlyInt as public;
+        assertContainsOnlyIterable as public;
+        assertContainsOnlyNull as public;
+        assertContainsOnlyNumeric as public;
+        assertContainsOnlyObject as public;
+        assertContainsOnlyResource as public;
+        assertContainsOnlyScalar as public;
+        assertContainsOnlyString as public;
         assertCount as public;
         assertDirectoryDoesNotExist as public;
         assertDirectoryExists as public;

tests/unit/Codeception/Module/AssertsTest.php

@@ -4,6 +4,7 @@
 
 namespace unit\Codeception\Module;
 
+use ArrayObject;
 use Codeception\Lib\ModuleContainer;
 use Codeception\Module\Asserts;
 use Codeception\PHPUnit\TestCase;
@@ -46,6 +47,11 @@ public function testCodeceptionAsserts()
 
     public function testPHPUnitAsserts()
     {
+        $closedResource = fopen(__FILE__, 'r');
+        fclose($closedResource);
+
+        $openendResource = fopen(__FILE__, 'r');
+
         $this->module->assertArrayHasKey('one', ['one' => 1, 'two' => 2]);
         $this->module->assertArrayNotHasKey('three', ['one' => 1, 'two' => 2]);
         $this->module->assertClassHasAttribute('foo', \Support\Data\DummyClass::class);
@@ -54,8 +60,36 @@ public function testPHPUnitAsserts()
         $this->module->assertClassNotHasStaticAttribute('staticBar', \Support\Data\DummyClass::class);
         $this->module->assertContains(1, [1, 2]);
         $this->module->assertContainsEquals(2, [1, 2]);
+        $this->module->assertContainsNotOnlyArray([['foo'], 'foo', ['bar']]);
+        $this->module->assertContainsNotOnlyBool([true, false, true, 42]);
+        $this->module->assertContainsNotOnlyCallable([fn() => 'foo', 'bar', fn() => 'bar']);
+        $this->module->assertContainsNotOnlyClosedResource([$closedResource, $openendResource]);
+        $this->module->assertContainsNotOnlyFloat([1.1, 1.42, 5]);
+        $this->module->assertContainsNotOnlyInstancesOf(\Support\Data\DummyClass::class, [new \Support\Data\DummyClass(), new stdClass(), new \Support\Data\DummyClass()]);
+        $this->module->assertContainsNotOnlyInt([1, 42, 42.1]);
+        $this->module->assertContainsNotOnlyIterable([['foo'], 'bar', [new ArrayObject(['foo'])]]);
+        $this->module->assertContainsNotOnlyNull([null, 42]);
+        $this->module->assertContainsNotOnlyNumeric(['foo', 42]);
+        $this->module->assertContainsNotOnlyObject([new stdClass(), []]);
+        $this->module->assertContainsNotOnlyResource([$openendResource, $closedResource, 'foo']);
+        $this->module->assertContainsNotOnlyScalar([1, new stdClass()]);
+        $this->module->assertContainsNotOnlyString(['foo', 42, 'bar']);
         $this->module->assertContainsOnly(\Support\Data\DummyClass::class, [new \Support\Data\DummyClass(), new \Support\Data\DummyClass()]);
+        $this->module->assertContainsOnly('integer', [5, 6]);
+        $this->module->assertContainsOnlyArray([['foo'], ['bar']]);
+        $this->module->assertContainsOnlyBool([true, false, true]);
+        $this->module->assertContainsOnlyCallable([fn() => 'foo', fn() => 'bar']);
+        $this->module->assertContainsOnlyClosedResource([$closedResource]);
+        $this->module->assertContainsOnlyFloat([1.1, 1.42]);
         $this->module->assertContainsOnlyInstancesOf(\Support\Data\DummyClass::class, [new \Support\Data\DummyClass(), new \Support\Data\DummyClass()]);
+        $this->module->assertContainsOnlyInt([1, 42]);
+        $this->module->assertContainsOnlyIterable([['foo'], [new ArrayObject(['foo'])]]);
+        $this->module->assertContainsOnlyNull([null, null]);
+        $this->module->assertContainsOnlyNumeric(['42.5', 42]);
+        $this->module->assertContainsOnlyObject([new stdClass(), new ArrayObject(['bar'])]);
+        $this->module->assertContainsOnlyResource([$openendResource, $closedResource]);
+        $this->module->assertContainsOnlyScalar([1, 'foo']);
+        $this->module->assertContainsOnlyString(['foo', 'bar']);
         $this->module->assertCount(3, [1, 2, 3]);
         $this->module->assertDirectoryDoesNotExist(__DIR__.'notExist');
         $this->module->assertDirectoryExists(__DIR__);
@@ -91,16 +125,13 @@ public function testPHPUnitAsserts()
         $this->module->assertIsArray([1, 2, 3]);
         $this->module->assertIsBool(true);
         $this->module->assertIsCallable(function() {});
-        $closedResource = fopen(__FILE__, 'r');
-        fclose($closedResource);
         $this->module->assertIsClosedResource($closedResource);
         $this->module->assertIsFloat(1.2);
         $this->module->assertIsInt(2);
         $this->module->assertIsIterable([]);
         $this->module->assertIsNotArray(false);
         $this->module->assertIsNotBool([1, 2, 3]);
         $this->module->assertIsNotCallable('test');
-        $openendResource = fopen(__FILE__, 'r');
         $this->module->assertIsNotClosedResource($openendResource);
         $this->module->assertIsNotFloat(false);
         $this->module->assertIsNotInt(false);
@@ -133,6 +164,7 @@ public function testPHPUnitAsserts()
         $this->module->assertNotContains('three', ['one', 'two']);
         $this->module->assertNotContainsEquals(3, [1, 2]);
         $this->module->assertNotContainsOnly(\Support\Data\DummyClass::class, [new \Support\Data\DummyClass(), new Exception()]);
+        $this->module->assertNotContainsOnly('integer', [1, 42, 42.1]);
         $this->module->assertNotCount(1, ['one', 'two']);
         $this->module->assertNotEmpty([1]);
         $this->module->assertNotEquals(true, false);