Merge pull request #8400 from kenjis/style-cs-fixer-3.46.0

style: update coding style with php-cs-fixer 3.46.0

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

@@ -31,10 +31,14 @@
     ]);
 
 $overrides = [
-    'echo_tag_syntax'             => false,
-    'php_unit_internal_class'     => false,
-    'no_unused_imports'           => false,
-    'class_attributes_separation' => false,
+    'echo_tag_syntax'              => false,
+    'php_unit_internal_class'      => false,
+    'no_unused_imports'            => false,
+    'class_attributes_separation'  => false,
+    'fully_qualified_strict_types' => [
+        'import_symbols'                        => false,
+        'leading_backslash_in_global_namespace' => true,
+    ],
 ];
 
 $options = [

system/Helpers/text_helper.php

@@ -702,8 +702,6 @@ function alternator(...$args): string
      * @param int    $radius   The amount of characters returned around the phrase.
      * @param string $ellipsis Ending that will be appended
      *
-     * @return string
-     *
      * If no $phrase is passed, will generate an excerpt of $radius characters
      * from the beginning of $text.
      */

tests/system/Config/fixtures/RegistrarConfig.php

@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-class RegistrarConfig extends \CodeIgniter\Config\BaseConfig
+class RegistrarConfig extends CodeIgniter\Config\BaseConfig
 {
     public $foo = 'bar';
     public $bar = [

tests/system/Config/fixtures/SimpleConfig.php

@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-class SimpleConfig extends \CodeIgniter\Config\BaseConfig
+class SimpleConfig extends CodeIgniter\Config\BaseConfig
 {
     public $QZERO;
     public $QZEROSTR;

user_guide_src/source/cli/cli_library/002.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $color = CLI::prompt('What is your favorite color?');

user_guide_src/source/cli/cli_library/003.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $color = CLI::prompt('What is your favorite color?', 'blue');

user_guide_src/source/cli/cli_library/004.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $overwrite = CLI::prompt('File exists. Overwrite?', ['y', 'n']);

user_guide_src/source/cli/cli_library/005.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $email = CLI::prompt('What is your email?', null, 'required|valid_email');

user_guide_src/source/cli/cli_library/006.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $email = CLI::prompt('What is your email?', null, ['required', 'valid_email']);

user_guide_src/source/cli/cli_library/007.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $fruit = CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
 /*
  * These are your choices:

user_guide_src/source/cli/cli_library/008.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $fruit = CLI::promptByKey(['These are your choices:', 'Which would you like?'], [
     'apple'  => 'The red apple',
     'orange' => 'The plump orange',

user_guide_src/source/cli/cli_library/009.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 CLI::write('The rain in Spain falls mainly on the plains.');

user_guide_src/source/cli/cli_library/010.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 CLI::write('File created.', 'green');

user_guide_src/source/cli/cli_library/011.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 CLI::write('File overwritten.', 'light_red', 'dark_gray');

user_guide_src/source/cli/cli_library/012.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 for ($i = 0; $i <= 10; $i++) {
     CLI::print($i);
 }

user_guide_src/source/cli/cli_library/013.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 CLI::write("fileA \t" . CLI::color('/path/to/file', 'white'), 'yellow');

user_guide_src/source/cli/cli_library/014.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 CLI::error('Cannot write to file: ' . $file);

user_guide_src/source/cli/cli_library/015.php

@@ -1,4 +1,6 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 CLI::color("task1\t", 'yellow');
 CLI::wrap('Some long description goes here that might be longer than the current window.');

user_guide_src/source/cli/cli_library/016.php

@@ -1,4 +1,6 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 // Wrap the text at max 20 characters wide
 CLI::wrap($description, 20);

user_guide_src/source/cli/cli_library/017.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $titles = [
     'task1a',
     'task1abc',

user_guide_src/source/cli/cli_library/018.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 CLI::newLine();

user_guide_src/source/cli/cli_library/019.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 CLI::clearScreen();

user_guide_src/source/cli/cli_library/020.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $totalSteps = count($tasks);
 $currStep   = 1;
 

user_guide_src/source/cli/cli_library/021.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $thead = ['ID', 'Title', 'Updated At', 'Active'];
 $tbody = [
     [7, 'A great item title', '2017-11-15 10:35:02', 1],

user_guide_src/source/cli/cli_library/022.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 // wait for specified interval, with countdown displayed
 CLI::wait($seconds, true);
 

user_guide_src/source/cli/cli_library/023.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $hobbies = CLI::promptByMultipleKeys('Select your hobbies:', ['Playing game', 'Sleep', 'Badminton']);
 /*
  * Select your hobbies:

user_guide_src/source/concepts/factories/002.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\Config\Factories;
+
 $users = Factories::models('Blog\Models\UserModel');
 // Or
 $users = Factories::models(\Blog\Models\UserModel::class);

user_guide_src/source/concepts/factories/004.php

@@ -1,4 +1,6 @@
 <?php
 
+use CodeIgniter\Config\Factories;
+
 $conn  = db_connect('auth');
 $users = Factories::models('UserModel', [], $conn);

user_guide_src/source/concepts/factories/006.php

@@ -1,5 +1,8 @@
 <?php
 
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Filters\FilterInterface;
+
 Factories::setOptions('filters', [
     'instanceOf' => FilterInterface::class,
     'prefersApp' => false,

user_guide_src/source/concepts/factories/007.php

@@ -1,4 +1,6 @@
 <?php
 
+use CodeIgniter\Config\Factories;
+
 $users = Factories::models('UserModel', ['getShared' => true]);  // Default; will always be the same instance
 $other = Factories::models('UserModel', ['getShared' => false]); // Will always create a new instance

user_guide_src/source/concepts/factories/010.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\Config\Factories;
+
 $users = Factories::models('Blog\Models\UserModel', ['preferApp' => false]);

user_guide_src/source/concepts/factories/013.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\Config\Factories;
+
 $lib = Factories::libraries('Sub/SubLib');

user_guide_src/source/concepts/factories/014.php

@@ -1,3 +1,5 @@
 <?php
 
+use CodeIgniter\Config\Factories;
+
 Factories::define('models', 'Myth\Auth\Models\UserModel', 'App\Models\UserModel');

user_guide_src/source/database/query_builder.rst

@@ -829,15 +829,17 @@ method. Here is an example using an array:
 
 The first parameter is an associative array of values.
 
+.. note:: All values except ``RawSql`` are escaped automatically producing safer queries.
+
+.. warning:: When you use ``RawSql``, you MUST escape the data manually. Failure to do so could result in SQL injections.
+
 Here is an example using an object:
 
 .. literalinclude:: query_builder/077.php
 
-The first parameter is an object.
-
-.. note:: All values except ``RawSql`` are escaped automatically producing safer queries.
+.. literalinclude:: query_builder/121.php
 
-.. warning:: When you use ``RawSql``, you MUST escape the data manually. Failure to do so could result in SQL injections.
+The first parameter is an object.
 
 $builder->ignore()
 ------------------
@@ -922,6 +924,8 @@ The first parameter is an associative array of values.
 
 Here is an example using an object:
 
+.. literalinclude:: query_builder/122.php
+
 .. literalinclude:: query_builder/113.php
 
 The first parameter is an object.
@@ -1056,6 +1060,8 @@ You can also pass an associative array to this method:
 
 Or an object:
 
+.. literalinclude:: query_builder/077.php
+
 .. literalinclude:: query_builder/087.php
 
 $builder->update()
@@ -1069,6 +1075,8 @@ is an example using an array:
 
 Or you can supply an object:
 
+.. literalinclude:: query_builder/077.php
+
 .. literalinclude:: query_builder/089.php
 
 .. note:: All values except ``RawSql`` are escaped automatically producing safer queries.

user_guide_src/source/database/query_builder/077.php

@@ -1,12 +1,10 @@
 <?php
 
-class Myclass
+namespace App\Libraries;
+
+class MyClass
 {
     public $title   = 'My Title';
     public $content = 'My Content';
     public $date    = 'My Date';
 }
-
-$object = new Myclass();
-$builder->insert($object);
-// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')

user_guide_src/source/database/query_builder/087.php

@@ -1,12 +1,7 @@
 <?php
 
-class Myclass
-{
-    public $title   = 'My Title';
-    public $content = 'My Content';
-    public $date    = 'My Date';
-}
+use App\Libraries\MyClass;
 
-$object = new Myclass();
+$object = new MyClass();
 $builder->set($object);
 $builder->insert();

user_guide_src/source/database/query_builder/089.php

@@ -1,18 +1,13 @@
 <?php
 
-class Myclass
-{
-    public $title   = 'My Title';
-    public $content = 'My Content';
-    public $date    = 'My Date';
-}
+use App\Libraries\MyClass;
 
-$object = new Myclass();
+$object = new MyClass();
 $builder->where('id', $id);
 $builder->update($object);
 /*
  * Produces:
  * UPDATE `mytable`
- * SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
+ * SET `title` = '{$title}', `content` = '{$content}', `date` = '{$date}'
  * WHERE id = `$id`
  */

user_guide_src/source/database/query_builder/111.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\Database\RawSql;
+
 $data = [
     [
         'id'      => 2,

user_guide_src/source/database/query_builder/113.php

@@ -1,11 +1,6 @@
 <?php
 
-class Myclass
-{
-    public $email   = '[email protected]';
-    public $name    = 'Ahmadinejad';
-    public $country = 'Iran';
-}
+use App\Libraries\MyClass;
 
-$object = new Myclass();
+$object = new MyClass();
 $builder->upsert($object);

user_guide_src/source/database/query_builder/115.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\Database\RawSql;
+
 $query = $this->db->table('user2')
     ->select('user2.name, user2.email, user2.country')
     ->join('user', 'user.email = user2.email', 'left')

user_guide_src/source/database/query_builder/116.php

@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\Database\RawSql;
+
 $query = $this->db->table('user2')
     ->select('user2.name, user2.email, user2.country')
     ->join('user', 'user.email = user2.email', 'inner')

user_guide_src/source/database/query_builder/121.php

@@ -0,0 +1,7 @@
+<?php
+
+use App\Libraries\MyClass;
+
+$object = new MyClass();
+$builder->insert($object);
+// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')