Scope all PSR libraries and remove PSR Log compatibility layers

src/Controller/Controller_Actions.php

@@ -11,7 +11,7 @@
 use GFPDF\Helper\Helper_Notices;
 use GFPDF\Model\Model_Actions;
 use GFPDF\View\View_Actions;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Controller/Controller_Custom_Fonts.php

@@ -20,7 +20,7 @@
 use GFPDF\Model\Model_Custom_Fonts;
 use GFPDF_Vendor\GravityPdf\Upload\Exception as UploadException;
 use GFPDF_Vendor\GravityPdf\Upload\Validation\Extension;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 use WP_Error;
 use WP_REST_Request;
 use WP_REST_Server;

src/Controller/Controller_Install.php

@@ -13,7 +13,7 @@
 use GFPDF\Helper\Helper_Notices;
 use GFPDF\Helper\Controller_Uninstaller;
 use GFPDF\Model\Model_Install;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Controller/Controller_PDF.php

@@ -12,7 +12,7 @@
 use GFPDF\Model\Model_PDF;
 use GFPDF\Statics\Debug;
 use GFPDF\View\View_PDF;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Controller/Controller_Pdf_Queue.php

@@ -9,7 +9,7 @@
 use GFPDF\Helper\Helper_Interface_Filters;
 use GFPDF\Helper\Helper_Pdf_Queue;
 use GFPDF\Model\Model_PDF;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Controller/Controller_Save_Core_Fonts.php

@@ -6,7 +6,7 @@
 use GFPDF\Helper\Helper_Data;
 use GFPDF\Helper\Helper_Interface_Actions;
 use GFPDF\Helper\Helper_Misc;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Controller/Controller_Settings.php

@@ -15,7 +15,7 @@
 use GFPDF\Helper\Helper_Notices;
 use GFPDF\Model\Model_Settings;
 use GFPDF\View\View_Settings;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Controller/Controller_Shortcodes.php

@@ -8,7 +8,7 @@
 use GFPDF\Helper\Helper_Interface_Filters;
 use GFPDF\Model\Model_Shortcodes;
 use GFPDF\View\View_Shortcodes;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Helper/Helper_Abstract_Addon.php

@@ -3,7 +3,7 @@
 namespace GFPDF\Helper;
 
 use GFPDF\Helper\Licensing\EDD_SL_Plugin_Updater;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Helper/Helper_Abstract_Options.php

@@ -5,7 +5,7 @@
 use GFPDF\Controller\Controller_Custom_Fonts;
 use GFPDF\Model\Model_Custom_Fonts;
 use GFPDF\Statics\Kses;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 use WP_Error;
 
 /**

src/Helper/Helper_Abstract_Pdf_Shortcode.php

@@ -8,7 +8,7 @@
 use GFPDF\Exceptions\GravityPdfShortcodePdfInactiveException;
 use GPDFAPI;
 use GravityView_View;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Helper/Helper_Misc.php

@@ -6,7 +6,7 @@
 use Exception;
 use GFCommon;
 use GFMultiCurrency;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use WP_Error;

src/Helper/Helper_PDF.php

@@ -10,7 +10,7 @@
 use GFPDF_Vendor\Mpdf\MpdfException;
 use GFPDF_Vendor\Mpdf\Utils\UtfString;
 use GFPDF_Vendor\Mpdf\Container\SimpleContainer;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Helper/Helper_Pdf_Queue.php

@@ -5,7 +5,7 @@
 use Exception;
 use GF_Background_Process;
 use GFCommon;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Helper/Helper_Templates.php

@@ -4,7 +4,7 @@
 
 use Exception;
 use GPDFAPI;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 use stdClass;
 
 /**

src/Helper/Helper_Trait_Logger.php

@@ -2,7 +2,7 @@
 
 namespace GFPDF\Helper;
 
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Helper/Log/Logger.php

@@ -7,10 +7,10 @@
 use GFPDF_Vendor\Monolog\Formatter\LineFormatter;
 use GFPDF_Vendor\Monolog\Handler\NullHandler;
 use GFPDF_Vendor\Monolog\Handler\StreamHandler;
-use GFPDF_Vendor\Monolog\Logger as MonoLoggerPsrLog1;
+use GFPDF_Vendor\Monolog\Logger as Monolog;
 use GFPDF_Vendor\Monolog\Processor\IntrospectionProcessor;
 use GFPDF_Vendor\Monolog\Processor\MemoryPeakUsageProcessor;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF
@@ -134,14 +134,14 @@ protected function setup_logger() {
 
 		/* Setup our Gravity Forms local file logger, if enabled */
 		try {
-			$this->log = $this->get_monolog();
+			$this->log = new Monolog( $this->slug );
 			$this->log->setTimezone( wp_timezone() );
 
 			$this->setup_gravityforms_logging();
 
 			/* Check if we have a handler pushed and add our Introspection and Memory Peak usage processors */
 			if ( count( $this->log->getHandlers() ) > 0 && substr( php_sapi_name(), 0, 3 ) !== 'cli' ) {
-				$this->log->pushProcessor( new IntrospectionProcessor( MonoLoggerPsrLog1::DEBUG, [ 'MonoLogger' ] ) );
+				$this->log->pushProcessor( new IntrospectionProcessor( Monolog::DEBUG, [ 'MonoLogger' ] ) );
 				$this->log->pushProcessor( new MemoryPeakUsageProcessor() );
 
 				return;
@@ -151,7 +151,7 @@ protected function setup_logger() {
 		}
 
 		/* Disable logging if using CLI, or if Gravity Forms logging isn't enabled */
-		$this->log->pushHandler( new NullHandler( MonoLoggerPsrLog1::INFO ) ); /* throw logs away */
+		$this->log->pushHandler( new NullHandler( Monolog::INFO ) ); /* throw logs away */
 	}
 
 	/**
@@ -198,7 +198,7 @@ protected function setup_gravityforms_logging() {
 		$this->rotate_logs( $log_filename );
 
 		/* Convert Gravity Forms log levels to the appropriate Monolog level */
-		$monolog_level = $log_level === 4 ? MonoLoggerPsrLog1::ERROR : MonoLoggerPsrLog1::DEBUG;
+		$monolog_level = $log_level === 4 ? Monolog::ERROR : Monolog::DEBUG;
 
 		/* Setup our stream and change the format to more-suit Gravity Forms */
 		$formatter = new LineFormatter( "%datetime% - %level_name% --> %message%\n|--> %context%\n|--> %extra%\n", 'Y-m-d H:i:s.u (P)' );
@@ -273,68 +273,4 @@ function ( $a, $b ) {
 			}
 		}
 	}
-
-	/**
-	 * Return a class that is compatible with the PSR/Log version loaded
-	 *
-	 * This compatibility layer is necessary because:
-	 *
-	 * - \Psr\Log\LoggerInterface is type-hinted throughout Gravity PDF + add-ons and not easily altered
-	 * - Gravity PDF includes v1 of the Psr\Log library, which is incompatible with v2 and v3
-	 * - While Gravity PDF supports PHP 7.3+ the Psr\Log library cannot be upgraded from v1
-	 * - Other WordPress plugins are shipping Psr\Log v2 and v3
-	 * - A PHP declaration error occurs when Gravity PDF runs alongside Psr\Log v2 or v3
-	 *
-	 * This is a temporary measure. Over time our plugins will be updated to support both \Psr\Log\LoggerInterface and '\GFPDF_Vendor\Psr\Log\LoggerInterface' and this won't be required.
-	 *
-	 * @return LoggerInterface
-	 * @since 6.14.0
-	 *
-	 */
-	protected function get_monolog() {
-		static $psr_log_version;
-
-		if ( empty( $psr_log_version ) ) {
-			/* Check what version of \Psr\Log is actually loaded and return a compatible version of Monolog */
-			if ( trait_exists( '\Psr\Log\LoggerTrait' ) ) {
-				$reflected       = new \ReflectionClass( '\Psr\Log\LoggerTrait' );
-				$psr_log_content = file_get_contents( $reflected->getFileName() ); //phpcs:ignore
-
-				/* Test for v3 */
-				if ( strpos( $psr_log_content, 'function log($level, string|\Stringable $message, array $context = []): void;' ) !== false ) {
-					$psr_log_version = 3;
-				}
-
-				/* Test for v2 */
-				if ( strpos( $psr_log_content, 'function log($level, string|\Stringable $message, array $context = []);' ) !== false ) {
-					$psr_log_version = 2;
-				}
-
-				/* Default to v1 when no match found */
-				if ( empty( $psr_log_version ) ) {
-					$psr_log_version = 1;
-				}
-			} else {
-				/* No PSR Log library loaded. Alias namespaced v1 */
-				$psr_log_version = 1;
-				class_alias( '\GFPDF_Vendor\Psr\Log\AbstractLogger', '\Psr\Log\AbstractLogger' );
-				class_alias( '\GFPDF_Vendor\Psr\Log\InvalidArgumentException', '\Psr\Log\InvalidArgumentException' );
-				class_alias( '\GFPDF_Vendor\Psr\Log\LoggerAwareInterface', '\Psr\Log\LoggerAwareInterface' );
-				class_alias( '\GFPDF_Vendor\Psr\Log\LoggerAwareTrait', '\Psr\Log\LoggerAwareTrait' );
-				class_alias( '\GFPDF_Vendor\Psr\Log\LoggerInterface', '\Psr\Log\LoggerInterface' );
-				class_alias( '\GFPDF_Vendor\Psr\Log\LoggerTrait', '\Psr\Log\LoggerTrait' );
-				class_alias( '\GFPDF_Vendor\Psr\Log\LogLevel', '\Psr\Log\LogLevel' );
-				class_alias( '\GFPDF_Vendor\Psr\Log\NullLogger', '\Psr\Log\NullLogger' );
-			}
-		}
-
-		switch ( $psr_log_version ) {
-			case 1:
-				return new MonoLoggerPsrLog1( $this->slug );
-
-			case 2:
-			case 3:
-				return new MonoLoggerPsrLog2And3( $this->slug );
-		}
-	}
 }

src/Model/Model_Form_Settings.php

@@ -16,7 +16,7 @@
 use GFPDF\Helper\Helper_PDF_List_Table;
 use GFPDF\Helper\Helper_Templates;
 use GFPDF\View\View_GravityForm_Settings_Markup;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Model/Model_Install.php

@@ -10,7 +10,7 @@
 use GFPDF\Helper\Helper_Misc;
 use GFPDF\Helper\Helper_Notices;
 use GFPDF\Helper\Helper_Pdf_Queue;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Model/Model_Mergetags.php

@@ -7,7 +7,7 @@
 use GFPDF\Helper\Helper_Interface_Url_Signer;
 use GFPDF\Helper\Helper_Misc;
 use GFPDF\Helper\Helper_Options_Fields;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Model/Model_PDF.php

@@ -28,7 +28,7 @@
 use GFQuiz;
 use GFResults;
 use GP_Populate_Anything_Live_Merge_Tags;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use WP_Error;

src/Model/Model_Settings.php

@@ -12,7 +12,7 @@
 use GFPDF\Helper\Helper_Notices;
 use GFPDF\Helper\Helper_Options_Fields;
 use GFPDF\Helper\Helper_Templates;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Model/Model_System_Report.php

@@ -10,7 +10,7 @@
 use GFPDF\Helper\Helper_Misc;
 use GFPDF\Helper\Helper_Templates;
 use GFPDF_Major_Compatibility_Checks;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF

src/Model/Model_Templates.php

@@ -13,7 +13,7 @@
 use GFPDF_Vendor\GravityPdf\Upload\Validation\Mimetype;
 use GFPDF_Vendor\GravityPdf\Upload\Validation\Size;
 use GPDFAPI;
-use Psr\Log\LoggerInterface;
+use GFPDF_Vendor\Psr\Log\LoggerInterface;
 
 /**
  * @package     Gravity PDF