Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 13d5e18

Browse filesBrowse files
minor #37343 [3.4] Small update in our internal terminology (Nyholm)
This PR was merged into the 3.4 branch. Discussion ---------- [3.4] Small update in our internal terminology | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - The part of #37128 that applies to 3.4. Commits ------- c143aac [3.4] Small update in our internal terminology
2 parents 363eec2 + c143aac commit 13d5e18
Copy full SHA for 13d5e18

File tree

Expand file treeCollapse file tree

4 files changed

+9
-9
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+9
-9
lines changed

‎src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
*/
2424
class NotFoundActivationStrategy extends ErrorLevelActivationStrategy
2525
{
26-
private $blacklist;
26+
private $exclude;
2727
private $requestStack;
2828

2929
public function __construct(RequestStack $requestStack, array $excludedUrls, $actionLevel)
3030
{
3131
parent::__construct($actionLevel);
3232

3333
$this->requestStack = $requestStack;
34-
$this->blacklist = '{('.implode('|', $excludedUrls).')}i';
34+
$this->exclude = '{('.implode('|', $excludedUrls).')}i';
3535
}
3636

3737
public function isHandlerActivated(array $record)
@@ -45,7 +45,7 @@ public function isHandlerActivated(array $record)
4545
&& 404 == $record['context']['exception']->getStatusCode()
4646
&& ($request = $this->requestStack->getMasterRequest())
4747
) {
48-
return !preg_match($this->blacklist, $request->getPathInfo());
48+
return !preg_match($this->exclude, $request->getPathInfo());
4949
}
5050

5151
return $isActivated;

‎src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ private function patternsToRegexps($patterns)
136136

137137
private function matchAnyRegexps($class, $regexps)
138138
{
139-
$blacklisted = false !== strpos($class, 'Test');
139+
$isTest = false !== strpos($class, 'Test');
140140

141141
foreach ($regexps as $regex) {
142-
if ($blacklisted && false === strpos($regex, 'Test')) {
142+
if ($isTest && false === strpos($regex, 'Test')) {
143143
continue;
144144
}
145145

‎src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
class CurrencyDataGenerator extends AbstractDataGenerator
2727
{
28-
private static $blacklist = [
28+
private static $denylist = [
2929
'XBA' => true, // European Composite Unit
3030
'XBB' => true, // European Monetary Unit
3131
'XBC' => true, // European Unit of Account (XBC)
@@ -136,7 +136,7 @@ private function generateSymbolNamePairs(ArrayAccessibleResourceBundle $rootBund
136136
$symbolNamePairs = iterator_to_array($rootBundle['Currencies']);
137137

138138
// Remove unwanted currencies
139-
$symbolNamePairs = array_diff_key($symbolNamePairs, self::$blacklist);
139+
$symbolNamePairs = array_diff_key($symbolNamePairs, self::$denylist);
140140

141141
return $symbolNamePairs;
142142
}

‎src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
class RegionDataGenerator extends AbstractDataGenerator
2929
{
30-
private static $blacklist = [
30+
private static $denylist = [
3131
// Look like countries, but are sub-continents
3232
'QO' => true, // Outlying Oceania
3333
'EU' => true, // European Union
@@ -50,7 +50,7 @@ class RegionDataGenerator extends AbstractDataGenerator
5050

5151
public static function isValidCountryCode($region)
5252
{
53-
if (isset(self::$blacklist[$region])) {
53+
if (isset(self::$denylist[$region])) {
5454
return false;
5555
}
5656

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.