Skip to content

Commit c0d134a

Browse files
authored
Merge pull request #8400 from kenjis/style-cs-fixer-3.46.0
style: update coding style with php-cs-fixer 3.46.0
2 parents bbd4f1b + 73cb246 commit c0d134a

87 files changed

Lines changed: 220 additions & 62 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.php-cs-fixer.user-guide.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,14 @@
3131
]);
3232

3333
$overrides = [
34-
'echo_tag_syntax' => false,
35-
'php_unit_internal_class' => false,
36-
'no_unused_imports' => false,
37-
'class_attributes_separation' => false,
34+
'echo_tag_syntax' => false,
35+
'php_unit_internal_class' => false,
36+
'no_unused_imports' => false,
37+
'class_attributes_separation' => false,
38+
'fully_qualified_strict_types' => [
39+
'import_symbols' => false,
40+
'leading_backslash_in_global_namespace' => true,
41+
],
3842
];
3943

4044
$options = [

system/Helpers/text_helper.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -702,8 +702,6 @@ function alternator(...$args): string
702702
* @param int $radius The amount of characters returned around the phrase.
703703
* @param string $ellipsis Ending that will be appended
704704
*
705-
* @return string
706-
*
707705
* If no $phrase is passed, will generate an excerpt of $radius characters
708706
* from the beginning of $text.
709707
*/

tests/system/Config/fixtures/RegistrarConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* the LICENSE file that was distributed with this source code.
1010
*/
1111

12-
class RegistrarConfig extends \CodeIgniter\Config\BaseConfig
12+
class RegistrarConfig extends CodeIgniter\Config\BaseConfig
1313
{
1414
public $foo = 'bar';
1515
public $bar = [

tests/system/Config/fixtures/SimpleConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* the LICENSE file that was distributed with this source code.
1010
*/
1111

12-
class SimpleConfig extends \CodeIgniter\Config\BaseConfig
12+
class SimpleConfig extends CodeIgniter\Config\BaseConfig
1313
{
1414
public $QZERO;
1515
public $QZEROSTR;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<?php
22

3+
use CodeIgniter\CLI\CLI;
4+
35
$color = CLI::prompt('What is your favorite color?');
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<?php
22

3+
use CodeIgniter\CLI\CLI;
4+
35
$color = CLI::prompt('What is your favorite color?', 'blue');
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<?php
22

3+
use CodeIgniter\CLI\CLI;
4+
35
$overwrite = CLI::prompt('File exists. Overwrite?', ['y', 'n']);
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<?php
22

3+
use CodeIgniter\CLI\CLI;
4+
35
$email = CLI::prompt('What is your email?', null, 'required|valid_email');
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<?php
22

3+
use CodeIgniter\CLI\CLI;
4+
35
$email = CLI::prompt('What is your email?', null, ['required', 'valid_email']);

user_guide_src/source/cli/cli_library/007.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
use CodeIgniter\CLI\CLI;
4+
35
$fruit = CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
46
/*
57
* These are your choices:

0 commit comments

Comments
 (0)