feat(*): Move forced_test_ip from configurations to settings

Author: julienloizelet

src/AbstractBounce.php

@@ -110,7 +110,6 @@ protected function initLoggerHelper($logDirectoryPath, $loggerName): void
     protected function bounceCurrentIp()
     {
         $ip = $this->getRemoteIp();
-
         // X-Forwarded-For override
         $XForwardedForHeader = $this->getHttpRequestHeader('X-Forwarded-For');
         if (null !== $XForwardedForHeader) {
@@ -129,8 +128,9 @@ protected function bounceCurrentIp()
 
         try {
             $this->getBouncerInstance();
-            $remediation = $this->bouncer->getRemediationForIp($ip);
-            $this->handleRemediation($remediation, $ip);
+            $ipToCheck = !empty($this->settings['forced_test_ip']) ? $this->settings['forced_test_ip'] : $ip;
+            $remediation = $this->bouncer->getRemediationForIp($ipToCheck);
+            $this->handleRemediation($remediation, $ipToCheck);
         } catch (Exception $e) {
             $this->logger->warning('', [
                 'type' => 'UNKNOWN_EXCEPTION_WHILE_BOUNCING',

src/Bouncer.php

@@ -115,10 +115,9 @@ private function capRemediationLevel(string $remediation): string
      */
     public function getRemediationForIp(string $ip): string
     {
-        $ipToCheck = !empty($this->config['forced_test_ip']) ? $this->config['forced_test_ip'] : $ip;
-        $address = Factory::parseAddressString($ipToCheck, ParseStringFlag::MAY_INCLUDE_ZONEID);
+        $address = Factory::parseAddressString($ip, ParseStringFlag::MAY_INCLUDE_ZONEID);
         if (null === $address) {
-            throw new BouncerException("IP $ipToCheck format is invalid.");
+            throw new BouncerException("IP $ip format is invalid.");
         }
         $remediation = $this->apiCache->get($address);
 

src/Configuration.php

@@ -33,7 +33,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->scalarNode('api_user_agent')->defaultValue(Constants::BASE_USER_AGENT)->end()
                 ->integerNode('api_timeout')->defaultValue(Constants::API_TIMEOUT)->end()
                 ->booleanNode('stream_mode')->defaultValue(false)->end()
-                ->scalarNode('forced_test_ip')->defaultValue('')->end()
                 ->enumNode('max_remediation_level')
                     ->values(Constants::ORDERED_REMEDIATIONS)
                     ->defaultValue(Constants::REMEDIATION_BAN)

src/StandAloneBounce.php

@@ -153,7 +153,6 @@ public function getBouncerInstance(): Bouncer
             'cache_expiration_for_clean_ip' => $cleanIpCacheDuration,
             'cache_expiration_for_bad_ip' => $badIpCacheDuration,
             'geolocation' => $geolocation,
-            'forced_test_ip' => $forcedTestIp,
         ]);
 
         return $this->bouncer;