From c143aacd811d0cab4e3351cb77d7d3e37c031c16 Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Sat, 13 Jun 2020 10:25:25 +0200
Subject: [PATCH] [3.4] Small update in our internal terminology

---
 .../Handler/FingersCrossed/NotFoundActivationStrategy.php   | 6 +++---
 .../DependencyInjection/AddAnnotatedClassesToCachePass.php  | 4 ++--
 .../Component/Intl/Data/Generator/CurrencyDataGenerator.php | 4 ++--
 .../Component/Intl/Data/Generator/RegionDataGenerator.php   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
index ed41929a2c..e5ccf1afc5 100644
--- a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
+++ b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
@@ -23,7 +23,7 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
  */
 class NotFoundActivationStrategy extends ErrorLevelActivationStrategy
 {
-    private $blacklist;
+    private $exclude;
     private $requestStack;
 
     public function __construct(RequestStack $requestStack, array $excludedUrls, $actionLevel)
@@ -31,7 +31,7 @@ class NotFoundActivationStrategy extends ErrorLevelActivationStrategy
         parent::__construct($actionLevel);
 
         $this->requestStack = $requestStack;
-        $this->blacklist = '{('.implode('|', $excludedUrls).')}i';
+        $this->exclude = '{('.implode('|', $excludedUrls).')}i';
     }
 
     public function isHandlerActivated(array $record)
@@ -45,7 +45,7 @@ class NotFoundActivationStrategy extends ErrorLevelActivationStrategy
             && 404 == $record['context']['exception']->getStatusCode()
             && ($request = $this->requestStack->getMasterRequest())
         ) {
-            return !preg_match($this->blacklist, $request->getPathInfo());
+            return !preg_match($this->exclude, $request->getPathInfo());
         }
 
         return $isActivated;
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
index 8bb03bd0c7..b59949379d 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
@@ -136,10 +136,10 @@ class AddAnnotatedClassesToCachePass implements CompilerPassInterface
 
     private function matchAnyRegexps($class, $regexps)
     {
-        $blacklisted = false !== strpos($class, 'Test');
+        $isTest = false !== strpos($class, 'Test');
 
         foreach ($regexps as $regex) {
-            if ($blacklisted && false === strpos($regex, 'Test')) {
+            if ($isTest && false === strpos($regex, 'Test')) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
index b4543428eb..a5ed6d1026 100644
--- a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
@@ -25,7 +25,7 @@ use Symfony\Component\Intl\Data\Util\LocaleScanner;
  */
 class CurrencyDataGenerator extends AbstractDataGenerator
 {
-    private static $blacklist = [
+    private static $denylist = [
         'XBA' => true, // European Composite Unit
         'XBB' => true, // European Monetary Unit
         'XBC' => true, // European Unit of Account (XBC)
@@ -136,7 +136,7 @@ class CurrencyDataGenerator extends AbstractDataGenerator
         $symbolNamePairs = iterator_to_array($rootBundle['Currencies']);
 
         // Remove unwanted currencies
-        $symbolNamePairs = array_diff_key($symbolNamePairs, self::$blacklist);
+        $symbolNamePairs = array_diff_key($symbolNamePairs, self::$denylist);
 
         return $symbolNamePairs;
     }
diff --git a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
index bab85b11b1..b50a585de6 100644
--- a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
@@ -27,7 +27,7 @@ use Symfony\Component\Intl\Data\Util\LocaleScanner;
  */
 class RegionDataGenerator extends AbstractDataGenerator
 {
-    private static $blacklist = [
+    private static $denylist = [
         // Look like countries, but are sub-continents
         'QO' => true, // Outlying Oceania
         'EU' => true, // European Union
@@ -50,7 +50,7 @@ class RegionDataGenerator extends AbstractDataGenerator
 
     public static function isValidCountryCode($region)
     {
-        if (isset(self::$blacklist[$region])) {
+        if (isset(self::$denylist[$region])) {
             return false;
         }