Merge branch 'develop'

# Conflicts:
#	CHANGELOG.md

Author: dleffler

OPTIONAL.md

@@ -125,7 +125,7 @@ installing the [Kint](https://github.com/kint-php/kint) PHP library. Simply plac
 into the /external folder (for v1 & v2 extract into the /external folder to create a subfolder).
 The feature is auto-activated by this installation.
 
-- v3.3.0 to v5.0.4 (/external/kint.phar), (requires Exponent CMS v2.6.0patch2 or later)
+- v3.3.0 to v5.0.6 (/external/kint.phar), (requires Exponent CMS v2.6.0patch2 or later)
 - v2.2 (/external/kint-2.2/) is the last 2.x version,
 - but v1.1 (/external/kint/) is also supported
 

exponent_constants.php

@@ -532,7 +532,7 @@
 if (!defined('JQUERY_RELATIVE')) {
     define('JQUERY_VERSION', '1.12.4');
     define('JQUERY2_VERSION', '2.2.4');
-    define('JQUERY3_VERSION', '3.7.0');
+    define('JQUERY3_VERSION', '3.7.1');
     define('JQUERY3_MIGRATE_VERSION', '3.4.1');
     define('JQUERYUI_VERSION', '1.13.2');
     define('JQUERY_RELATIVE', PATH_RELATIVE . 'external/jquery/');
@@ -591,8 +591,8 @@
         define('BS4_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct" crossorigin="anonymous"></script>');
     } // cdn Bootstrap v4.x script
     if (!defined('BS5_SCRIPT')) {
-        define('BS5_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>');
-//        define('BS5_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz" crossorigin="anonymous"></script>');
+
+        define('BS5_SCRIPT', '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>');
     } // cdn Bootstrap v5.x script
 /**
  * Font-Awesome CDN links
@@ -605,7 +605,7 @@
         define('FA5_SCRIPT', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css');
     } // cdn FontAwesome v5.x stylesheet
     if (!defined('FA6_SCRIPT')) {
-        define('FA6_SCRIPT', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css');
+        define('FA6_SCRIPT', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css');
     } // cdn FontAwesome v6.x stylesheet
 //}
 
@@ -617,7 +617,7 @@
     if (version_compare(PHP_VERSION, '7.1.0', 'lt')) {
         define('SMARTY_VERSION', '3.1.27');
     } else {
-        define('SMARTY_VERSION', '4.3.1');  //note smarty v3.1.28+ won't work properly with php < v7.1+
+        define('SMARTY_VERSION', '4.3.4');  //note smarty v3.1.28+ won't work properly with php < v7.1+
     }
     define('SMARTY_PATH', BASE . 'external/smarty-' . SMARTY_VERSION . '/libs/');
 //    define('SMARTY_DEVELOPMENT', false);
@@ -637,17 +637,17 @@
     /**
      * Lexer is needed for Swiftmailer v6
      */
-    define('LEXER_VERSION', '2.1.0');
+    define('LEXER_VERSION', '2.1.0');  // 3.0.0
     define('SWIFT_LEXER_PATH', BASE . 'external/lexer-' . LEXER_VERSION . '/src/');
     /**
      * Deprecations is needed for Lexer v2
      */
-    define('DEPRECATIONS_VERSION', '1.0.0');
+    define('DEPRECATIONS_VERSION', '1.1.2');
     define('SWIFT_DEPRECATIONS_PATH', BASE . 'external/deprecations-' . DEPRECATIONS_VERSION . '/lib/Doctrine/Deprecations/');
     /**
      * EmailValidator is needed for Swiftmailer v6
      */
-    define('EMAIL_VALIDATOR_VERSION', '3.2.4');
+    define('EMAIL_VALIDATOR_VERSION', '3.2.6');  // 4.0.2
     define('SWIFT_EMAIL_PATH', BASE . 'external/EmailValidator-' . EMAIL_VALIDATOR_VERSION . '/EmailValidator/');
 }
 
@@ -662,13 +662,13 @@
     define('MPDF8_VERSION', '8.0.17');
 }
 if (!defined('MPDF81_VERSION')) {
-    define('MPDF81_VERSION', '8.1.4');  // 8.1.6
+    define('MPDF81_VERSION', '8.1.4');  // 8.2.2
 }
 /**
  * Log is needed for MPDF v7+
  */
 if (!defined('LOG_VERSION')) {
-    define('LOG_VERSION', '1.1.4');
+    define('LOG_VERSION', '1.1.4');  // 2.0.0, 3.0.0
 }
 /**
  * random_compat is needed for MPDF v7+ under PHP v5.6
@@ -680,24 +680,42 @@
  * FPDI is needed for MPDF v8+
  */
 if (!defined('FPDI_VERSION')) {
-    define('FPDI_VERSION', '2.3.6');  // 2.3.7
+    define('FPDI_VERSION', '2.3.6');  // 2.6.0
+}
+/**
+ * HTTP Message Shim is needed for MPDF v8.2+
+ */
+if (!defined('HTTP_MSG_SHM_VERSION')) {
+    define('HTTP_MSG_SHM_VERSION', '2.0.1');
+}
+/**
+ * Log Aware Trait is needed for MPDF v8.1.6+
+ */
+if (!defined('LOG_AWARE_VERSION')) {
+    define('LOG_AWARE_VERSION', '3.0.0');
+}
+/**
+ * HTTP Message is needed for MPDF v8+
+ */
+if (!defined('HTTP_MSG_VERSION')) {
+    define('HTTP_MSG_VERSION', '1.0');  // 1.1.0
 }
 
 if (!defined('DOMPDF8_VERSION')) {
     define('DOMPDF8_VERSION', '-1.2.2');
 }
 if (!defined('DOMPDF2_VERSION')) {
-    define('DOMPDF2_VERSION', '2.0.3');
+    define('DOMPDF2_VERSION', '2.0.3');  // 2.0.4
 }
 
 if (!defined('HTML2PDF5_VERSION')) {
-    define('HTML2PDF5_VERSION', '5.2.7');
+    define('HTML2PDF5_VERSION', '5.2.7');  // 5.2.8
 }
 /**
  * TCPDF is needed for HTML2PDF5
  */
 if (!defined('TCPDF5_VERSION')) {
-    define('TCPDF5_VERSION', '6.6.2');
+    define('TCPDF5_VERSION', '6.6.2');  // 6.6.5
 }
 
 ?>

…ternal/EmailValidator-3.2.4/CHANGELOG.md …ternal/EmailValidator-3.2.6/CHANGELOG.mdexternal/EmailValidator-3.2.4/CHANGELOG.md renamed to external/EmailValidator-3.2.6/CHANGELOG.md external/EmailValidator-3.2.4/CHANGELOG.md renamed to external/EmailValidator-3.2.6/CHANGELOG.md

@@ -213,21 +213,19 @@ public function find($type) : bool
     public function moveNext() : bool
     {
         if ($this->hasToRecord && $this->previous === self::$nullToken) {
-            $this->accumulator .= $this->token['value'];
+            $this->accumulator .= ((array) $this->token)['value'];
         }
 
-        $this->previous = $this->token instanceof Token
-            ? ['value' => $this->token->value, 'type' => $this->token->type, 'position' => $this->token->position]
-            : $this->token;
-        
+        $this->previous = (array) $this->token;
+
         if($this->lookahead === null) {
             $this->lookahead = self::$nullToken;
         }
 
         $hasNext = parent::moveNext();
 
         if ($this->hasToRecord) {
-            $this->accumulator .= $this->token['value'];
+            $this->accumulator .= ((array) $this->token)['value'];
         }
 
         return $hasNext;

…or/Egulias/EmailValidator/EmailLexer.php …or/Egulias/EmailValidator/EmailLexer.phpexternal/EmailValidator-3.2.4/EmailValidator/Egulias/EmailValidator/EmailLexer.php renamed to external/EmailValidator-3.2.6/EmailValidator/Egulias/EmailValidator/EmailLexer.php external/EmailValidator-3.2.4/EmailValidator/Egulias/EmailValidator/EmailLexer.php renamed to external/EmailValidator-3.2.6/EmailValidator/Egulias/EmailValidator/EmailLexer.php

@@ -29,7 +29,7 @@ abstract protected function preLeftParsing() : Result;
 
     public function __construct(EmailLexer $lexer)
     {
-        $this->lexer = $lexer;   
+        $this->lexer = $lexer;
     }
 
     public function parse(string $str) : Result
@@ -51,7 +51,7 @@ public function parse(string $str) : Result
             return $localPartResult;
         }
 
-        $domainPartResult = $this->parseRightFromAt(); 
+        $domainPartResult = $this->parseRightFromAt();
 
         if ($domainPartResult->isInvalid()) {
             return $domainPartResult;
@@ -73,6 +73,6 @@ protected function hasAtToken() : bool
         $this->lexer->moveNext();
         $this->lexer->moveNext();
 
-        return $this->lexer->token['type'] !== EmailLexer::S_AT;
+        return ((array) $this->lexer->token)['type'] !== EmailLexer::S_AT;
     }
 }

…r/Egulias/EmailValidator/EmailParser.php …r/Egulias/EmailValidator/EmailParser.phpexternal/EmailValidator-3.2.4/EmailValidator/Egulias/EmailValidator/EmailParser.php renamed to external/EmailValidator-3.2.6/EmailValidator/Egulias/EmailValidator/EmailParser.php external/EmailValidator-3.2.4/EmailValidator/Egulias/EmailValidator/EmailParser.php renamed to external/EmailValidator-3.2.6/EmailValidator/Egulias/EmailValidator/EmailParser.php

@@ -31,15 +31,15 @@ public function __construct(EmailLexer $lexer, CommentStrategy $commentStrategy)
 
     public function parse() : Result
     {
-        if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+        if (((array) $this->lexer->token)['type'] === EmailLexer::S_OPENPARENTHESIS) {
             $this->openedParenthesis++;
             if($this->noClosingParenthesis()) {
-                return new InvalidEmail(new UnclosedComment(), $this->lexer->token['value']);
+                return new InvalidEmail(new UnclosedComment(), ((array) $this->lexer->token)['value']);
             }
         }
 
-        if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
-            return new InvalidEmail(new UnOpenedComment(), $this->lexer->token['value']);
+        if (((array) $this->lexer->token)['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+            return new InvalidEmail(new UnOpenedComment(), ((array) $this->lexer->token)['value']);
         }
 
         $this->warnings[WarningComment::CODE] = new WarningComment();
@@ -58,10 +58,10 @@ public function parse() : Result
         }
 
         if($this->openedParenthesis >= 1) {
-            return new InvalidEmail(new UnclosedComment(), $this->lexer->token['value']);
+            return new InvalidEmail(new UnclosedComment(), ((array) $this->lexer->token)['value']);
         }
         if ($this->openedParenthesis < 0) {
-            return new InvalidEmail(new UnOpenedComment(), $this->lexer->token['value']);
+            return new InvalidEmail(new UnOpenedComment(), ((array) $this->lexer->token)['value']);
         }
 
         $finalValidations = $this->commentStrategy->endOfLoopValidations($this->lexer);
@@ -78,7 +78,7 @@ public function parse() : Result
     private function warnEscaping() : bool
     {
         //Backslash found
-        if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
+        if (((array) $this->lexer->token)['type'] !== EmailLexer::S_BACKSLASH) {
             return false;
         }
 
@@ -87,12 +87,12 @@ private function warnEscaping() : bool
         }
 
         $this->warnings[QuotedPart::CODE] =
-            new QuotedPart($this->lexer->getPrevious()['type'], $this->lexer->token['type']);
+            new QuotedPart($this->lexer->getPrevious()['type'], ((array) $this->lexer->token)['type']);
         return true;
 
     }
 
-    private function noClosingParenthesis() : bool 
+    private function noClosingParenthesis() : bool
     {
         try {
             $this->lexer->find(EmailLexer::S_CLOSEPARENTHESIS);

…ulias/EmailValidator/MessageIDParser.php …ulias/EmailValidator/MessageIDParser.phpexternal/EmailValidator-3.2.4/EmailValidator/Egulias/EmailValidator/MessageIDParser.php renamed to external/EmailValidator-3.2.6/EmailValidator/Egulias/EmailValidator/MessageIDParser.php external/EmailValidator-3.2.4/EmailValidator/Egulias/EmailValidator/MessageIDParser.php renamed to external/EmailValidator-3.2.6/EmailValidator/Egulias/EmailValidator/MessageIDParser.php

@@ -23,7 +23,7 @@ public function endOfLoopValidations(EmailLexer $lexer) : Result
     {
         //test for end of string
         if (!$lexer->isNextToken(EmailLexer::S_DOT)) {
-            return new InvalidEmail(new ExpectingATEXT('DOT not found near CLOSEPARENTHESIS'), $lexer->token['value']);
+            return new InvalidEmail(new ExpectingATEXT('DOT not found near CLOSEPARENTHESIS'), ((array) $lexer->token)['value']);
         }
         //add warning
         //Address is valid within the message but cannot be used unmodified for the envelope