Skip to content

[5.6] Feature/refactor Str::languageSpecificCharsArray() #23330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SergeyPodgornyy wants to merge 4 commits into from
Closed

[5.6] Feature/refactor Str::languageSpecificCharsArray() #23330

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7dd190
Merge pull request #1 from laravel/5.5
SergeyPodgornyy Feb 26, 2018
7ae6598
Merge remote-tracking branch 'upstream/5.6' into 5.6
Feb 28, 2018
8f2a2af
Str: Refactor languageSpecificCharsArray()
Feb 28, 2018
4ca0c1d
Roll back is_null improvement in Str::ascii()
Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/Illuminate/Support/Str.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ public static function ascii($value, $language = 'en')
{
$languageSpecific = static::languageSpecificCharsArray($language);

if (! is_null($languageSpecific)) {
Copy link
Author

@SergeyPodgornyy SergeyPodgornyy Feb 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/kalessil/phpinspectionsea/blob/master/docs/probable-bugs.md#null-pointer-exceptions-prevention

is_object(), is_null() and similar is_*() functions calls are not analyzed, instead we recommend to rely on null identity and instanceof operators;

All 'is_null(...)' calls can be safely replaced with 'null === ...' constructs (or 'null !== ...' if the original construct was negated).

Copy link
Contributor

@ntzm ntzm Feb 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rest of the framework uses is_null

Copy link
Author

@SergeyPodgornyy SergeyPodgornyy Feb 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ntzm yes, but it will be more clear and correct to use null !== .... Should I revert this changes?

Copy link
Contributor

@ntzm ntzm Feb 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should stay consistent throughout the framework

Copy link
Author

@SergeyPodgornyy SergeyPodgornyy Feb 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ntzm Rolled back

$value = str_replace($languageSpecific[0], $languageSpecific[1], $value);
if ($languageSpecific !== null) {
$value = str_replace(array_keys($languageSpecific), array_values($languageSpecific), $value);
}

foreach (static::charsArray() as $key => $val) {
Expand Down Expand Up @@ -703,12 +703,22 @@ protected static function languageSpecificCharsArray($language)
if (! isset($languageSpecific)) {
$languageSpecific = [
'bg' => [
['х', 'Х', 'щ', 'Щ', 'ъ', 'Ъ', 'ь', 'Ь'],
['h', 'H', 'sht', 'SHT', 'a', 'А', 'y', 'Y'],
'х' => 'h',
'Х' => 'H',
'щ' => 'sht',
'Щ' => 'SHT',
'ъ' => 'a',
'Ъ' => 'А',
'ь' => 'y',
'Ь' => 'Y',
],
'de' => [
['ä', 'ö', 'ü', 'Ä', 'Ö', 'Ü'],
['ae', 'oe', 'ue', 'AE', 'OE', 'UE'],
'ä' => 'ae',
'ö' => 'oe',
'ü' => 'ue',
'Ä' => 'AE',
'Ö' => 'OE',
'Ü' => 'UE',
],
];
}
Expand Down