Merge pull request #5772 from kenjis/fix-docs-fix-empty-line

docs: add/remove empty line in sample code
This commit is contained in:
kenjis 2022-03-05 08:30:41 +09:00 committed by GitHub
commit 970fa892b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
79 changed files with 56 additions and 30 deletions

View File

@ -10,5 +10,6 @@ class Services extends BaseService
{
return new \App\Router\MyRouter();
}
// ...
}

View File

@ -10,5 +10,6 @@ class Services extends BaseService
{
return new \CodeIgniter\View\View($viewPath);
}
// ...
}

View File

@ -14,5 +14,6 @@ class Services extends BaseService
return static::getSharedInstance('routes');
}
// ...
}

View File

@ -24,5 +24,6 @@ class Database extends Config
'strictOn' => false,
'failover' => [],
];
// ...
}

View File

@ -1,5 +1,4 @@
<?php
echo $db->table('my_table')->countAll();
// Produces an integer, like 25

View File

@ -1,5 +1,4 @@
<?php
echo $db->table('my_table')->like('title', 'match')->countAllResults();
// Produces an integer, like 5

View File

@ -2,5 +2,4 @@
$sql = $builder->getCompiledSelect();
echo $sql;
// Prints string: SELECT * FROM mytable

View File

@ -2,5 +2,4 @@
$builder->select('title, content, date');
$query = $builder->get();
// Executes: SELECT title, content, date FROM mytable

View File

@ -3,5 +3,4 @@
$subquery = $db->table('users');
$builder = $db->table('jobs')->fromSubquery($subquery, 'alias');
$query = $builder->get();
// Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) AS `alias`

View File

@ -3,5 +3,4 @@
$subquery = $db->table('users')->select('id, name');
$builder = $db->newQuery()->fromSubquery($subquery, 't');
$query = $builder->get();
// Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS `t`

View File

@ -1,11 +1,9 @@
<?php
// With closure
$builder->where('advance_amount <', function (BaseBuilder $builder) {
return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
});
// Produces: WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)
// With builder directly

View File

@ -4,7 +4,6 @@
$builder->orWhereIn('id', function (BaseBuilder $builder) {
return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
});
// Produces: OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
// With builder directly

View File

@ -4,7 +4,6 @@
$builder->whereNotIn('id', function (BaseBuilder $builder) {
return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
});
// Produces: WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
// With builder directly

View File

@ -4,7 +4,6 @@
$builder->orWhereNotIn('id', function (BaseBuilder $builder) {
return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
});
// Produces: OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
// With builder directly

View File

@ -4,7 +4,6 @@
$builder->orHavingIn('id', function (BaseBuilder $builder) {
return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
});
// Produces: OR "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
// With builder directly

View File

@ -4,7 +4,6 @@
$builder->havingNotIn('id', function (BaseBuilder $builder) {
return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
});
// Produces: HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
// With builder directly

View File

@ -4,7 +4,6 @@
$builder->orHavingNotIn('id', function (BaseBuilder $builder) {
return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
});
// Produces: OR "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
// With builder directly

View File

@ -8,5 +8,4 @@ $data = [
$sql = $builder->set($data)->getCompiledInsert();
echo $sql;
// Produces string: INSERT INTO mytable (`title`, `name`, `date`) VALUES ('My title', 'My name', 'My date')

View File

@ -1,9 +1,7 @@
<?php
echo $builder->set('title', 'My Title')->getCompiledInsert(false);
// Produces string: INSERT INTO mytable (`title`) VALUES ('My Title')
echo $builder->set('content', 'My Content')->getCompiledInsert();
// Produces string: INSERT INTO mytable (`title`, `content`) VALUES ('My Title', 'My Content')

View File

@ -7,5 +7,4 @@ $data = [
];
$builder->replace($data);
// Executes: REPLACE INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')

View File

@ -3,5 +3,4 @@
$subquery = $db->table('countries')->select('name')->where('id', 1);
$builder = $db->table('users')->select('name')->selectSubquery($subquery, 'country');
$query = $builder->get();
// Produces: SELECT `name`, (SELECT `name` FROM `countries` WHERE `id` = 1) AS `country` FROM `users`

View File

@ -14,5 +14,6 @@ class Services extends BaseService
return new \App\Libraries\RouteCollection(static::locator(), config('Modules'));
}
// ...
}

View File

@ -7,5 +7,6 @@ class MyConfig extends BaseConfig
public static $registrars = [
SupportingPackageRegistrar::class,
];
// ...
}

View File

@ -7,5 +7,6 @@ use CodeIgniter\Config\BaseConfig;
class Logger extends BaseConfig
{
public $threshold = 5;
// ...
}

View File

@ -8,5 +8,6 @@ class Logger extends BaseConfig
{
// Log only debug and info type messages
public $threshold = [5, 8];
// ...
}

View File

@ -12,5 +12,6 @@ class Logger extends BaseConfig
'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
],
];
// ...
}

View File

@ -5,5 +5,6 @@ namespace Config;
class Paths
{
public $appDirectory = '/path/to/your/app';
// ...
}

View File

@ -9,5 +9,6 @@ class Filters extends BaseConfig
public $aliases = [
'csrf' => \CodeIgniter\Filters\CSRF::class,
];
// ...
}

View File

@ -12,5 +12,6 @@ class Filters extends BaseConfig
\App\Filters\ApiAuth::class,
],
];
// ...
}

View File

@ -12,5 +12,6 @@ class Filters extends BaseConfig
],
'after' => [],
];
// ...
}

View File

@ -12,5 +12,6 @@ class Filters extends BaseConfig
],
'after' => [],
];
// ...
}

View File

@ -12,5 +12,6 @@ class Filters extends BaseConfig
],
'after' => [],
];
// ...
}

View File

@ -10,5 +10,6 @@ class Filters extends BaseConfig
'post' => ['foo', 'bar'],
'get' => ['baz'],
];
// ...
}

View File

@ -10,5 +10,6 @@ class Filters extends BaseConfig
'foo' => ['before' => ['admin/*'], 'after' => ['users/*']],
'bar' => ['before' => ['api/*', 'admin/*']],
];
// ...
}

View File

@ -10,5 +10,6 @@ class Filters extends BaseConfig
// ...
'secureheaders' => \App\Filters\SecureHeaders::class,
];
// ...
}

View File

@ -7,11 +7,13 @@ use CodeIgniter\Config\BaseConfig;
class Cache extends BaseConfig
{
// ...
public $memcached = [
'host' => '127.0.0.1',
'port' => 11211,
'weight' => 1,
'raw' => false,
];
// ...
}

View File

@ -15,5 +15,6 @@ class Cache extends BaseConfig
'timeout' => 0,
'database' => 0,
];
// ...
}

View File

@ -7,5 +7,6 @@ use CodeIgniter\Config\BaseConfig;
class CURLRequest extends BaseConfig
{
public $shareOptions = false;
// ...
}

View File

@ -8,7 +8,6 @@ class Encryption extends BaseConfig
{
// In Encryption, you may use
public $key = 'hex2bin:<your-hex-encoded-key>';
// or
public $key = 'base64:<your-base64-encoded-key>';
// ...

View File

@ -16,5 +16,6 @@ class Filters extends BaseConfig
'honeypot',
],
];
// ...
}

View File

@ -10,5 +10,6 @@ class Pager extends BaseConfig
'default_full' => 'CodeIgniter\Pager\Views\default_full',
'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
];
// ...
}

View File

@ -11,5 +11,6 @@ class Pager extends BaseConfig
'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
'front_full' => 'App\Views\Pagers\foundation_full',
];
// ...
}

View File

@ -7,5 +7,6 @@ use CodeIgniter\Config\BaseConfig;
class Security extends BaseConfig
{
public $csrfProtection = 'session';
// ...
}

View File

@ -7,5 +7,6 @@ use CodeIgniter\Config\BaseConfig;
class Security extends BaseConfig
{
public $tokenRandomize = true;
// ...
}

View File

@ -7,5 +7,6 @@ use CodeIgniter\Config\BaseConfig;
class Security extends BaseConfig
{
public $regenerate = true;
// ...
}

View File

@ -12,5 +12,6 @@ class Filters extends BaseConfig
'csrf',
],
];
// ...
}

View File

@ -11,5 +11,6 @@ class Filters extends BaseConfig
'csrf' => ['except' => ['api/record/save']],
],
];
// ...
}

View File

@ -11,5 +11,6 @@ class Filters extends BaseConfig
'csrf' => ['except' => ['api/record/[0-9]+']],
],
];
// ...
}

View File

@ -10,5 +10,6 @@ class Filters extends BaseConfig
'get' => ['csrf'],
'post' => ['csrf'],
];
// ...
}

View File

@ -1,7 +1,5 @@
<?php
$userData = $_SESSION;
// or:
$userData = $session->get();

View File

@ -1,9 +1,7 @@
<?php
unset($_SESSION['some_name']);
// or multiple values:
unset(
$_SESSION['some_name'],
$_SESSION['another_name']

View File

@ -1,7 +1,5 @@
<?php
session_destroy();
// or
$session->destroy();

View File

@ -9,5 +9,6 @@ class App extends BaseConfig
// localhost will be given higher priority (5) here,
// compared to 192.0.2.1 with a weight of 1.
public $sessionSavePath = 'localhost:11211:5,192.0.2.1:11211:1';
// ...
}

View File

@ -10,5 +10,6 @@ class Filters extends BaseConfig
// ...
'throttle' => \App\Filters\Throttle::class,
];
// ...
}

View File

@ -9,5 +9,6 @@ class Filters extends BaseConfig
public $methods = [
'post' => ['throttle'],
];
// ...
}

View File

@ -10,5 +10,6 @@ class Validation
\CodeIgniter\Validation\StrictRules\FormatRules::class,
\CodeIgniter\Validation\StrictRules\Rules::class,
];
// ...
}

View File

@ -10,5 +10,6 @@ class Validation
'pass_confirm' => 'required|matches[password]',
'email' => 'required|valid_email',
];
// ...
}

View File

@ -10,6 +10,7 @@ class Validation
'pass_confirm' => 'required|matches[password]',
'email' => 'required|valid_email',
];
public $signup_errors = [
'username' => [
'required' => 'You must choose a username.',
@ -18,5 +19,6 @@ class Validation
'valid_email' => 'Please check the Email field. It does not appear to be valid.',
],
];
// ...
}

View File

@ -9,5 +9,6 @@ class Validation
'single' => 'CodeIgniter\Validation\Views\single',
'my_list' => '_errors_list',
];
// ...
}

View File

@ -15,5 +15,6 @@ class Validation
FileRules::class,
CreditCardRules::class,
];
// ...
}

View File

@ -10,5 +10,6 @@ class Format extends BaseConfig
'application/json',
'application/xml',
];
// ...
}

View File

@ -10,5 +10,6 @@ class Format extends BaseConfig
'application/json' => \CodeIgniter\Format\JSONFormatter::class,
'application/xml' => \CodeIgniter\Format\XMLFormatter::class,
];
// ...
}

View File

@ -7,5 +7,6 @@ use CodeIgniter\Config\BaseConfig;
class App extends BaseConfig
{
public $defaultLocale = 'en';
// ...
}

View File

@ -7,5 +7,6 @@ use CodeIgniter\Config\BaseConfig;
class App extends BaseConfig
{
public $negotiateLocale = true;
// ...
}

View File

@ -7,5 +7,6 @@ use CodeIgniter\Config\BaseConfig;
class App extends BaseConfig
{
public $supportedLocales = ['en', 'es', 'fr-FR'];
// ...
}

View File

@ -7,5 +7,6 @@ use CodeIgniter\Config\BaseConfig;
class App extends BaseConfig
{
public $CSPEnabled = true;
// ...
}

View File

@ -9,5 +9,6 @@ class View extends BaseView
public array $decorators = [
'App\Views\Decorators\MyDecorator',
];
// ...
}

View File

@ -4,5 +4,4 @@ $template = '<head><title>{blog_title}</title></head>';
$data = ['blog_title' => 'My ramblings'];
echo $parser->setData($data)->renderString($template);
// Result: <head><title>My ramblings</title></head>

View File

@ -10,5 +10,6 @@ class View extends BaseView
'abs' => '\CodeIgniter\View\Filters::abs',
'capitalize' => '\CodeIgniter\View\Filters::capitalize',
];
// ...
}

View File

@ -9,5 +9,6 @@ class View extends BaseView
public $filters = [
'str_repeat' => '\str_repeat',
];
// ...
}

View File

@ -9,5 +9,6 @@ class View extends BaseView
public $plugins = [
'foo' => '\Some\Class::methodName',
];
// ...
}

View File

@ -16,5 +16,6 @@ class View extends BaseView
parent::__construct();
}
// ...
}

View File

@ -9,6 +9,7 @@ class View extends BaseView
public $plugins = [
'foo' => ['\Some\Class::methodName'],
];
// ...
}

View File

@ -8,5 +8,4 @@ $data = [
];
echo $parser->setData($data)
->renderString($template);
// Result: Hello, John Doe

View File

@ -8,5 +8,4 @@ $data = [
];
echo $parser->setData($data)
->renderString($template);
// Result: Hello, John {initials} Doe

View File

@ -12,5 +12,4 @@ $data = [
];
echo $parser->setData($data)
->renderString($template);
// Result: Hello, John Doe (Mr{degree} {/degrees})

View File

@ -15,5 +15,6 @@ final class FilterTestCase extends CIUnitTestCase
$this->assertHasFilters('unfiltered/route', 'before');
}
// ...
}

View File

@ -7,6 +7,7 @@ trait AuthTrait
$user = $this->createFakeUser();
$this->logInUser($user);
}
// ...
}

View File

@ -9,5 +9,6 @@ class Filters extends BaseConfig
public $methods = [
'post' => ['csrf'],
];
// ...
}