Fix php-8.2 deprecations

fawno · Jan 16, 2024 · 6ea4dd0 · 6ea4dd0
1 parent 7100eb1
commit 6ea4dd0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,8 @@
         }
     ],
     "require": {
-        "php": ">=7.2"
+        "php": ">=7.2",
+        "ext-mbstring": "*"
     },
     "suggest": {
         "ext-openssl": "*",

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php" colors="true" cacheResultFile=".phpunit.cache">
+<phpunit
+  bootstrap="vendor/autoload.php"
+  colors="true"
+  cacheResultFile=".phpunit.cache"
+  displayDetailsOnTestsThatTriggerDeprecations="true"
+  displayDetailsOnTestsThatTriggerErrors="true"
+  displayDetailsOnTestsThatTriggerNotices="true"
+  displayDetailsOnTestsThatTriggerWarnings="true"
+>
     <php>
         <const name="_DEBUG_LEVEL" value="0"/>
     </php>

diff --git a/scripts/PDFBookmark/PDFBookmarkTrait.php b/scripts/PDFBookmark/PDFBookmarkTrait.php
@@ -19,7 +19,7 @@ trait PDFBookmarkTrait {
 		 */
 		public function Bookmark (string $txt, bool $isUTF8 = false, int $level = 0, float $y = 0) : void	{
 			if(!$isUTF8)
-				$txt = utf8_encode($txt);
+				$txt = mb_convert_encoding($txt, 'UTF-8', 'ISO-8859-1');
 			if($y==-1)
 				$y = $this->GetY();
 			$this->outlines[] = array('t'=>$txt, 'l'=>$level, 'y'=>($this->h-$y)*$this->k, 'p'=>$this->PageNo());

diff --git a/scripts/PDFMemImage/VariableStream.php b/scripts/PDFMemImage/VariableStream.php
@@ -5,6 +5,7 @@
 
 	// Stream handler to read from global variables
 	class VariableStream {
+		public $context;
 		private $varname;
 		private $position;
 

diff --git a/scripts/PDFProtection/PDFProtectionTrait.php b/scripts/PDFProtection/PDFProtectionTrait.php
@@ -6,6 +6,8 @@
 
 	trait PDFProtectionTrait {
 		protected $encrypted = false;  //whether document is protected
+		protected $padding;
+		protected $encryption_key;
 		protected $Uvalue;             //U entry in pdf document
 		protected $Ovalue;             //O entry in pdf document
 		protected $Pvalue;             //P entry in pdf document

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -39,9 +39,8 @@ public function assertFileWasCreated (string $filename, string $message = '') :
 			}
 		}
 
-		private static function rebuildPdf(string $content){
-			$real_content = \ctype_print($content) && @\file_exists($content)
-				? \file_get_contents(realpath($content)) : $content;
+		private static function rebuildPdf (string $content) {
+			$real_content = (ctype_print($content) and @file_exists($content)) ? file_get_contents(realpath($content)) : $content;
 
 			$pdf = PDFDoc::from_string($real_content);