malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4923 from paulbalandan/s-rules

Browse Source 
Define initial "s" rules
This commit is contained in:
John Paul E. Balandan, CPA 2021-07-13 04:29:53 +08:00 committed by GitHub
commit 4a1f582a3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 70 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
system/CLI/CLI.php
View File

@ -768,11 +768,11 @@ class CLI
}
if ($max === 0) {
$max = CLI::getWidth();
$max = self::getWidth();
}
if (CLI::getWidth() < $max) {
$max = CLI::getWidth();
if (self::getWidth() < $max) {
$max = self::getWidth();
}
$max = $max - $padLeft;

2
system/Debug/Toolbar.php
View File

@ -319,7 +319,7 @@ class Toolbar
return;
}
$toolbar = Services::toolbar(config(Toolbar::class));
$toolbar = Services::toolbar(config(self::class));
$stats = $app->getPerformanceStats();
$data = $toolbar->run(
$stats['startTime'],

6
system/Entity/Entity.php
View File

@ -179,7 +179,7 @@ class Entity implements JsonSerializable
$return[$key] = $this->__get($key);
if ($recursive) {
if ($return[$key] instanceof Entity) {
if ($return[$key] instanceof self) {
$return[$key] = $return[$key]->toArray($onlyChanged, $cast, $recursive);
} elseif (is_callable([$return[$key], 'toArray'])) {
$return[$key] = $return[$key]->toArray();
@ -207,7 +207,7 @@ class Entity implements JsonSerializable
if (! $onlyChanged) {
if ($recursive) {
return array_map(static function ($value) use ($onlyChanged, $recursive) {
if ($value instanceof Entity) {
if ($value instanceof self) {
$value = $value->toRawArray($onlyChanged, $recursive);
} elseif (is_callable([$value, 'toRawArray'])) {
$value = $value->toRawArray();
@ -226,7 +226,7 @@ class Entity implements JsonSerializable
}
if ($recursive) {
if ($value instanceof Entity) {
if ($value instanceof self) {
$value = $value->toRawArray($onlyChanged, $recursive);
} elseif (is_callable([$value, 'toRawArray'])) {
$value = $value->toRawArray();

2
system/Files/File.php
View File

@ -170,7 +170,7 @@ class File extends SplFileInfo
@chmod($destination, 0777 & ~umask());
return new File($destination);
return new self($destination);
}
//--------------------------------------------------------------------

2
system/HTTP/URI.php
View File

@ -1123,7 +1123,7 @@ class URI
*
* @return string
*/
protected function mergePaths(URI $base, URI $reference): string
protected function mergePaths(self $base, self $reference): string
{
if (! empty($base->getAuthority()) && $base->getPath() === '') {
return '/' . ltrim($reference->getPath(), '/ ');

38
system/I18n/Time.php
View File

@ -82,7 +82,7 @@ class Time extends DateTime
$this->locale = ! empty($locale) ? $locale : Locale::getDefault();
// If a test instance has been provided, use it instead.
if ($time === null && static::$testNow instanceof Time) {
if ($time === null && static::$testNow instanceof self) {
if (empty($timezone)) {
$timezone = static::$testNow->getTimezone();
}
@ -119,7 +119,7 @@ class Time extends DateTime
*/
public static function now($timezone = null, ?string $locale = null)
{
return new Time(null, $timezone, $locale);
return new self(null, $timezone, $locale);
}
//--------------------------------------------------------------------
@ -140,7 +140,7 @@ class Time extends DateTime
*/
public static function parse(string $datetime, $timezone = null, ?string $locale = null)
{
return new Time($datetime, $timezone, $locale);
return new self($datetime, $timezone, $locale);
}
//--------------------------------------------------------------------
@ -157,7 +157,7 @@ class Time extends DateTime
*/
public static function today($timezone = null, ?string $locale = null)
{
return new Time(date('Y-m-d 00:00:00'), $timezone, $locale);
return new self(date('Y-m-d 00:00:00'), $timezone, $locale);
}
//--------------------------------------------------------------------
@ -174,7 +174,7 @@ class Time extends DateTime
*/
public static function yesterday($timezone = null, ?string $locale = null)
{
return new Time(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale);
return new self(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale);
}
//--------------------------------------------------------------------
@ -191,7 +191,7 @@ class Time extends DateTime
*/
public static function tomorrow($timezone = null, ?string $locale = null)
{
return new Time(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale);
return new self(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale);
}
//--------------------------------------------------------------------
@ -262,7 +262,7 @@ class Time extends DateTime
$minutes = empty($minutes) ? 0 : $minutes;
$seconds = empty($seconds) ? 0 : $seconds;
return new Time(date('Y-m-d H:i:s', strtotime("{$year}-{$month}-{$day} {$hour}:{$minutes}:{$seconds}")), $timezone, $locale);
return new self(date('Y-m-d H:i:s', strtotime("{$year}-{$month}-{$day} {$hour}:{$minutes}:{$seconds}")), $timezone, $locale);
}
//--------------------------------------------------------------------
@ -285,7 +285,7 @@ class Time extends DateTime
throw I18nException::forInvalidFormat($format);
}
return new Time($date->format('Y-m-d H:i:s'), $timeZone);
return new self($date->format('Y-m-d H:i:s'), $timeZone);
}
//--------------------------------------------------------------------
@ -303,7 +303,7 @@ class Time extends DateTime
*/
public static function createFromTimestamp(int $timestamp, $timezone = null, ?string $locale = null)
{
return new Time(gmdate('Y-m-d H:i:s', $timestamp), $timezone ?? 'UTC', $locale);
return new self(gmdate('Y-m-d H:i:s', $timestamp), $timezone ?? 'UTC', $locale);
}
//--------------------------------------------------------------------
@ -323,7 +323,7 @@ class Time extends DateTime
$date = $dateTime->format('Y-m-d H:i:s');
$timezone = $dateTime->getTimezone();
return new Time($date, $timezone, $locale);
return new self($date, $timezone, $locale);
}
//--------------------------------------------------------------------
@ -388,9 +388,9 @@ class Time extends DateTime
// Convert to a Time instance
if (is_string($datetime)) {
$datetime = new Time($datetime, $timezone, $locale);
} elseif ($datetime instanceof DateTimeInterface && ! $datetime instanceof Time) {
$datetime = new Time($datetime->format('Y-m-d H:i:s'), $timezone);
$datetime = new self($datetime, $timezone, $locale);
} elseif ($datetime instanceof DateTimeInterface && ! $datetime instanceof self) {
$datetime = new self($datetime->format('Y-m-d H:i:s'), $timezone);
}
static::$testNow = $datetime;
@ -562,7 +562,7 @@ class Time extends DateTime
*/
public function getAge()
{
$now = Time::now()->getTimestamp();
$now = self::now()->getTimestamp();
$time = $this->getTimestamp();
// future dates have no age
@ -780,7 +780,7 @@ class Time extends DateTime
${$name} = $value;
return Time::create(
return self::create(
(int) $year,
(int) $month,
(int) $day,
@ -805,7 +805,7 @@ class Time extends DateTime
{
$timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
return Time::createFromInstance($this->toDateTime()->setTimezone($timezone), $this->locale);
return self::createFromInstance($this->toDateTime()->setTimezone($timezone), $this->locale);
}
/**
@ -821,7 +821,7 @@ class Time extends DateTime
{
$time = date('Y-m-d H:i:s', $timestamp);
return Time::parse($time, $this->timezone, $this->locale);
return self::parse($time, $this->timezone, $this->locale);
}
//--------------------------------------------------------------------
@ -1192,7 +1192,7 @@ class Time extends DateTime
*/
public function humanize()
{
$now = IntlCalendar::fromDateTime(Time::now($this->timezone)->toDateTimeString());
$now = IntlCalendar::fromDateTime(self::now($this->timezone)->toDateTimeString());
$time = $this->getCalendar()->getTime();
$years = $now->fieldDifference($time, IntlCalendar::FIELD_YEAR);
@ -1267,7 +1267,7 @@ class Time extends DateTime
*/
public function getUTCObject($time, ?string $timezone = null)
{
if ($time instanceof Time) {
if ($time instanceof self) {
$time = $time->toDateTime();
} elseif (is_string($time)) {
$timezone = $timezone ?: $this->timezone;

2
system/Pager/Pager.php
View File

@ -481,7 +481,7 @@ class Pager implements PagerInterface
*
* @return Pager
*/
public function only(array $queries): Pager
public function only(array $queries): self
{
$this->only = $queries;

72
tests/system/Validation/FormatRulesTest.php
View File

@ -372,19 +372,19 @@ final class FormatRulesTest extends CIUnitTestCase
{
return [
[
FormatRulesTest::ALPHABET,
self::ALPHABET,
true,
],
[
FormatRulesTest::ALPHABET . ' ',
self::ALPHABET . ' ',
false,
],
[
FormatRulesTest::ALPHABET . '1',
self::ALPHABET . '1',
false,
],
[
FormatRulesTest::ALPHABET . '*',
self::ALPHABET . '*',
false,
],
[
@ -423,23 +423,23 @@ final class FormatRulesTest extends CIUnitTestCase
true,
],
[
FormatRulesTest::ALPHABET,
self::ALPHABET,
true,
],
[
FormatRulesTest::ALPHABET . ' ',
self::ALPHABET . ' ',
true,
],
[
FormatRulesTest::ALPHABET . "\n",
self::ALPHABET . "\n",
false,
],
[
FormatRulesTest::ALPHABET . '1',
self::ALPHABET . '1',
false,
],
[
FormatRulesTest::ALPHABET . '*',
self::ALPHABET . '*',
false,
],
];
@ -468,15 +468,15 @@ final class FormatRulesTest extends CIUnitTestCase
{
return [
[
FormatRulesTest::ALPHANUMERIC,
self::ALPHANUMERIC,
true,
],
[
FormatRulesTest::ALPHANUMERIC . '\ ',
self::ALPHANUMERIC . '\ ',
false,
],
[
FormatRulesTest::ALPHANUMERIC . '_',
self::ALPHANUMERIC . '_',
false,
],
[
@ -509,71 +509,71 @@ final class FormatRulesTest extends CIUnitTestCase
{
return [
[
FormatRulesTest::ALPHANUMERIC . ' ~!#$%&*-_+=|:.',
self::ALPHANUMERIC . ' ~!#$%&*-_+=|:.',
true,
],
[
FormatRulesTest::ALPHANUMERIC . '`',
self::ALPHANUMERIC . '`',
false,
],
[
FormatRulesTest::ALPHANUMERIC . "\n",
self::ALPHANUMERIC . "\n",
false,
],
[
FormatRulesTest::ALPHANUMERIC . '@',
self::ALPHANUMERIC . '@',
false,
],
[
FormatRulesTest::ALPHANUMERIC . '^',
self::ALPHANUMERIC . '^',
false,
],
[
FormatRulesTest::ALPHANUMERIC . '(',
self::ALPHANUMERIC . '(',
false,
],
[
FormatRulesTest::ALPHANUMERIC . ')',
self::ALPHANUMERIC . ')',
false,
],
[
FormatRulesTest::ALPHANUMERIC . '\\',
self::ALPHANUMERIC . '\\',
false,
],
[
FormatRulesTest::ALPHANUMERIC . '{',
self::ALPHANUMERIC . '{',
false,
],
[
FormatRulesTest::ALPHANUMERIC . '}',
self::ALPHANUMERIC . '}',
false,
],
[
FormatRulesTest::ALPHANUMERIC . '[',
self::ALPHANUMERIC . '[',
false,
],
[
FormatRulesTest::ALPHANUMERIC . ']',
self::ALPHANUMERIC . ']',
false,
],
[
FormatRulesTest::ALPHANUMERIC . '"',
self::ALPHANUMERIC . '"',
false,
],
[
FormatRulesTest::ALPHANUMERIC . "'",
self::ALPHANUMERIC . "'",
false,
],
[
FormatRulesTest::ALPHANUMERIC . '<',
self::ALPHANUMERIC . '<',
false,
],
[
FormatRulesTest::ALPHANUMERIC . '>',
self::ALPHANUMERIC . '>',
false,
],
[
FormatRulesTest::ALPHANUMERIC . '/',
self::ALPHANUMERIC . '/',
false,
],
[
@ -606,15 +606,15 @@ final class FormatRulesTest extends CIUnitTestCase
{
return [
[
' ' . FormatRulesTest::ALPHANUMERIC,
' ' . self::ALPHANUMERIC,
true,
],
[
' ' . FormatRulesTest::ALPHANUMERIC . '-',
' ' . self::ALPHANUMERIC . '-',
false,
],
[
' ' . FormatRulesTest::ALPHANUMERIC . "\n",
' ' . self::ALPHANUMERIC . "\n",
false,
],
[
@ -647,15 +647,15 @@ final class FormatRulesTest extends CIUnitTestCase
{
return [
[
FormatRulesTest::ALPHANUMERIC . '-',
self::ALPHANUMERIC . '-',
true,
],
[
FormatRulesTest::ALPHANUMERIC . '-\ ',
self::ALPHANUMERIC . '-\ ',
false,
],
[
FormatRulesTest::ALPHANUMERIC . "-\n",
self::ALPHANUMERIC . "-\n",
false,
],
[
@ -692,7 +692,7 @@ final class FormatRulesTest extends CIUnitTestCase
true,
],
[
FormatRulesTest::ALPHANUMERIC,
self::ALPHANUMERIC,
false,
],
[

5
utils/PhpCsFixer/CodeIgniter4.php
View File

@ -387,9 +387,14 @@ final class CodeIgniter4 extends AbstractRuleset
'regular_callable_call' => true,
'return_assignment' => true,
'return_type_declaration' => ['space_before' => 'none'],
'self_accessor' => false,
'self_static_accessor' => true,
'semicolon_after_instruction' => false,
'set_type_to_cast' => true,
'short_scalar_cast' => true,
'simple_to_complex_string_variable' => true,
'simplified_if_return' => true,
'simplified_null_return' => false,
'single_blank_line_at_eof' => true,
'single_blank_line_before_namespace' => true,
'single_class_element_per_statement' => ['elements' => ['const', 'property']],