Skip to content

Commit b0978fb

Browse files
MGatnerMGatner
authored
Merge pull request #4999 from paulbalandan/space-after-comment-start-fixer
2 parents 77b7910 + dcb54b3 commit b0978fb

26 files changed

+216
-107
lines changed

‎.no-header.php-cs-fixer.dist.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Nexus\CsConfig\Factory;
1515
use PhpCsFixer\Finder;
1616
use Utils\PhpCsFixer\CodeIgniter4;
17+
use Utils\PhpCsFixer\Fixer\Comment\SpaceAfterCommentStartFixer;
1718

1819
$finder = Finder::create()
1920
->files()
@@ -26,8 +27,14 @@
2627
$overrides = [];
2728

2829
$options = [
29-
'cacheFile' => 'build/.no-header.php-cs-fixer.cache',
30-
'finder' => $finder,
30+
'cacheFile' => 'build/.no-header.php-cs-fixer.cache',
31+
'finder' => $finder,
32+
'customFixers' => [
33+
new SpaceAfterCommentStartFixer(),
34+
],
35+
'customRules' => [
36+
'CodeIgniter4/space_after_comment_start' => true,
37+
],
3138
];
3239

3340
return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();

‎.php-cs-fixer.dist.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Nexus\CsConfig\Factory;
1515
use PhpCsFixer\Finder;
1616
use Utils\PhpCsFixer\CodeIgniter4;
17+
use Utils\PhpCsFixer\Fixer\Comment\SpaceAfterCommentStartFixer;
1718

1819
$finder = Finder::create()
1920
->files()
@@ -34,8 +35,14 @@
3435
$overrides = [];
3536

3637
$options = [
37-
'cacheFile' => 'build/.php-cs-fixer.cache',
38-
'finder' => $finder,
38+
'cacheFile' => 'build/.php-cs-fixer.cache',
39+
'finder' => $finder,
40+
'customFixers' => [
41+
new SpaceAfterCommentStartFixer(),
42+
],
43+
'customRules' => [
44+
'CodeIgniter4/space_after_comment_start' => true,
45+
],
3946
];
4047

4148
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(

‎system/BaseModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1327,7 +1327,7 @@ public function validate($data): bool
13271327
return true;
13281328
}
13291329

1330-
//Validation requires array, so cast away.
1330+
// Validation requires array, so cast away.
13311331
if (is_object($data)) {
13321332
$data = (array) $data;
13331333
}

‎system/Cache/Handlers/MemcachedHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public function decrement(string $key, int $offset = 1)
220220

221221
$key = static::validateKey($key, $this->prefix);
222222

223-
//FIXME: third parameter isn't other handler actions.
223+
// FIXME: third parameter isn't other handler actions.
224224
// @phpstan-ignore-next-line
225225
return $this->memcached->decrement($key, $offset, $offset, 60);
226226
}

‎system/Common.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -978,8 +978,8 @@ function single_service(string $name, ...$params)
978978
}
979979

980980
if (! function_exists('slash_item')) {
981-
//Unlike CI3, this function is placed here because
982-
//it's not a config, or part of a config.
981+
// Unlike CI3, this function is placed here because
982+
// it's not a config, or part of a config.
983983
/**
984984
* Fetch a config file item with slash appended (if not empty)
985985
*

‎system/Database/BaseConnection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ abstract public function reconnect();
461461
*/
462462
public function getConnection(?string $alias = null)
463463
{
464-
//@todo work with read/write connections
464+
// @todo work with read/write connections
465465
return $this->connID;
466466
}
467467

‎system/Debug/Exceptions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function __construct(ExceptionsConfig $config, IncomingRequest $request,
8585
*/
8686
public function initialize()
8787
{
88-
//Set the Exception Handler
88+
// Set the Exception Handler
8989
set_exception_handler([$this, 'exceptionHandler']);
9090

9191
// Set the Error Handler

‎system/Entity/Entity.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ protected function castAs($value, string $attribute, string $method = 'get')
353353
$type = substr($type, 1);
354354
}
355355

356-
//In order not to create a separate handler for the
356+
// In order not to create a separate handler for the
357357
// json-array type, we transform the required one.
358358
$type = $type === 'json-array' ? 'json[array]' : $type;
359359

@@ -363,7 +363,7 @@ protected function castAs($value, string $attribute, string $method = 'get')
363363

364364
$params = [];
365365

366-
//Attempt to retrieve additional parameters if specified
366+
// Attempt to retrieve additional parameters if specified
367367
// type[param, param2,param3]
368368
if (preg_match('/^(.+)\[(.+)\]$/', $type, $matches)) {
369369
$type = $matches[1];

‎system/HTTP/Files/UploadedFile.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function __construct(string $path, string $originalName, ?string $mimeTyp
127127
public function move(string $targetPath, ?string $name = null, bool $overwrite = false)
128128
{
129129
$targetPath = rtrim($targetPath, '/') . '/';
130-
$targetPath = $this->setPath($targetPath); //set the target path
130+
$targetPath = $this->setPath($targetPath); // set the target path
131131

132132
if ($this->hasMoved) {
133133
throw HTTPException::forAlreadyMoved();
@@ -169,7 +169,7 @@ protected function setPath(string $path): string
169169
{
170170
if (! is_dir($path)) {
171171
mkdir($path, 0777, true);
172-
//create the index.html file
172+
// create the index.html file
173173
if (! is_file($path . 'index.html')) {
174174
$file = fopen($path . 'index.html', 'x+b');
175175
fclose($file);

‎system/Helpers/inflector_helper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function singular(string $string): string
2727
return $result;
2828
}
2929

30-
//Arranged in order.
30+
// Arranged in order.
3131
$singularRules = [
3232
'/(matr)ices$/' => '\1ix',
3333
'/(vert|ind)ices$/' => '\1ex',

‎system/Router/RouteCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,7 @@ static function ($m) use ($i) {
11551155
$from = str_ireplace(':' . $tag, $pattern, $from);
11561156
}
11571157

1158-
//If is redirect, No processing
1158+
// If is redirect, No processing
11591159
if (! isset($options['redirect']) && is_string($to)) {
11601160
// If no namespace found, add the default namespace
11611161
if (strpos($to, '\\') === false || strpos($to, '\\') > 0) {

‎system/Test/DOMParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function withString(string $content)
6464
// converts all special characters to utf-8
6565
$content = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
6666

67-
//turning off some errors
67+
// turning off some errors
6868
libxml_use_internal_errors(true);
6969

7070
if (! $this->dom->loadHTML($content)) {

‎system/View/Parser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ protected function parsePair(string $variable, array $data, string $template): a
333333
$str .= $out;
334334
}
335335

336-
//Escape | character from filters as it's handled as OR in regex
336+
// Escape | character from filters as it's handled as OR in regex
337337
$escapedMatch = preg_replace('/(?<!\\\\)\\|/', '\\|', $match[0]);
338338

339339
$replace['#' . $escapedMatch . '#s'] = $str;

‎system/View/View.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ public function extend(string $layout)
375375
*/
376376
public function section(string $name)
377377
{
378-
//Saved to prevent BC.
378+
// Saved to prevent BC.
379379
$this->currentSection = $name;
380380
$this->sectionStack[] = $name;
381381

‎tests/_support/Database/Migrations/20160428212500_Create_test_tables.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ public function up()
4545
'value' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
4646
])->addKey('id', true)->createTable('misc', true);
4747

48-
//Database Type test table
49-
//missing types :
50-
//TINYINT,MEDIUMINT,BIT,YEAR,BINARY , VARBINARY, TINYTEXT,LONGTEXT,YEAR,JSON,Spatial data types
48+
// Database Type test table
49+
// missing types :
50+
// TINYINT,MEDIUMINT,BIT,YEAR,BINARY , VARBINARY, TINYTEXT,LONGTEXT,YEAR,JSON,Spatial data types
5151
// id must be interger else SQLite3 error on not null for autoinc field
5252
$data_type_fields = [
5353
'id' => ['type' => 'INTEGER', 'constraint' => 20, 'auto_increment' => true],

‎tests/_support/Database/Seeds/CITestSeeder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function run()
110110
],
111111
];
112112

113-
//set SQL times to more correct format
113+
// set SQL times to more correct format
114114
if ($this->db->DBDriver === 'SQLite3') {
115115
$data['type_test'][0]['type_date'] = '2020/01/11';
116116
$data['type_test'][0]['type_time'] = '15:22:00';

‎tests/system/Cache/CacheFactoryTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected function setUp(): void
3030

3131
$this->cacheFactory = new CacheFactory();
3232

33-
//Initialize path
33+
// Initialize path
3434
$this->config = new Cache();
3535
$this->config->storePath .= self::$directory;
3636
}
@@ -98,7 +98,7 @@ public function testGetDummyHandler()
9898

9999
$this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config));
100100

101-
//Initialize path
101+
// Initialize path
102102
$this->config = new Cache();
103103
$this->config->storePath .= self::$directory;
104104
}
@@ -117,7 +117,7 @@ public function testHandlesBadHandler()
117117
$this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
118118
}
119119

120-
//Initialize path
120+
// Initialize path
121121
$this->config = new Cache();
122122
$this->config->storePath .= self::$directory;
123123
}

‎tests/system/Cache/Handlers/RedisHandlerTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@ public function testDeleteMatchingSuffix()
157157
$this->assertSame('keys=90', $dbInfo[0]);
158158
}
159159

160-
//FIXME: I don't like all Hash logic very much. It's wasting memory.
161-
//public function testIncrement()
162-
//{
163-
//}
164-
165-
//public function testDecrement()
166-
//{
167-
//}
160+
// FIXME: I don't like all Hash logic very much. It's wasting memory.
161+
// public function testIncrement()
162+
// {
163+
// }
164+
165+
// public function testDecrement()
166+
// {
167+
// }
168168

169169
public function testClean()
170170
{

‎tests/system/Database/Live/GetTest.php

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -93,79 +93,79 @@ public function testGetFieldData()
9393
$typeTest = $this->db->table('type_test')->get()->getFieldData();
9494

9595
if ($this->db->DBDriver === 'SQLite3') {
96-
$this->assertSame('integer', $typeTest[0]->type_name); //INTEGER AUTO INC
97-
$this->assertSame('text', $typeTest[1]->type_name); //VARCHAR
98-
$this->assertSame('text', $typeTest[2]->type_name); //CHAR
99-
$this->assertSame('text', $typeTest[3]->type_name); //TEXT
100-
$this->assertSame('integer', $typeTest[4]->type_name); //SMALLINT
101-
$this->assertSame('integer', $typeTest[5]->type_name); //INTEGER
102-
$this->assertSame('float', $typeTest[6]->type_name); //FLOAT
103-
$this->assertSame('float', $typeTest[7]->type_name); //NUMERIC
104-
$this->assertSame('text', $typeTest[8]->type_name); //DATE
105-
$this->assertSame('text', $typeTest[9]->type_name); //TIME
106-
$this->assertSame('text', $typeTest[10]->type_name); //DATETIME
107-
$this->assertSame('text', $typeTest[11]->type_name); //TIMESTAMP
108-
$this->assertSame('integer', $typeTest[12]->type_name); //BIGINT
109-
$this->assertSame('float', $typeTest[13]->type_name); //REAL
110-
$this->assertSame('text', $typeTest[14]->type_name); //ENUM
111-
$this->assertSame('text', $typeTest[15]->type_name); //SET
112-
$this->assertSame('text', $typeTest[16]->type_name); //MEDIUMTEXT
113-
$this->assertSame('float', $typeTest[17]->type_name); //DOUBLE
114-
$this->assertSame('float', $typeTest[18]->type_name); //DECIMAL
115-
$this->assertSame('text', $typeTest[19]->type_name); //BLOB
96+
$this->assertSame('integer', $typeTest[0]->type_name); // INTEGER AUTO INC
97+
$this->assertSame('text', $typeTest[1]->type_name); // VARCHAR
98+
$this->assertSame('text', $typeTest[2]->type_name); // CHAR
99+
$this->assertSame('text', $typeTest[3]->type_name); // TEXT
100+
$this->assertSame('integer', $typeTest[4]->type_name); // SMALLINT
101+
$this->assertSame('integer', $typeTest[5]->type_name); // INTEGER
102+
$this->assertSame('float', $typeTest[6]->type_name); // FLOAT
103+
$this->assertSame('float', $typeTest[7]->type_name); // NUMERIC
104+
$this->assertSame('text', $typeTest[8]->type_name); // DATE
105+
$this->assertSame('text', $typeTest[9]->type_name); // TIME
106+
$this->assertSame('text', $typeTest[10]->type_name); // DATETIME
107+
$this->assertSame('text', $typeTest[11]->type_name); // TIMESTAMP
108+
$this->assertSame('integer', $typeTest[12]->type_name); // BIGINT
109+
$this->assertSame('float', $typeTest[13]->type_name); // REAL
110+
$this->assertSame('text', $typeTest[14]->type_name); // ENUM
111+
$this->assertSame('text', $typeTest[15]->type_name); // SET
112+
$this->assertSame('text', $typeTest[16]->type_name); // MEDIUMTEXT
113+
$this->assertSame('float', $typeTest[17]->type_name); // DOUBLE
114+
$this->assertSame('float', $typeTest[18]->type_name); // DECIMAL
115+
$this->assertSame('text', $typeTest[19]->type_name); // BLOB
116116
}
117117
if ($this->db->DBDriver === 'MySQLi') {
118-
$this->assertSame('long', $typeTest[0]->type_name); //INTEGER AUTOINC
119-
$this->assertSame('var_string', $typeTest[1]->type_name); //VARCHAR
120-
$this->assertSame('string', $typeTest[2]->type_name); //CHAR
121-
$this->assertSame('blob', $typeTest[3]->type_name); //TEXT
122-
$this->assertSame('short', $typeTest[4]->type_name); //SMALLINT
123-
$this->assertSame('long', $typeTest[5]->type_name); //INTEGER
124-
$this->assertSame('float', $typeTest[6]->type_name); //FLOAT
125-
$this->assertSame('newdecimal', $typeTest[7]->type_name); //NUMERIC
126-
$this->assertSame('date', $typeTest[8]->type_name); //DATE
127-
$this->assertSame('time', $typeTest[9]->type_name); //TIME
128-
$this->assertSame('datetime', $typeTest[10]->type_name); //DATETIME
129-
$this->assertSame('timestamp', $typeTest[11]->type_name); //TIMESTAMP
130-
$this->assertSame('longlong', $typeTest[12]->type_name); //BIGINT
131-
$this->assertSame('double', $typeTest[13]->type_name); //REAL
132-
$this->assertSame('string', $typeTest[14]->type_name); //ENUM
133-
$this->assertSame('string', $typeTest[15]->type_name); //SET
134-
$this->assertSame('blob', $typeTest[16]->type_name); //MEDIUMTEXT
135-
$this->assertSame('double', $typeTest[17]->type_name); //DOUBLE
136-
$this->assertSame('newdecimal', $typeTest[18]->type_name); //DECIMAL
137-
$this->assertSame('blob', $typeTest[19]->type_name); //BLOB
118+
$this->assertSame('long', $typeTest[0]->type_name); // INTEGER AUTOINC
119+
$this->assertSame('var_string', $typeTest[1]->type_name); // VARCHAR
120+
$this->assertSame('string', $typeTest[2]->type_name); // CHAR
121+
$this->assertSame('blob', $typeTest[3]->type_name); // TEXT
122+
$this->assertSame('short', $typeTest[4]->type_name); // SMALLINT
123+
$this->assertSame('long', $typeTest[5]->type_name); // INTEGER
124+
$this->assertSame('float', $typeTest[6]->type_name); // FLOAT
125+
$this->assertSame('newdecimal', $typeTest[7]->type_name); // NUMERIC
126+
$this->assertSame('date', $typeTest[8]->type_name); // DATE
127+
$this->assertSame('time', $typeTest[9]->type_name); // TIME
128+
$this->assertSame('datetime', $typeTest[10]->type_name); // DATETIME
129+
$this->assertSame('timestamp', $typeTest[11]->type_name); // TIMESTAMP
130+
$this->assertSame('longlong', $typeTest[12]->type_name); // BIGINT
131+
$this->assertSame('double', $typeTest[13]->type_name); // REAL
132+
$this->assertSame('string', $typeTest[14]->type_name); // ENUM
133+
$this->assertSame('string', $typeTest[15]->type_name); // SET
134+
$this->assertSame('blob', $typeTest[16]->type_name); // MEDIUMTEXT
135+
$this->assertSame('double', $typeTest[17]->type_name); // DOUBLE
136+
$this->assertSame('newdecimal', $typeTest[18]->type_name); // DECIMAL
137+
$this->assertSame('blob', $typeTest[19]->type_name); // BLOB
138138
}
139139
if ($this->db->DBDriver === 'Postgre') {
140-
$this->assertSame('int4', $typeTest[0]->type_name); //INTEGER AUTOINC
141-
$this->assertSame('varchar', $typeTest[1]->type_name); //VARCHAR
142-
$this->assertSame('bpchar', $typeTest[2]->type_name); //CHAR
143-
$this->assertSame('text', $typeTest[3]->type_name); //TEXT
144-
$this->assertSame('int2', $typeTest[4]->type_name); //SMALLINT
145-
$this->assertSame('int4', $typeTest[5]->type_name); //INTEGER
146-
$this->assertSame('float8', $typeTest[6]->type_name); //FLOAT
147-
$this->assertSame('numeric', $typeTest[7]->type_name); //NUMERIC
148-
$this->assertSame('date', $typeTest[8]->type_name); //DATE
149-
$this->assertSame('time', $typeTest[9]->type_name); //TIME
150-
$this->assertSame('timestamp', $typeTest[10]->type_name); //DATETIME
151-
$this->assertSame('timestamp', $typeTest[11]->type_name); //TIMESTAMP
152-
$this->assertSame('int8', $typeTest[12]->type_name); //BIGINT
140+
$this->assertSame('int4', $typeTest[0]->type_name); // INTEGER AUTOINC
141+
$this->assertSame('varchar', $typeTest[1]->type_name); // VARCHAR
142+
$this->assertSame('bpchar', $typeTest[2]->type_name); // CHAR
143+
$this->assertSame('text', $typeTest[3]->type_name); // TEXT
144+
$this->assertSame('int2', $typeTest[4]->type_name); // SMALLINT
145+
$this->assertSame('int4', $typeTest[5]->type_name); // INTEGER
146+
$this->assertSame('float8', $typeTest[6]->type_name); // FLOAT
147+
$this->assertSame('numeric', $typeTest[7]->type_name); // NUMERIC
148+
$this->assertSame('date', $typeTest[8]->type_name); // DATE
149+
$this->assertSame('time', $typeTest[9]->type_name); // TIME
150+
$this->assertSame('timestamp', $typeTest[10]->type_name); // DATETIME
151+
$this->assertSame('timestamp', $typeTest[11]->type_name); // TIMESTAMP
152+
$this->assertSame('int8', $typeTest[12]->type_name); // BIGINT
153153
}
154154
if ($this->db->DBDriver === 'SQLSRV') {
155-
$this->assertSame('int', $typeTest[0]->type_name); //INTEGER AUTOINC
156-
$this->assertSame('varchar', $typeTest[1]->type_name); //VARCHAR
157-
$this->assertSame('char', $typeTest[2]->type_name); //CHAR
158-
$this->assertSame('text', $typeTest[3]->type_name); //TEXT
159-
$this->assertSame('smallint', $typeTest[4]->type_name); //SMALLINT
160-
$this->assertSame('int', $typeTest[5]->type_name); //INTEGER
161-
$this->assertSame('float', $typeTest[6]->type_name); //FLOAT
162-
$this->assertSame('numeric', $typeTest[7]->type_name); //NUMERIC
163-
$this->assertNull($typeTest[8]->type_name); //DATE
164-
$this->assertNull($typeTest[9]->type_name); //TIME
165-
$this->assertNull($typeTest[10]->type_name); //DATETIME
166-
$this->assertSame('bigint', $typeTest[11]->type_name); //BIGINT
167-
$this->assertSame('real', $typeTest[12]->type_name); //REAL
168-
$this->assertSame('decimal', $typeTest[13]->type_name); //DECIMAL
155+
$this->assertSame('int', $typeTest[0]->type_name); // INTEGER AUTOINC
156+
$this->assertSame('varchar', $typeTest[1]->type_name); // VARCHAR
157+
$this->assertSame('char', $typeTest[2]->type_name); // CHAR
158+
$this->assertSame('text', $typeTest[3]->type_name); // TEXT
159+
$this->assertSame('smallint', $typeTest[4]->type_name); // SMALLINT
160+
$this->assertSame('int', $typeTest[5]->type_name); // INTEGER
161+
$this->assertSame('float', $typeTest[6]->type_name); // FLOAT
162+
$this->assertSame('numeric', $typeTest[7]->type_name); // NUMERIC
163+
$this->assertNull($typeTest[8]->type_name); // DATE
164+
$this->assertNull($typeTest[9]->type_name); // TIME
165+
$this->assertNull($typeTest[10]->type_name); // DATETIME
166+
$this->assertSame('bigint', $typeTest[11]->type_name); // BIGINT
167+
$this->assertSame('real', $typeTest[12]->type_name); // REAL
168+
$this->assertSame('decimal', $typeTest[13]->type_name); // DECIMAL
169169
}
170170
}
171171

0 commit comments

Comments
 (0)