feat(*): Use namespace to avoid class confilcts with other third part…

…y code (#149)
crowdsecurity · Mar 29, 2024 · 2685fa5 · 2685fa5
1 parent 5d11f87
commit 2685fa5
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 6 deletions.
diff --git a/inc/Bouncer.php b/inc/Bouncer.php
@@ -1,6 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
+namespace CrowdSecWordPressBouncer;
+
 use CrowdSec\RemediationEngine\CacheStorage\CacheStorageException;
 use CrowdSec\RemediationEngine\LapiRemediation;
 use CrowdSec\Common\Logger\FileLog;

diff --git a/inc/Constants.php b/inc/Constants.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace CrowdSecWordPressBouncer;
+
 use CrowdSecBouncer\Constants as LibConstants;
 
 /**

diff --git a/inc/admin/advanced-settings.php b/inc/admin/advanced-settings.php
@@ -1,8 +1,12 @@
 <?php
 
+use CrowdSecWordPressBouncer\AdminNotice;
+use CrowdSecWordPressBouncer\Constants;
+use CrowdSecWordPressBouncer\Bouncer;
 use CrowdSecBouncer\BouncerException;
 use CrowdSec\RemediationEngine\Constants as RemConstants;
 use IPLib\Factory;
+
 require_once __DIR__ . '/../Constants.php';
 require_once __DIR__ . '/../options-config.php';
 require_once __DIR__ . '/notice.php';

diff --git a/inc/admin/init.php b/inc/admin/init.php
@@ -1,7 +1,10 @@
 <?php
 
+use CrowdSecWordPressBouncer\Constants;
 use CrowdSecBouncer\BouncerException;
 use CrowdSec\RemediationEngine\Geolocation;
+use CrowdSecWordPressBouncer\AdminNotice;
+use CrowdSecWordPressBouncer\Bouncer;
 
 require_once __DIR__ . '/notice.php';
 require_once __DIR__ . '/../Constants.php';
@@ -222,7 +225,7 @@ function testGeolocationInAdminPage($ip)
             !isset($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'crowdsec_test_connection')) {
             die('This link expired.');
         }
-        $ip = isset($_POST['crowdsec_test_connection_ip']) ? $_POST['crowdsec_test_connection_ip'] : $_SERVER['REMOTE_ADDR'];
+        $ip = $_POST['crowdsec_test_connection_ip'] ?? $_SERVER['REMOTE_ADDR'];
         testBouncerConnexionInAdminPage($ip);
         header("Location: {$_SERVER['HTTP_REFERER']}");
         exit(0);
@@ -233,7 +236,7 @@ function testGeolocationInAdminPage($ip)
             !isset($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'crowdsec_test_geolocation')) {
             die('This link expired.');
         }
-        $ip = isset($_POST['crowdsec_test_geolocation_ip']) ? $_POST['crowdsec_test_geolocation_ip'] : $_SERVER['REMOTE_ADDR'];
+        $ip = $_POST['crowdsec_test_geolocation_ip'] ?? $_SERVER['REMOTE_ADDR'];
         testGeolocationInAdminPage($ip);
         header("Location: {$_SERVER['HTTP_REFERER']}");
         exit(0);

diff --git a/inc/admin/notice.php b/inc/admin/notice.php
@@ -1,13 +1,15 @@
 <?php
 
+namespace CrowdSecWordPressBouncer;
+
 class AdminNotice
 {
     const NOTICE_FIELD = 'crowdsec_admin_notice_message';
 
     public function displayAdminNotice()
     {
         $option = is_multisite() ? get_site_option(self::NOTICE_FIELD) : get_option(self::NOTICE_FIELD);
-        $message = isset($option['message']) ? $option['message'] : false;
+        $message = $option['message'] ?? false;
         $noticeLevel = !empty($option['notice-level']) ? $option['notice-level'] : 'notice-error';
 
         if ($message) {

diff --git a/inc/admin/settings.php b/inc/admin/settings.php
@@ -1,5 +1,7 @@
 <?php
 require_once __DIR__ . '/../Constants.php';
+use CrowdSecWordPressBouncer\Constants;
+
 
 function adminSettings()
 {

diff --git a/inc/bounce-current-ip.php b/inc/bounce-current-ip.php
@@ -6,6 +6,8 @@
 require_once __DIR__ . '/Constants.php';
 require_once __DIR__ . '/options-config.php';
 
+use CrowdSecWordPressBouncer\Constants;
+use CrowdSecWordPressBouncer\Bouncer;
 use CrowdSecBouncer\BouncerException;
 use Psr\Cache\CacheException;
 

diff --git a/inc/options-config.php b/inc/options-config.php
@@ -1,5 +1,7 @@
 <?php
 require_once __DIR__ . '/Constants.php';
+use CrowdSecWordPressBouncer\Constants;
+
 
 function getCrowdSecOptionsConfig(): array
 {

diff --git a/inc/plugin-setup.php b/inc/plugin-setup.php
@@ -1,5 +1,7 @@
 <?php
 
+use CrowdSecWordPressBouncer\Constants;
+
 require_once __DIR__.'/options-config.php';
 require_once __DIR__ . '/Constants.php';
 

diff --git a/inc/scheduling.php b/inc/scheduling.php
@@ -1,4 +1,7 @@
 <?php
+
+use CrowdSecWordPressBouncer\Bouncer;
+
 require_once __DIR__ . '/options-config.php';
 require_once __DIR__ . '/Bouncer.php';
 

diff --git a/inc/standalone-bounce.php b/inc/standalone-bounce.php
@@ -3,13 +3,12 @@
 define('CROWDSEC_STANDALONE_RUNNING_CONTEXT', true);
 
 require_once __DIR__.'/../vendor/autoload.php';
-
 require_once __DIR__.'/Bouncer.php';
 require_once __DIR__.'/Constants.php';
 
-
 use CrowdSecBouncer\BouncerException;
-
+use CrowdSecWordPressBouncer\Constants;
+use CrowdSecWordPressBouncer\Bouncer;
 
 // If there is any technical problem while bouncing, don't block the user.
 try {