Skip to content

Commit dd4d11d

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.4
2 parents 2dac3a8 + ccd52d1 commit dd4d11d

File tree

5 files changed

+20
-23
lines changed

5 files changed

+20
-23
lines changed

tests/system/ControllerTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
use Config\Services;
2424
use Config\Validation as ValidationConfig;
2525
use Psr\Log\LoggerInterface;
26-
use Tests\Support\Config\Validation;
2726

2827
/**
2928
* Exercise our core Controller class.

tests/system/Database/Live/SQLite/AlterTableTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace CodeIgniter\Database\Live\SQLite;
1313

1414
use CodeIgniter\Database\Exceptions\DataException;
15-
use CodeIgniter\Database\SQLite3\Connection;
1615
use CodeIgniter\Database\SQLite3\Forge;
1716
use CodeIgniter\Database\SQLite3\Table;
1817
use CodeIgniter\Test\CIUnitTestCase;

tests/system/I18n/TimeLegacyTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,16 +1125,16 @@ public function testGetter()
11251125
}
11261126

11271127
// @TODO Uncomment when PHP 8.2.4 Segmentation fault fixed.
1128-
// public function testUnserializeTimeObject()
1129-
// {
1130-
// $time1 = new TimeLegacy('August 28, 2020 10:04:00pm', 'Asia/Manila', 'en');
1131-
// $timeCache = serialize($time1);
1132-
// $time2 = unserialize($timeCache);
1133-
//
1134-
// $this->assertInstanceOf(TimeLegacy::class, $time2);
1135-
// $this->assertTrue($time2->equals($time1));
1136-
// $this->assertNotSame($time1, $time2);
1137-
// }
1128+
// public function testUnserializeTimeObject()
1129+
// {
1130+
// $time1 = new TimeLegacy('August 28, 2020 10:04:00pm', 'Asia/Manila', 'en');
1131+
// $timeCache = serialize($time1);
1132+
// $time2 = unserialize($timeCache);
1133+
//
1134+
// $this->assertInstanceOf(TimeLegacy::class, $time2);
1135+
// $this->assertTrue($time2->equals($time1));
1136+
// $this->assertNotSame($time1, $time2);
1137+
// }
11381138

11391139
public function testSetTestNowWithFaLocale()
11401140
{

tests/system/I18n/TimeTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,16 +1128,16 @@ public function testGetter()
11281128
}
11291129

11301130
// @TODO Uncomment when PHP 8.2.4 Segmentation fault fixed.
1131-
// public function testUnserializeTimeObject()
1132-
// {
1133-
// $time1 = new Time('August 28, 2020 10:04:00pm', 'Asia/Manila', 'en');
1134-
// $timeCache = serialize($time1);
1135-
// $time2 = unserialize($timeCache);
1136-
//
1137-
// $this->assertInstanceOf(Time::class, $time2);
1138-
// $this->assertTrue($time2->equals($time1));
1139-
// $this->assertNotSame($time1, $time2);
1140-
// }
1131+
// public function testUnserializeTimeObject()
1132+
// {
1133+
// $time1 = new Time('August 28, 2020 10:04:00pm', 'Asia/Manila', 'en');
1134+
// $timeCache = serialize($time1);
1135+
// $time2 = unserialize($timeCache);
1136+
//
1137+
// $this->assertInstanceOf(Time::class, $time2);
1138+
// $this->assertTrue($time2->equals($time1));
1139+
// $this->assertNotSame($time1, $time2);
1140+
// }
11411141

11421142
public function testSetTestNowWithTimeZone()
11431143
{

tests/system/Session/Handlers/Database/RedisHandlerTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use CodeIgniter\Test\CIUnitTestCase;
1717
use Config\App as AppConfig;
1818
use Config\Session as SessionConfig;
19-
use Redis;
2019

2120
/**
2221
* @group DatabaseLive

0 commit comments

Comments
 (0)