diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #37343 [3.4] Small update in our internal terminology (Nyholm)

Browse Source 
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
-------

c143aacd81 [3.4] Small update in our internal terminology
This commit is contained in:
Nicolas Grekas 2020-06-18 18:37:43 +02:00
commit 13d5e180d2
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
View File

@ -23,7 +23,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
*/ */
class NotFoundActivationStrategy extends ErrorLevelActivationStrategy class NotFoundActivationStrategy extends ErrorLevelActivationStrategy
{ {
private $blacklist; private $exclude;
private $requestStack; private $requestStack;
public function __construct(RequestStack $requestStack, array $excludedUrls, $actionLevel) public function __construct(RequestStack $requestStack, array $excludedUrls, $actionLevel)
@ -31,7 +31,7 @@ class NotFoundActivationStrategy extends ErrorLevelActivationStrategy
parent::__construct($actionLevel); parent::__construct($actionLevel);
$this->requestStack = $requestStack; $this->requestStack = $requestStack;
$this->blacklist = '{('.implode('|', $excludedUrls).')}i'; $this->exclude = '{('.implode('|', $excludedUrls).')}i';
} }
public function isHandlerActivated(array $record) public function isHandlerActivated(array $record)
@ -45,7 +45,7 @@ class NotFoundActivationStrategy extends ErrorLevelActivationStrategy
&& 404 == $record['context']['exception']->getStatusCode() && 404 == $record['context']['exception']->getStatusCode()
&& ($request = $this->requestStack->getMasterRequest()) && ($request = $this->requestStack->getMasterRequest())
) { ) {
return !preg_match($this->blacklist, $request->getPathInfo()); return !preg_match($this->exclude, $request->getPathInfo());
} }
return $isActivated; return $isActivated;

4
src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
View File

@ -136,10 +136,10 @@ class AddAnnotatedClassesToCachePass implements CompilerPassInterface
private function matchAnyRegexps($class, $regexps) private function matchAnyRegexps($class, $regexps)
{ {
$blacklisted = false !== strpos($class, 'Test'); $isTest = false !== strpos($class, 'Test');
foreach ($regexps as $regex) { foreach ($regexps as $regex) {
if ($blacklisted && false === strpos($regex, 'Test')) { if ($isTest && false === strpos($regex, 'Test')) {
continue; continue;
} }

4
src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
View File

@ -25,7 +25,7 @@ use Symfony\Component\Intl\Data\Util\LocaleScanner;
*/ */
class CurrencyDataGenerator extends AbstractDataGenerator class CurrencyDataGenerator extends AbstractDataGenerator
{ {
private static $blacklist = [ private static $denylist = [
'XBA' => true, // European Composite Unit 'XBA' => true, // European Composite Unit
'XBB' => true, // European Monetary Unit 'XBB' => true, // European Monetary Unit
'XBC' => true, // European Unit of Account (XBC) 'XBC' => true, // European Unit of Account (XBC)
@ -136,7 +136,7 @@ class CurrencyDataGenerator extends AbstractDataGenerator
$symbolNamePairs = iterator_to_array($rootBundle['Currencies']); $symbolNamePairs = iterator_to_array($rootBundle['Currencies']);
// Remove unwanted currencies // Remove unwanted currencies
$symbolNamePairs = array_diff_key($symbolNamePairs, self::$blacklist); $symbolNamePairs = array_diff_key($symbolNamePairs, self::$denylist);
return $symbolNamePairs; return $symbolNamePairs;
} }

4
src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
View File

@ -27,7 +27,7 @@ use Symfony\Component\Intl\Data\Util\LocaleScanner;
*/ */
class RegionDataGenerator extends AbstractDataGenerator class RegionDataGenerator extends AbstractDataGenerator
{ {
private static $blacklist = [ private static $denylist = [
// Look like countries, but are sub-continents // Look like countries, but are sub-continents
'QO' => true, // Outlying Oceania 'QO' => true, // Outlying Oceania
'EU' => true, // European Union 'EU' => true, // European Union
@ -50,7 +50,7 @@ class RegionDataGenerator extends AbstractDataGenerator
public static function isValidCountryCode($region) public static function isValidCountryCode($region)
{ {
if (isset(self::$blacklist[$region])) { if (isset(self::$denylist[$region])) {
return false; return false;
} }