mirror of
https://github.com/codeigniter4/CodeIgniter4.git
synced 2025-02-20 11:44:28 +08:00
All instances created with new keyword must be followed by braces.
This commit is contained in:
parent
58dbb2b436
commit
1b0fa3507c
@ -475,7 +475,7 @@ class Toolbar
|
||||
break;
|
||||
|
||||
case 'xml':
|
||||
$formatter = new XMLFormatter;
|
||||
$formatter = new XMLFormatter();
|
||||
$output = $formatter->format($data);
|
||||
break;
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ class JsonCast extends BaseCast
|
||||
{
|
||||
$associative = in_array('array', $params, true);
|
||||
|
||||
$tmp = ! is_null($value) ? ($associative ? [] : new stdClass) : null;
|
||||
$tmp = ! is_null($value) ? ($associative ? [] : new stdClass()) : null;
|
||||
|
||||
if (function_exists('json_decode')
|
||||
&& (
|
||||
|
@ -101,7 +101,7 @@ class MockResult extends BaseResult
|
||||
*/
|
||||
protected function fetchObject($className = 'stdClass')
|
||||
{
|
||||
return new $className;
|
||||
return new $className();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
|
@ -26,7 +26,7 @@ class BaseHandlerTest extends CIUnitTestCase
|
||||
[false],
|
||||
[null],
|
||||
[42],
|
||||
[new stdClass],
|
||||
[new stdClass()],
|
||||
];
|
||||
}
|
||||
|
||||
|
@ -41,12 +41,12 @@ class CommonFunctionsTest extends CIUnitTestCase
|
||||
{
|
||||
$this->assertEquals(' class="foo" id="bar"', stringify_attributes(['class' => 'foo', 'id' => 'bar']));
|
||||
|
||||
$atts = new stdClass;
|
||||
$atts = new stdClass();
|
||||
$atts->class = 'foo';
|
||||
$atts->id = 'bar';
|
||||
$this->assertEquals(' class="foo" id="bar"', stringify_attributes($atts));
|
||||
|
||||
$atts = new stdClass;
|
||||
$atts = new stdClass();
|
||||
$this->assertEquals('', stringify_attributes($atts));
|
||||
|
||||
$this->assertEquals(' class="foo" id="bar"', stringify_attributes('class="foo" id="bar"'));
|
||||
@ -58,7 +58,7 @@ class CommonFunctionsTest extends CIUnitTestCase
|
||||
{
|
||||
$this->assertEquals('width=800,height=600', stringify_attributes(['width' => '800', 'height' => '600'], true));
|
||||
|
||||
$atts = new stdClass;
|
||||
$atts = new stdClass();
|
||||
$atts->width = 800;
|
||||
$atts->height = 600;
|
||||
$this->assertEquals('width=800,height=600', stringify_attributes($atts, true));
|
||||
|
@ -227,7 +227,7 @@ class WhereTest extends CIUnitTestCase
|
||||
return [
|
||||
'null' => [null],
|
||||
'not array' => ['not array'],
|
||||
'not instanceof \Closure' => [new stdClass],
|
||||
'not instanceof \Closure' => [new stdClass()],
|
||||
];
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,7 @@ class DatabaseSeederTest extends CIUnitTestCase
|
||||
{
|
||||
$this->expectException('InvalidArgumentException');
|
||||
|
||||
$config = new Database;
|
||||
$config = new Database();
|
||||
$config->filesPath = APPPATH . 'Foo';
|
||||
new Seeder($config);
|
||||
}
|
||||
|
@ -239,7 +239,7 @@ class GetTest extends CIUnitTestCase
|
||||
|
||||
public function testGetRowWithCustomReturnType()
|
||||
{
|
||||
$testClass = new class { };
|
||||
$testClass = new class() {};
|
||||
|
||||
$user = $this->db->table('user')->get()->getRow(0, get_class($testClass));
|
||||
|
||||
|
@ -17,7 +17,7 @@ class MigrationTest extends CIUnitTestCase
|
||||
|
||||
public function testDBGroup()
|
||||
{
|
||||
$migration = new class extends Migration {
|
||||
$migration = new class() extends Migration {
|
||||
protected $DBGroup = 'tests';
|
||||
|
||||
public function up()
|
||||
|
@ -810,7 +810,7 @@ class EntityTest extends CIUnitTestCase
|
||||
|
||||
public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
|
||||
{
|
||||
$entity = new class extends Entity {
|
||||
$entity = new class() extends Entity {
|
||||
protected $attributes = [
|
||||
'_foo' => null,
|
||||
'bar' => null,
|
||||
@ -979,7 +979,7 @@ class EntityTest extends CIUnitTestCase
|
||||
|
||||
protected function getEntity() : Entity
|
||||
{
|
||||
return new class extends Entity {
|
||||
return new class() extends Entity {
|
||||
protected $attributes = [
|
||||
'foo' => null,
|
||||
'bar' => null,
|
||||
@ -1019,7 +1019,7 @@ class EntityTest extends CIUnitTestCase
|
||||
|
||||
protected function getMappedEntity() : Entity
|
||||
{
|
||||
return new class extends Entity {
|
||||
return new class() extends Entity {
|
||||
protected $attributes = [
|
||||
'foo' => null,
|
||||
'simple' => null,
|
||||
@ -1050,7 +1050,7 @@ class EntityTest extends CIUnitTestCase
|
||||
|
||||
protected function getSwappedEntity() : Entity
|
||||
{
|
||||
return new class extends Entity {
|
||||
return new class() extends Entity {
|
||||
protected $attributes = [
|
||||
'foo' => 'foo',
|
||||
'bar' => 'bar',
|
||||
@ -1130,7 +1130,7 @@ class EntityTest extends CIUnitTestCase
|
||||
|
||||
protected function getCastNullableEntity() : Entity
|
||||
{
|
||||
return new class extends Entity {
|
||||
return new class() extends Entity {
|
||||
protected $attributes = [
|
||||
'string_null' => null,
|
||||
'string_empty' => null,
|
||||
@ -1160,7 +1160,7 @@ class EntityTest extends CIUnitTestCase
|
||||
|
||||
protected function getCustomCastEntity() : Entity
|
||||
{
|
||||
return new class extends Entity {
|
||||
return new class() extends Entity {
|
||||
protected $attributes = [
|
||||
'first' => null,
|
||||
'second' => null,
|
||||
|
@ -156,7 +156,7 @@ class HeaderTest extends CIUnitTestCase
|
||||
public function testHeaderLineValueNotStringOrArray()
|
||||
{
|
||||
$name = 'foo';
|
||||
$value = new stdClass;
|
||||
$value = new stdClass();
|
||||
|
||||
$expected = '';
|
||||
|
||||
|
@ -38,7 +38,7 @@ class ImageMagickHandlerTest extends CIUnitTestCase
|
||||
|
||||
$this->path = $this->origin . 'ci-logo.png';
|
||||
|
||||
$handlerConfig = new Images;
|
||||
$handlerConfig = new Images();
|
||||
$handlerConfig->libraryPath = '/usr/bin/convert';
|
||||
$this->handler = Services::image('imagick', $handlerConfig, false);
|
||||
}
|
||||
|
@ -98,7 +98,7 @@ final class GeneralModelTest extends CIUnitTestCase
|
||||
'updated_at',
|
||||
];
|
||||
|
||||
$model = new class extends Model {
|
||||
$model = new class() extends Model {
|
||||
protected $allowedFields = [
|
||||
'id',
|
||||
'created_at',
|
||||
@ -141,7 +141,7 @@ final class GeneralModelTest extends CIUnitTestCase
|
||||
|
||||
public function testInitialize(): void
|
||||
{
|
||||
$model = new class extends Model {
|
||||
$model = new class() extends Model {
|
||||
|
||||
/**
|
||||
* @var bool
|
||||
|
@ -145,7 +145,7 @@ final class InsertModelTest extends LiveModelTestCase
|
||||
|
||||
public function testInsertBatchNewEntityWithDateTime(): void
|
||||
{
|
||||
$entity = new class extends Entity {
|
||||
$entity = new class() extends Entity {
|
||||
protected $id;
|
||||
protected $name;
|
||||
protected $email;
|
||||
@ -203,7 +203,7 @@ final class InsertModelTest extends LiveModelTestCase
|
||||
{
|
||||
$this->createModel(UserModel::class);
|
||||
|
||||
$entity = new class extends Entity {
|
||||
$entity = new class() extends Entity {
|
||||
protected $id;
|
||||
protected $name;
|
||||
protected $email;
|
||||
|
@ -196,7 +196,7 @@ final class SaveModelTest extends LiveModelTestCase
|
||||
|
||||
public function testSaveNewEntityWithDateTime(): void
|
||||
{
|
||||
$entity = new class extends Entity {
|
||||
$entity = new class() extends Entity {
|
||||
protected $id;
|
||||
protected $name;
|
||||
protected $email;
|
||||
@ -230,7 +230,7 @@ final class SaveModelTest extends LiveModelTestCase
|
||||
|
||||
public function testSaveNewEntityWithDate(): void
|
||||
{
|
||||
$entity = new class extends Entity {
|
||||
$entity = new class() extends Entity {
|
||||
protected $id;
|
||||
protected $name;
|
||||
protected $created_at;
|
||||
@ -246,7 +246,7 @@ final class SaveModelTest extends LiveModelTestCase
|
||||
];
|
||||
};
|
||||
|
||||
$testModel = new class extends Model {
|
||||
$testModel = new class() extends Model {
|
||||
protected $table = 'empty';
|
||||
protected $allowedFields = [
|
||||
'name',
|
||||
|
@ -146,7 +146,7 @@ final class UpdateModelTest extends LiveModelTestCase
|
||||
|
||||
public function testUpdateBatchWithEntity(): void
|
||||
{
|
||||
$entity1 = new class extends Entity {
|
||||
$entity1 = new class() extends Entity {
|
||||
protected $id;
|
||||
protected $name;
|
||||
protected $email;
|
||||
@ -166,7 +166,7 @@ final class UpdateModelTest extends LiveModelTestCase
|
||||
];
|
||||
};
|
||||
|
||||
$entity2 = new class extends Entity {
|
||||
$entity2 = new class() extends Entity {
|
||||
protected $id;
|
||||
protected $name;
|
||||
protected $email;
|
||||
@ -295,7 +295,7 @@ final class UpdateModelTest extends LiveModelTestCase
|
||||
{
|
||||
$this->createModel(UserModel::class);
|
||||
|
||||
$entity = new class extends Entity {
|
||||
$entity = new class() extends Entity {
|
||||
protected $id;
|
||||
protected $name;
|
||||
protected $email;
|
||||
|
@ -274,13 +274,13 @@ class ResourceControllerTest extends CIUnitTestCase
|
||||
{
|
||||
$resource = new MockResourceController();
|
||||
|
||||
$config = new App;
|
||||
$uri = new URI;
|
||||
$agent = new UserAgent;
|
||||
$config = new App();
|
||||
$uri = new URI();
|
||||
$agent = new UserAgent();
|
||||
|
||||
$request = new IncomingRequest($config, $uri, '', $agent);
|
||||
$response = new Response($config);
|
||||
$logger = new NullLogger;
|
||||
$logger = new NullLogger();
|
||||
|
||||
$resource->initController($request, $response, $logger);
|
||||
$resource->setFormat('json');
|
||||
@ -292,7 +292,7 @@ class ResourceControllerTest extends CIUnitTestCase
|
||||
$theResponse = $resource->respond($data);
|
||||
$result = $theResponse->getBody();
|
||||
|
||||
$JSONFormatter = new JSONFormatter;
|
||||
$JSONFormatter = new JSONFormatter();
|
||||
$expected = $JSONFormatter->format($data);
|
||||
|
||||
$this->assertEquals($expected, $result);
|
||||
@ -303,13 +303,13 @@ class ResourceControllerTest extends CIUnitTestCase
|
||||
{
|
||||
$resource = new MockResourceController();
|
||||
|
||||
$config = new App;
|
||||
$uri = new URI;
|
||||
$agent = new UserAgent;
|
||||
$config = new App();
|
||||
$uri = new URI();
|
||||
$agent = new UserAgent();
|
||||
|
||||
$request = new IncomingRequest($config, $uri, '', $agent);
|
||||
$response = new Response($config);
|
||||
$logger = new NullLogger;
|
||||
$logger = new NullLogger();
|
||||
|
||||
$resource->initController($request, $response, $logger);
|
||||
$resource->setFormat('xml');
|
||||
@ -321,7 +321,7 @@ class ResourceControllerTest extends CIUnitTestCase
|
||||
$theResponse = $resource->respond($data);
|
||||
$result = $theResponse->getBody();
|
||||
|
||||
$XMLFormatter = new XMLFormatter;
|
||||
$XMLFormatter = new XMLFormatter();
|
||||
$expected = $XMLFormatter->format($data);
|
||||
|
||||
$this->assertEquals($expected, $result);
|
||||
|
@ -32,7 +32,7 @@ class RouterTest extends CIUnitTestCase
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
$moduleConfig = new Modules;
|
||||
$moduleConfig = new Modules();
|
||||
$moduleConfig->enabled = false;
|
||||
$this->collection = new RouteCollection(Services::locator(), $moduleConfig);
|
||||
|
||||
|
@ -268,7 +268,7 @@ class ParserTest extends CIUnitTestCase
|
||||
|
||||
public function testParseLoopEntityProperties()
|
||||
{
|
||||
$power = new class extends Entity {
|
||||
$power = new class() extends Entity {
|
||||
public $foo = 'bar';
|
||||
protected $bar = 'baz';
|
||||
|
||||
@ -298,7 +298,7 @@ class ParserTest extends CIUnitTestCase
|
||||
|
||||
public function testParseLoopEntityObjectProperties()
|
||||
{
|
||||
$power = new class extends Entity {
|
||||
$power = new class() extends Entity {
|
||||
protected $attributes = [
|
||||
'foo' => 'bar',
|
||||
'bar' => 'baz',
|
||||
|
@ -119,6 +119,7 @@ final class CodeIgniter4 extends AbstractRuleset
|
||||
'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
|
||||
'native_function_casing' => true,
|
||||
'native_function_type_declaration_casing' => true,
|
||||
'new_with_braces' => true,
|
||||
'no_alias_functions' => ['sets' => ['@all']],
|
||||
'no_short_bool_cast' => true,
|
||||
'no_trailing_comma_in_singleline_array' => true,
|
||||
|
Loading…
x
Reference in New Issue
Block a user