Merge branch 'master' into TextFunctions-New-TextSplit

Author: MarkBaker

composer.lock

@@ -2270,51 +2270,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
 
-		-
-			message: "#^Cannot access offset 0 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Cannot access offset 2 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Cannot access offset 4 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Cannot access offset 6 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Parameter \\#1 \\$size of function imagettfbbox expects float, float\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Parameter \\#2 \\$defaultFont of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Drawing\\:\\:pixelsToCellDimension\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:\\$autoSizeMethods has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Variable \\$cellText on left side of \\?\\? always exists and is not nullable\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
 		-
 			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\EigenvalueDecomposition\\:\\:\\$cdivi has no type specified\\.$#"
 			count: 1

phpstan-baseline.neon

@@ -12,12 +12,10 @@
 // at this point, we could do some manipulations with the template, but we skip this step
 $helper->write($spreadsheet, __FILE__, ['Xlsx', 'Xls', 'Html']);
 
-if (\PHP_VERSION_ID < 80000) {
-    // Export to PDF (.pdf)
-    $helper->log('Write to PDF format');
-    IOFactory::registerWriter('Pdf', \PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf::class);
-    $helper->write($spreadsheet, __FILE__, ['Pdf']);
-}
+// Export to PDF (.pdf)
+$helper->log('Write to PDF format');
+IOFactory::registerWriter('Pdf', \PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf::class);
+$helper->write($spreadsheet, __FILE__, ['Pdf']);
 
 // Remove first two rows with field headers before exporting to CSV
 $helper->log('Removing first two heading rows for CSV export');

samples/Basic/26_Utf8.php

@@ -32,24 +32,20 @@ function replaceBody(string $html): string
 $helper->log('Set orientation to landscape');
 $spreadsheet->getActiveSheet()->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
 
-if (\PHP_VERSION_ID < 80000) {
-    $helper->log('Write to Dompdf');
-    $writer = new Dompdf($spreadsheet);
-    $filename = $helper->getFileName('21b_Pdf_dompdf.xlsx', 'pdf');
-    $writer->setEditHtmlCallback('replaceBody');
-    $writer->save($filename);
-}
+$helper->log('Write to Dompdf');
+$writer = new Dompdf($spreadsheet);
+$filename = $helper->getFileName('21b_Pdf_dompdf.xlsx', 'pdf');
+$writer->setEditHtmlCallback('replaceBody');
+$writer->save($filename);
 
 $helper->log('Write to Mpdf');
 $writer = new Mpdf($spreadsheet);
 $filename = $helper->getFileName('21b_Pdf_mpdf.xlsx', 'pdf');
 $writer->setEditHtmlCallback('replaceBody');
 $writer->save($filename);
 
-if (\PHP_VERSION_ID < 80000) {
-    $helper->log('Write to Tcpdf');
-    $writer = new Tcpdf($spreadsheet);
-    $filename = $helper->getFileName('21b_Pdf_tcpdf.xlsx', 'pdf');
-    $writer->setEditHtmlCallback('replaceBody');
-    $writer->save($filename);
-}
+$helper->log('Write to Tcpdf');
+$writer = new Tcpdf($spreadsheet);
+$filename = $helper->getFileName('21b_Pdf_tcpdf.xlsx', 'pdf');
+$writer->setEditHtmlCallback('replaceBody');
+$writer->save($filename);

samples/Pdf/21b_Pdf.php

@@ -104,7 +104,8 @@ public static function right($value, $chars = 1)
      *
      * @param mixed $text the text that you're searching
      *                    Or can be an array of values
-     * @param ?string $delimiter the text that marks the point before which you want to extract
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
      * @param mixed $instance The instance of the delimiter after which you want to extract the text.
      *                            By default, this is the first instance (1).
      *                            A negative value means start searching from the end of the text string.
@@ -132,7 +133,6 @@ public static function before($text, $delimiter, $instance = 1, $matchMode = 0,
         }
 
         $text = Helpers::extractString($text ?? '');
-        $delimiter = Helpers::extractString(Functions::flattenSingleValue($delimiter ?? ''));
         $instance = (int) $instance;
         $matchMode = (int) $matchMode;
         $matchEnd = (int) $matchEnd;
@@ -141,13 +141,14 @@ public static function before($text, $delimiter, $instance = 1, $matchMode = 0,
         if (is_array($split) === false) {
             return $split;
         }
-        if ($delimiter === '') {
+        if (Helpers::extractString(Functions::flattenSingleValue($delimiter ?? '')) === '') {
             return ($instance > 0) ? '' : $text;
         }
 
         // Adjustment for a match as the first element of the split
         $flags = self::matchFlags($matchMode);
-        $adjust = preg_match('/^' . preg_quote($delimiter) . "\$/{$flags}", $split[0]);
+        $delimiter = self::buildDelimiter($delimiter);
+        $adjust = preg_match('/^' . $delimiter . "\$/{$flags}", $split[0]);
         $oddReverseAdjustment = count($split) % 2;
 
         $split = ($instance < 0)
@@ -161,7 +162,8 @@ public static function before($text, $delimiter, $instance = 1, $matchMode = 0,
      * TEXTAFTER.
      *
      * @param mixed $text the text that you're searching
-     * @param ?string $delimiter the text that marks the point before which you want to extract
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
      * @param mixed $instance The instance of the delimiter after which you want to extract the text.
      *                          By default, this is the first instance (1).
      *                          A negative value means start searching from the end of the text string.
@@ -189,7 +191,6 @@ public static function after($text, $delimiter, $instance = 1, $matchMode = 0, $
         }
 
         $text = Helpers::extractString($text ?? '');
-        $delimiter = Helpers::extractString(Functions::flattenSingleValue($delimiter ?? ''));
         $instance = (int) $instance;
         $matchMode = (int) $matchMode;
         $matchEnd = (int) $matchEnd;
@@ -198,13 +199,14 @@ public static function after($text, $delimiter, $instance = 1, $matchMode = 0, $
         if (is_array($split) === false) {
             return $split;
         }
-        if ($delimiter === '') {
+        if (Helpers::extractString(Functions::flattenSingleValue($delimiter ?? '')) === '') {
             return ($instance < 0) ? '' : $text;
         }
 
         // Adjustment for a match as the first element of the split
         $flags = self::matchFlags($matchMode);
-        $adjust = preg_match('/^' . preg_quote($delimiter) . "\$/{$flags}", $split[0]);
+        $delimiter = self::buildDelimiter($delimiter);
+        $adjust = preg_match('/^' . $delimiter . "\$/{$flags}", $split[0]);
         $oddReverseAdjustment = count($split) % 2;
 
         $split = ($instance < 0)
@@ -215,21 +217,23 @@ public static function after($text, $delimiter, $instance = 1, $matchMode = 0, $
     }
 
     /**
+     * @param null|array|string $delimiter
      * @param int $matchMode
      * @param int $matchEnd
      * @param mixed $ifNotFound
      *
      * @return string|string[]
      */
-    private static function validateTextBeforeAfter(string $text, string $delimiter, int $instance, $matchMode, $matchEnd, $ifNotFound)
+    private static function validateTextBeforeAfter(string $text, $delimiter, int $instance, $matchMode, $matchEnd, $ifNotFound)
     {
         $flags = self::matchFlags($matchMode);
+        $delimiter = self::buildDelimiter($delimiter);
 
-        if (preg_match('/' . preg_quote($delimiter) . "/{$flags}", $text) === 0 && $matchEnd === 0) {
+        if (preg_match('/' . $delimiter . "/{$flags}", $text) === 0 && $matchEnd === 0) {
             return $ifNotFound;
         }
 
-        $split = preg_split('/(' . preg_quote($delimiter) . ")/{$flags}", $text, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        $split = preg_split('/' . $delimiter . "/{$flags}", $text, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
         if ($split === false) {
             return ExcelError::NA();
         }
@@ -247,6 +251,28 @@ private static function validateTextBeforeAfter(string $text, string $delimiter,
         return $split;
     }
 
+    /**
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
+     */
+    private static function buildDelimiter($delimiter): string
+    {
+        if (is_array($delimiter)) {
+            $delimiter = Functions::flattenArray($delimiter);
+            $quotedDelimiters = array_map(
+                function ($delimiter) {
+                    return preg_quote($delimiter ?? '');
+                },
+                $delimiter
+            );
+            $delimiters = implode('|', $quotedDelimiters);
+
+            return '(' . $delimiters . ')';
+        }
+
+        return '(' . preg_quote($delimiter ?? '') . ')';
+    }
+
     private static function matchFlags(int $matchMode): string
     {
         return ($matchMode === 0) ? 'mu' : 'miu';