fixing some isues to run in php 8

Author: Adriano Barbosa

.gitignore

@@ -1 +1,2 @@
 vendor
+.vscode

CHANGELOG.md

@@ -51,3 +51,9 @@
 
 - Fixed bug: underlining would start but never end. Now it does.
 - Feature request: images are now filtered out of the output. 
+
+
+### Update 5 Mai 28:
+
+- fix declarations of dinamic properties to run in php8 environment
+- created some getters and setters and fix all the broken tests only

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "henck/rtf-html-php",
+  "name": "barbosaadriano/rtf-html-php",
   "description": "RTF to HTML converter in PHP",
   "keywords": ["rtf", "converter"],
   "type": "library",
@@ -9,14 +9,19 @@
     {
       "name": "Alexander van Oostenrijk",
       "email": "alex.vanoostenrijk@gmail.com"
+    },{
+      "name": "Adriano Barbosa",
+      "email": "b.adrianobarbosa@gmail.com"
     }
   ],
   "scripts": {
     "test": [
       "phpunit tests"
     ]
   },
-  "require": {},
+  "require": {
+    "php": "^8.0"
+  },
   "autoload": {
     "psr-4": {
       "RtfHtmlPhp\\": "src/"

index.php

@@ -7,10 +7,10 @@
     use RtfHtmlPhp\Html\HtmlFormatter;
 
     $original  = file_get_contents("tests/rtf/hello-world.rtf");
+    $original  = file_get_contents("tests/rtf/fonts.rtf");
 
     $document = new Document($original); // or use a string directly
     $formatter = new HtmlFormatter('UTF-8');
     $r = $formatter->Format($document);
     file_put_contents('rtf.html', $r);
-    echo $r;
-?>
+    echo $r;

rtf.html

@@ -1 +1 @@
-<p><span style="font-family:Calibri;font-size:15px;">Hello, world.</span></p><p></p>
+<p><span style="font-family:Arial, sans-serif;font-size:15px;">Hello, world.</span></p><p></p>

src/Document.php

@@ -3,14 +3,15 @@
 declare(strict_types=1);
 
 namespace RtfHtmlPhp;
-#[\AllowDynamicProperties]
 class Document
 {
   private $rtf;        // RTF string being parsed
   private $pos;        // Current position in RTF string
   private $len;        // Length of RTF string
   public $root = null; // Root group
   private $group;      // Current RTF group
+  private $char; //fixed dinamic declarations
+  private $uc; //fixed dinamic declarations
 
   public function __construct($rtf)
   {

src/Html/Font.php

@@ -8,6 +8,7 @@ class Font
   public $name;
   public $charset;
   public $codepage;
+  public $fprq;
 
   public function toStyle(): string {
     $list = array();

src/Html/HtmlFormatter.php

@@ -4,13 +4,24 @@
 
 use RtfHtmlPhp\Document;
 
-#[\AllowDynamicProperties]
 class HtmlFormatter
 {
   private $output = '';
   private $encoding;
   private $defaultFont;
 
+  // dinamic declarations fixed
+  
+  private $previousState;
+  private $states;
+  /**
+   * State
+   */
+  private $state;
+  private $openedTags;
+  private $RTFencoding;
+
+
   // By default, HtmlFormatter uses HTML_ENTITIES for code conversion.
   // You can optionally support a different endoing when creating
   // the HtmlFormatter instance.
@@ -117,7 +128,7 @@ protected function LoadFont(\RtfHtmlPhp\Group $fontGroup) {
       */
     }
 
-    State::SetFont($fontNumber, $font);
+    State::setFontInFontTable($fontNumber, $font);
   }
 
   protected function ExtractFontTable($fontTblGrp)
@@ -274,28 +285,28 @@ protected function FormatControlWord($word)
        */
 
       case 'b': // bold
-        $this->state->bold = $word->parameter;
+        $this->state->setBold($word->parameter);
         break;
       case 'i': // italic
-        $this->state->italic = $word->parameter;
+        $this->state->setItalic($word->parameter);
         break;
       case 'ul': // underline
-        $this->state->underline = $word->parameter;
+        $this->state->setUnderline($word->parameter);
         break;
       case 'ulnone': // no underline
-        $this->state->underline = false;
+        $this->state->setUnderline(false);
         break;
       case 'strike': // strike-through
-        $this->state->strike = $word->parameter;
+        $this->state->setStrike($word->parameter);
         break;
       case 'v': // hidden
-        $this->state->hidden = $word->parameter;
+        $this->state->setHidden($word->parameter);
         break;
       case 'fs': // Font size
-        $this->state->fontsize = ceil(($word->parameter / 24) * 16);
+        $this->state->setFontsize(ceil(($word->parameter / 24) * 16));
         break;
       case 'f': // Font
-        $this->state->font = $word->parameter;
+        $this->state->setFont($word->parameter);
         break;
       case 'deff': // Store default font
         $this->defaultFont = $word->parameter;
@@ -307,14 +318,14 @@ protected function FormatControlWord($word)
 
       case 'cf':
       case 'chcfpat':
-        $this->state->fontcolor = $word->parameter;
+        $this->state->setFontcolor($word->parameter);
         break;
       case 'cb':
       case 'chcbpat':
-        $this->state->background = $word->parameter;
+        $this->state->setBackground($word->parameter);
         break;
       case 'highlight':
-        $this->state->hcolor = $word->parameter;
+        $this->state->setHcolor($word->parameter);
         break;
 
       /*
@@ -595,5 +606,149 @@ protected function ord_utf8($chr)
 
     trigger_error("Invalid Unicode character: {$chr}");
   }
+
+  /**
+   * Get the value of output
+   */
+  public function getOutput()
+  {
+    return $this->output;
+  }
+
+  /**
+   * Set the value of output
+   */
+  public function setOutput($output): self
+  {
+    $this->output = $output;
+
+    return $this;
+  }
+
+  /**
+   * Get the value of encoding
+   */
+  public function getEncoding()
+  {
+    return $this->encoding;
+  }
+
+  /**
+   * Set the value of encoding
+   */
+  public function setEncoding($encoding): self
+  {
+    $this->encoding = $encoding;
+
+    return $this;
+  }
+
+  /**
+   * Get the value of defaultFont
+   */
+  public function getDefaultFont()
+  {
+    return $this->defaultFont;
+  }
+
+  /**
+   * Set the value of defaultFont
+   */
+  public function setDefaultFont($defaultFont): self
+  {
+    $this->defaultFont = $defaultFont;
+
+    return $this;
+  }
+
+  /**
+   * Get the value of previousState
+   */
+  public function getPreviousState()
+  {
+    return $this->previousState;
+  }
+
+  /**
+   * Set the value of previousState
+   */
+  public function setPreviousState($previousState): self
+  {
+    $this->previousState = $previousState;
+
+    return $this;
+  }
+
+  /**
+   * Get the value of states
+   */
+  public function getStates()
+  {
+    return $this->states;
+  }
+
+  /**
+   * Set the value of states
+   */
+  public function setStates($states): self
+  {
+    $this->states = $states;
+
+    return $this;
+  }
+
+  /**
+   * Get the value of state
+   */
+  public function getState()
+  {
+    return $this->state;
+  }
+
+  /**
+   * Set the value of state
+   */
+  public function setState($state): self
+  {
+    $this->state = $state;
+
+    return $this;
+  }
+
+  /**
+   * Get the value of openedTags
+   */
+  public function getOpenedTags()
+  {
+    return $this->openedTags;
+  }
+
+  /**
+   * Set the value of openedTags
+   */
+  public function setOpenedTags($openedTags): self
+  {
+    $this->openedTags = $openedTags;
+
+    return $this;
+  }
+
+  /**
+   * Get the value of RTFencoding
+   */
+  public function getRTFencoding()
+  {
+    return $this->RTFencoding;
+  }
+
+  /**
+   * Set the value of RTFencoding
+   */
+  public function setRTFencoding($RTFencoding): self
+  {
+    $this->RTFencoding = $RTFencoding;
+
+    return $this;
+  }
 }
 

src/Html/Image.php

@@ -4,6 +4,17 @@
 
 class Image
 {
+
+  public $format;
+  public $width;
+  public $height;
+  public $goalWidth;
+  public $goalHeight;
+  public $pcScaleX;
+  public $pcScaleY;
+  public $binarySize;
+  public $ImageData;
+
   public function __construct()
   {
     $this->Reset();