Fixed latest coding style issues and refined a few PHP doc entries to match types

src/Smalot/PdfParser/Document.php

@@ -336,12 +336,12 @@ public function getObjectById(string $id)
         return null;
     }
 
-    public function hasObjectsByType(string $type, string $subtype = null): bool
+    public function hasObjectsByType(string $type, ?string $subtype = null): bool
     {
         return 0 < \count($this->getObjectsByType($type, $subtype));
     }
 
-    public function getObjectsByType(string $type, string $subtype = null): array
+    public function getObjectsByType(string $type, ?string $subtype = null): array
     {
         if (!isset($this->dictionary[$type])) {
             return [];
@@ -418,7 +418,7 @@ public function getPages()
         throw new \Exception('Missing catalog.');
     }
 
-    public function getText(int $pageLimit = null): string
+    public function getText(?int $pageLimit = null): string
     {
         $texts = [];
         $pages = $this->getPages();

src/Smalot/PdfParser/Element.php

@@ -49,13 +49,13 @@
 class Element
 {
     /**
-     * @var Document
+     * @var Document|null
      */
     protected $document;
 
     protected $value;
 
-    public function __construct($value, Document $document = null)
+    public function __construct($value, ?Document $document = null)
     {
         $this->value = $value;
         $this->document = $document;
@@ -96,7 +96,7 @@ public function __toString(): string
         return (string) $this->value;
     }
 
-    public static function parse(string $content, Document $document = null, int &$position = 0)
+    public static function parse(string $content, ?Document $document = null, int &$position = 0)
     {
         $args = \func_get_args();
         $only_values = isset($args[3]) ? $args[3] : false;

src/Smalot/PdfParser/Element/ElementArray.php

@@ -42,7 +42,7 @@
  */
 class ElementArray extends Element
 {
-    public function __construct($value, Document $document = null)
+    public function __construct($value, ?Document $document = null)
     {
         parent::__construct($value, $document);
     }
@@ -107,7 +107,7 @@ protected function resolveXRef(string $name)
      *
      * @return bool|ElementArray
      */
-    public static function parse(string $content, Document $document = null, int &$offset = 0)
+    public static function parse(string $content, ?Document $document = null, int &$offset = 0)
     {
         if (preg_match('/^\s*\[(?P<array>.*)/is', $content, $match)) {
             preg_match_all('/(.*?)(\[|\])/s', trim($content), $matches);

src/Smalot/PdfParser/Element/ElementBoolean.php

@@ -61,7 +61,7 @@ public function equals($value): bool
     /**
      * @return bool|ElementBoolean
      */
-    public static function parse(string $content, Document $document = null, int &$offset = 0)
+    public static function parse(string $content, ?Document $document = null, int &$offset = 0)
     {
         if (preg_match('/^\s*(?P<value>true|false)/is', $content, $match)) {
             $value = $match['value'];

src/Smalot/PdfParser/Element/ElementDate.php

@@ -40,7 +40,7 @@
 class ElementDate extends ElementString
 {
     /**
-     * @var array
+     * @var array<int,string>
      */
     protected static $formats = [
         4 => 'Y',
@@ -98,7 +98,7 @@ public function __toString(): string
     /**
      * @return bool|ElementDate
      */
-    public static function parse(string $content, Document $document = null, int &$offset = 0)
+    public static function parse(string $content, ?Document $document = null, int &$offset = 0)
     {
         if (preg_match('/^\s*\(D\:(?P<name>.*?)\)/s', $content, $match)) {
             $name = $match['name'];

src/Smalot/PdfParser/Element/ElementHexa.php

@@ -42,7 +42,7 @@ class ElementHexa extends ElementString
     /**
      * @return bool|ElementHexa|ElementDate
      */
-    public static function parse(string $content, Document $document = null, int &$offset = 0)
+    public static function parse(string $content, ?Document $document = null, int &$offset = 0)
     {
         if (preg_match('/^\s*\<(?P<name>[A-F0-9]+)\>/is', $content, $match)) {
             $name = $match['name'];

src/Smalot/PdfParser/Element/ElementName.php

@@ -54,7 +54,7 @@ public function equals($value): bool
     /**
      * @return bool|ElementName
      */
-    public static function parse(string $content, Document $document = null, int &$offset = 0)
+    public static function parse(string $content, ?Document $document = null, int &$offset = 0)
     {
         if (preg_match('/^\s*\/([A-Z0-9\-\+,#\.]+)/is', $content, $match)) {
             $name = $match[1];

src/Smalot/PdfParser/Element/ElementNull.php

@@ -58,7 +58,7 @@ public function equals($value): bool
     /**
      * @return bool|ElementNull
      */
-    public static function parse(string $content, Document $document = null, int &$offset = 0)
+    public static function parse(string $content, ?Document $document = null, int &$offset = 0)
     {
         if (preg_match('/^\s*(null)/s', $content, $match)) {
             $offset += strpos($content, 'null') + \strlen('null');

src/Smalot/PdfParser/Element/ElementNumeric.php

@@ -48,7 +48,7 @@ public function __construct(string $value)
     /**
      * @return bool|ElementNumeric
      */
-    public static function parse(string $content, Document $document = null, int &$offset = 0)
+    public static function parse(string $content, ?Document $document = null, int &$offset = 0)
     {
         if (preg_match('/^\s*(?P<value>\-?[0-9\.]+)/s', $content, $match)) {
             $value = $match['value'];

src/Smalot/PdfParser/Element/ElementString.php

@@ -54,7 +54,7 @@ public function equals($value): bool
     /**
      * @return bool|ElementString
      */
-    public static function parse(string $content, Document $document = null, int &$offset = 0)
+    public static function parse(string $content, ?Document $document = null, int &$offset = 0)
     {
         if (preg_match('/^\s*\((?P<name>.*)/s', $content, $match)) {
             $name = $match['name'];

src/Smalot/PdfParser/Element/ElementStruct.php

@@ -44,7 +44,7 @@ class ElementStruct extends Element
     /**
      * @return false|Header
      */
-    public static function parse(string $content, Document $document = null, int &$offset = 0)
+    public static function parse(string $content, ?Document $document = null, int &$offset = 0)
     {
         if (preg_match('/^\s*<<(?P<struct>.*)/is', $content)) {
             preg_match_all('/(.*?)(<<|>>)/s', trim($content), $matches);

src/Smalot/PdfParser/Element/ElementXRef.php

@@ -83,7 +83,7 @@ public function __toString(): string
     /**
      * @return bool|ElementXRef
      */
-    public static function parse(string $content, Document $document = null, int &$offset = 0)
+    public static function parse(string $content, ?Document $document = null, int &$offset = 0)
     {
         if (preg_match('/^\s*(?P<id>[0-9]+\s+[0-9]+\s+R)/s', $content, $match)) {
             $id = $match['id'];

src/Smalot/PdfParser/Font.php

@@ -279,7 +279,7 @@ public function setTable(array $table)
     /**
      * Calculate text width with data from header 'Widths'. If width of character is not found then character is added to missing array.
      */
-    public function calculateTextWidth(string $text, array &$missing = null): ?float
+    public function calculateTextWidth(string $text, ?array &$missing = null): ?float
     {
         $index_map = array_flip($this->table);
         $details = $this->getDetails();
@@ -485,7 +485,7 @@ public function decodeText(array $commands, float $fontFactor = 4): string
      *
      * @param bool $unicode This parameter is deprecated and might be removed in a future release
      */
-    public function decodeContent(string $text, bool &$unicode = null): string
+    public function decodeContent(string $text, ?bool &$unicode = null): string
     {
         // If this string begins with a UTF-16BE BOM, then decode it
         // directly as Unicode

src/Smalot/PdfParser/Header.php

@@ -43,7 +43,7 @@
 class Header
 {
     /**
-     * @var Document
+     * @var Document|null
      */
     protected $document;
 
@@ -56,7 +56,7 @@ class Header
      * @param Element[] $elements list of elements
      * @param Document  $document document
      */
-    public function __construct(array $elements = [], Document $document = null)
+    public function __construct(array $elements = [], ?Document $document = null)
     {
         $this->elements = $elements;
         $this->document = $document;

src/Smalot/PdfParser/PDFObject.php

@@ -54,7 +54,7 @@ class PDFObject
     public static $recursionStack = [];
 
     /**
-     * @var Document
+     * @var Document|null
      */
     protected $document;
 
@@ -69,7 +69,7 @@ class PDFObject
     protected $content;
 
     /**
-     * @var Config
+     * @var Config|null
      */
     protected $config;
 
@@ -80,9 +80,9 @@ class PDFObject
 
     public function __construct(
         Document $document,
-        Header $header = null,
-        string $content = null,
-        Config $config = null
+        ?Header $header = null,
+        ?string $content = null,
+        ?Config $config = null
     ) {
         $this->document = $document;
         $this->header = $header ?? new Header();
@@ -405,7 +405,7 @@ public function getSectionsText(?string $content): array
         return $sections;
     }
 
-    private function getDefaultFont(Page $page = null): Font
+    private function getDefaultFont(?Page $page = null): Font
     {
         $fonts = [];
         if (null !== $page) {
@@ -433,7 +433,7 @@ private function getDefaultFont(Page $page = null): Font
      *
      * @param array<int,array<string,string|bool>> $command
      */
-    private function getTJUsingFontFallback(Font $font, array $command, Page $page = null, float $fontFactor = 4): string
+    private function getTJUsingFontFallback(Font $font, array $command, ?Page $page = null, float $fontFactor = 4): string
     {
         $orig_text = $font->decodeText($command, $fontFactor);
         $text = $orig_text;
@@ -571,7 +571,7 @@ public function parseDictionary(string $dictionary): array
      * so whitespace is inserted in a logical way for reading by
      * humans.
      */
-    public function getText(Page $page = null): string
+    public function getText(?Page $page = null): string
     {
         $this->addPositionWhitespace = true;
         $result = $this->getTextArray($page);
@@ -587,7 +587,7 @@ public function getText(Page $page = null): string
      *
      * @throws \Exception
      */
-    public function getTextArray(Page $page = null): array
+    public function getTextArray(?Page $page = null): array
     {
         $result = [];
         $text = [];
@@ -1054,7 +1054,7 @@ public static function factory(
         Document $document,
         Header $header,
         ?string $content,
-        Config $config = null
+        ?Config $config = null
     ): self {
         switch ($header->get('Type')->getContent()) {
             case 'XObject':

src/Smalot/PdfParser/Page.php

@@ -176,7 +176,7 @@ public function getXObject(string $id): ?PDFObject
         }*/
     }
 
-    public function getText(self $page = null): string
+    public function getText(?self $page = null): string
     {
         if ($contents = $this->get('Contents')) {
             if ($contents instanceof ElementMissing) {
@@ -312,7 +312,7 @@ public function createPageForFpdf(): self
         return new self($pdfObject->document, $header, $new_content, $config);
     }
 
-    public function getTextArray(self $page = null): array
+    public function getTextArray(?self $page = null): array
     {
         if ($this->isFpdf()) {
             $pdfObject = $this->getPDFObjectForFpdf();
@@ -418,7 +418,7 @@ public function extractRawData(): array
      *
      * @return array An array with the data and the internal representation
      */
-    public function extractDecodedRawData(array $extractedRawData = null): array
+    public function extractDecodedRawData(?array $extractedRawData = null): array
     {
         if (!isset($extractedRawData) || !$extractedRawData) {
             $extractedRawData = $this->extractRawData();
@@ -498,7 +498,7 @@ public function extractDecodedRawData(array $extractedRawData = null): array
      *
      * @return array An array with the text command of the page
      */
-    public function getDataCommands(array $extractedDecodedRawData = null): array
+    public function getDataCommands(?array $extractedDecodedRawData = null): array
     {
         if (!isset($extractedDecodedRawData) || !$extractedDecodedRawData) {
             $extractedDecodedRawData = $this->extractDecodedRawData();
@@ -649,7 +649,7 @@ public function getDataCommands(array $extractedDecodedRawData = null): array
      * @return array an array with the data of the page including the Tm information
      *               of any text in the page
      */
-    public function getDataTm(array $dataCommands = null): array
+    public function getDataTm(?array $dataCommands = null): array
     {
         if (!isset($dataCommands) || !$dataCommands) {
             $dataCommands = $this->getDataCommands();
@@ -894,7 +894,7 @@ public function getDataTm(array $dataCommands = null): array
      *               "near" the x,y coordinate, an empty array is returned. If Both, x
      *               and y coordinates are null, null is returned.
      */
-    public function getTextXY(float $x = null, float $y = null, float $xError = 0, float $yError = 0): array
+    public function getTextXY(?float $x = null, ?float $y = null, float $xError = 0, float $yError = 0): array
     {
         if (!isset($this->dataTm) || !$this->dataTm) {
             $this->getDataTm();

src/Smalot/PdfParser/Parser.php

@@ -60,7 +60,7 @@ class Parser
 
     protected $rawDataParser;
 
-    public function __construct($cfg = [], Config $config = null)
+    public function __construct($cfg = [], ?Config $config = null)
     {
         $this->config = $config ?: new Config();
         $this->rawDataParser = new RawDataParser($cfg, $this->config);

src/Smalot/PdfParser/RawData/RawDataParser.php

@@ -53,6 +53,8 @@ class RawDataParser
 
     /**
      * Configuration array.
+     *
+     * @var array<string,bool>
      */
     protected $cfg = [
         // if `true` ignore filter decoding errors
@@ -67,7 +69,7 @@ class RawDataParser
     /**
      * @param array $cfg Configuration array, default is []
      */
-    public function __construct($cfg = [], Config $config = null)
+    public function __construct($cfg = [], ?Config $config = null)
     {
         // merge given array with default values
         $this->cfg = array_merge($this->cfg, $cfg);
@@ -609,7 +611,7 @@ protected function getObjectVal(string $pdfData, $xref, array $obj): array
      *
      * @return array containing object type, raw value and offset to next object
      */
-    protected function getRawObject(string $pdfData, int $offset = 0, array $headerDic = null): array
+    protected function getRawObject(string $pdfData, int $offset = 0, ?array $headerDic = null): array
     {
         $objtype = ''; // object type to be returned
         $objval = ''; // object value to be returned

src/Smalot/PdfParser/XObject/Form.php

@@ -41,7 +41,7 @@
  */
 class Form extends Page
 {
-    public function getText(Page $page = null): string
+    public function getText(?Page $page = null): string
     {
         $header = new Header([], $this->document);
         $contents = new PDFObject($this->document, $header, $this->content, $this->config);

src/Smalot/PdfParser/XObject/Image.php

@@ -40,7 +40,7 @@
  */
 class Image extends PDFObject
 {
-    public function getText(Page $page = null): string
+    public function getText(?Page $page = null): string
     {
         return '';
     }

tests/PHPUnit/Integration/DocumentTest.php

@@ -52,7 +52,7 @@ protected function getDocumentInstance(): Document
         return new Document();
     }
 
-    protected function getPDFObjectInstance(Document $document, Header $header = null): PDFObject
+    protected function getPDFObjectInstance(Document $document, ?Header $header = null): PDFObject
     {
         return new PDFObject($document, $header);
     }

tests/PHPUnit/TestCase.php

@@ -67,7 +67,7 @@ protected function getElementInstance($value): Element
         return new Element($value);
     }
 
-    protected function getParserInstance(Config $config = null): Parser
+    protected function getParserInstance(?Config $config = null): Parser
     {
         return new Parser([], $config);
     }