Release v8.1.6

CHANGELOG.md

@@ -9,6 +9,7 @@ New features
 * More verbose helper methods for `Output`: `OutputBinaryData`, `OutputHttpInline`, `OutputHttpDownload`, `OutputFile` (since v8.1.2)
 * Set font-size to `auto` in textarea and input in active forms to resize the font-size (@ChrisB9, #1721)
 * PHP 8.2 support in mPDF 8.1.3
+* Added support for `psr/log` v3 without dropping v2. (@markdorison, @apotek, @greg-1-anderson, #1857)
 
 Bugfixes
 --------

composer.json

@@ -24,11 +24,11 @@
 		"php": "^5.6 || ^7.0 || ~8.0.0 || ~8.1.0 || ~8.2.0",
 		"ext-gd": "*",
 		"ext-mbstring": "*",
+		"mpdf/psr-log-aware-trait": "^2.0 || ^3.0",
 		"myclabs/deep-copy": "^1.7",
 		"paragonie/random_compat": "^1.4|^2.0|^9.99.99",
-		"php-http/message-factory": "^1.0",
 		"psr/http-message": "^1.0",
-		"psr/log": "^1.0 || ^2.0",
+		"psr/log": "^1.0 || ^2.0 || ^3.0",
 		"setasign/fpdi": "^2.1"
 	},
 	"require-dev": {

phpunit.xml

@@ -6,7 +6,7 @@
 
 	<testsuites>
 		<testsuite name="Tests">
-			<directory suffix=".php">./tests</directory>
+			<directory suffix="Test.php">./tests</directory>
 		</testsuite>
 	</testsuites>
 

src/AssetFetcher.php

@@ -7,19 +7,20 @@
 use Mpdf\Http\ClientInterface;
 use Mpdf\Http\Request;
 use Mpdf\Log\Context as LogContext;
+use Mpdf\PsrLogAwareTrait\PsrLogAwareTrait;
 use Psr\Log\LoggerInterface;
 
 class AssetFetcher implements \Psr\Log\LoggerAwareInterface
 {
 
+	use PsrLogAwareTrait;
+
 	private $mpdf;
 
 	private $contentLoader;
 
 	private $http;
 
-	private $logger;
-
 	public function __construct(Mpdf $mpdf, LocalContentLoaderInterface $contentLoader, ClientInterface $http, LoggerInterface $logger)
 	{
 		$this->mpdf = $mpdf;
@@ -116,9 +117,4 @@ public function isPathLocal($path)
 		return strpos($path, '://') === false; // @todo More robust implementation
 	}
 
-	public function setLogger(LoggerInterface $logger)
-	{
-		$this->logger = $logger;
-	}
-
 }

src/Http/CurlHttpClient.php

@@ -4,16 +4,16 @@
 
 use Mpdf\Log\Context as LogContext;
 use Mpdf\Mpdf;
+use Mpdf\PsrLogAwareTrait\PsrLogAwareTrait;
 use Psr\Http\Message\RequestInterface;
 use Psr\Log\LoggerInterface;
 
 class CurlHttpClient implements \Mpdf\Http\ClientInterface, \Psr\Log\LoggerAwareInterface
 {
+	use PsrLogAwareTrait;
 
 	private $mpdf;
 
-	private $logger;
-
 	public function __construct(Mpdf $mpdf, LoggerInterface $logger)
 	{
 		$this->mpdf = $mpdf;
@@ -116,9 +116,4 @@ static function ($curl, $header) use (&$response) {
 			->withBody(Stream::create($data));
 	}
 
-	public function setLogger(LoggerInterface $logger)
-	{
-		$this->logger = $logger;
-	}
-
 }

src/Http/SocketHttpClient.php

@@ -3,13 +3,14 @@
 namespace Mpdf\Http;
 
 use Mpdf\Log\Context as LogContext;
+use Mpdf\PsrLogAwareTrait\PsrLogAwareTrait;
 use Psr\Http\Message\RequestInterface;
 use Psr\Log\LoggerInterface;
 
 class SocketHttpClient implements \Mpdf\Http\ClientInterface, \Psr\Log\LoggerAwareInterface
 {
 
-	private $logger;
+	use PsrLogAwareTrait;
 
 	public function __construct(LoggerInterface $logger)
 	{
@@ -104,9 +105,4 @@ public function sendRequest(RequestInterface $request)
 			->withBody($stream);
 	}
 
-	public function setLogger(LoggerInterface $logger)
-	{
-		$this->logger = $logger;
-	}
-
 }

src/Image/ImageProcessor.php

@@ -13,12 +13,15 @@
 use Mpdf\Log\Context as LogContext;
 use Mpdf\Mpdf;
 use Mpdf\Otl;
+use Mpdf\PsrLogAwareTrait\PsrLogAwareTrait;
 use Mpdf\SizeConverter;
 use Psr\Log\LoggerInterface;
 
 class ImageProcessor implements \Psr\Log\LoggerAwareInterface
 {
 
+	use PsrLogAwareTrait;
+
 	/**
 	 * @var \Mpdf\Mpdf
 	 */
@@ -89,11 +92,6 @@ class ImageProcessor implements \Psr\Log\LoggerAwareInterface
 	 */
 	private $assetFetcher;
 
-	/**
-	 * @var \Psr\Log\LoggerInterface
-	 */
-	public $logger;
-
 	public function __construct(
 		Mpdf $mpdf,
 		Otl $otl,
@@ -126,18 +124,6 @@ public function __construct(
 		$this->failedImages = [];
 	}
 
-	/**
-	 * @param \Psr\Log\LoggerInterface
-	 *
-	 * @return self
-	 */
-	public function setLogger(LoggerInterface $logger)
-	{
-		$this->logger = $logger;
-
-		return $this;
-	}
-
 	public function getImage(&$file, $firstTime = true, $allowvector = true, $orig_srcpath = false, $interpolation = false)
 	{
 		// mPDF 6

src/Mpdf.php

@@ -10,11 +10,11 @@
 use Mpdf\Log\Context as LogContext;
 use Mpdf\Fonts\MetricsGenerator;
 use Mpdf\Output\Destination;
+use Mpdf\PsrLogAwareTrait\MpdfPsrLogAwareTrait;
 use Mpdf\QrCode;
 use Mpdf\Utils\Arrays;
 use Mpdf\Utils\NumericString;
 use Mpdf\Utils\UtfString;
-use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
 /**
@@ -30,8 +30,9 @@ class Mpdf implements \Psr\Log\LoggerAwareInterface
 
 	use Strict;
 	use FpdiTrait;
+	use MpdfPsrLogAwareTrait;
 
-	const VERSION = '8.1.5';
+	const VERSION = '8.1.6';
 
 	const SCALE = 72 / 25.4;
 
@@ -966,11 +967,6 @@ class Mpdf implements \Psr\Log\LoggerAwareInterface
 	 */
 	private $scriptToLanguage;
 
-	/**
-	 * @var \Psr\Log\LoggerInterface
-	 */
-	private $logger;
-
 	/**
 	 * @var \Mpdf\Writer\BaseWriter
 	 */
@@ -1579,24 +1575,6 @@ public function cleanup()
 		$this->createdReaders = [];
 	}
 
-	/**
-	 * @param \Psr\Log\LoggerInterface
-	 *
-	 * @return \Mpdf\Mpdf
-	 */
-	public function setLogger(LoggerInterface $logger)
-	{
-		$this->logger = $logger;
-
-		foreach ($this->services as $name) {
-			if ($this->$name && $this->$name instanceof \Psr\Log\LoggerAwareInterface) {
-				$this->$name->setLogger($logger);
-			}
-		}
-
-		return $this;
-	}
-
 	private function initConfig(array $config)
 	{
 		$configObject = new ConfigVariables();

src/SizeConverter.php

@@ -4,10 +4,13 @@
 
 use Psr\Log\LoggerInterface;
 use Mpdf\Log\Context as LogContext;
+use Mpdf\PsrLogAwareTrait\PsrLogAwareTrait;
 
 class SizeConverter implements \Psr\Log\LoggerAwareInterface
 {
 
+	use PsrLogAwareTrait;
+
 	private $dpi;
 
 	private $defaultFontSize;
@@ -17,11 +20,6 @@ class SizeConverter implements \Psr\Log\LoggerAwareInterface
 	 */
 	private $mpdf;
 
-	/**
-	 * @var \Psr\Log\LoggerInterface
-	 */
-	private $logger;
-
 	public function __construct($dpi, $defaultFontSize, Mpdf $mpdf, LoggerInterface $logger)
 	{
 		$this->dpi = $dpi;
@@ -30,11 +28,6 @@ public function __construct($dpi, $defaultFontSize, Mpdf $mpdf, LoggerInterface
 		$this->logger = $logger;
 	}
 
-	public function setLogger(LoggerInterface $logger)
-	{
-		$this->logger = $logger;
-	}
-
 	/**
 	 * Depends of maxsize value to make % work properly. Usually maxsize == pagewidth
 	 * For text $maxsize = $fontsize

src/Writer/MetadataWriter.php

@@ -6,6 +6,7 @@
 use Mpdf\Form;
 use Mpdf\Mpdf;
 use Mpdf\Pdf\Protection;
+use Mpdf\PsrLogAwareTrait\PsrLogAwareTrait;
 use Mpdf\Utils\PdfDate;
 
 use Psr\Log\LoggerInterface;
@@ -14,6 +15,7 @@ class MetadataWriter implements \Psr\Log\LoggerAwareInterface
 {
 
 	use Strict;
+	use PsrLogAwareTrait;
 
 	/**
 	 * @var \Mpdf\Mpdf
@@ -35,11 +37,6 @@ class MetadataWriter implements \Psr\Log\LoggerAwareInterface
 	 */
 	private $protection;
 
-	/**
-	 * @var \Psr\Log\LoggerInterface
-	 */
-	private $logger;
-
 	public function __construct(Mpdf $mpdf, BaseWriter $writer, Form $form, Protection $protection, LoggerInterface $logger)
 	{
 		$this->mpdf = $mpdf;
@@ -808,11 +805,6 @@ public function writeTrailer() // _puttrailer
 		}
 	}
 
-	public function setLogger(LoggerInterface $logger)
-	{
-		$this->logger = $logger;
-	}
-
 	private function getVersionString()
 	{
 		$return = Mpdf::VERSION;

src/Writer/ResourceWriter.php

@@ -4,12 +4,14 @@
 
 use Mpdf\Strict;
 use Mpdf\Mpdf;
+use Mpdf\PsrLogAwareTrait\PsrLogAwareTrait;
 use Psr\Log\LoggerInterface;
 
 final class ResourceWriter implements \Psr\Log\LoggerAwareInterface
 {
 
 	use Strict;
+	use PsrLogAwareTrait;
 
 	/**
 	 * @var \Mpdf\Mpdf
@@ -66,11 +68,6 @@ final class ResourceWriter implements \Psr\Log\LoggerAwareInterface
 	 */
 	private $javaScriptWriter;
 
-	/**
-	 * @var \Psr\Log\LoggerInterface
-	 */
-	private $logger;
-
 	public function __construct(
 		Mpdf $mpdf,
 		BaseWriter $writer,
@@ -243,14 +240,4 @@ public function writeResources() // _putresources
 			$this->writer->write('endobj');
 		}
 	}
-
-	/**
-	 * @param \Psr\Log\LoggerInterface $logger
-	 *
-	 * @return void
-	 */
-	public function setLogger(LoggerInterface $logger)
-	{
-		$this->logger = $logger;
-	}
 }