Release phpwcms v1.9.44, the legacy release

Merge branch 'v1.9-dev' into phpwcms-legacy

Author: slackero

composer.json

@@ -8,7 +8,7 @@
     },
     "require": {
         "php": ">=7.4",
-        "algo26-matthias/idna-convert": "^v3.1.1",
+        "algo26-matthias/idna-convert": "^v3.2.0",
         "enshrined/svg-sanitize": "^0.21.0",
         "netcarver/textile": "v4.1.3",
         "league/commonmark": "^2.6.1",
@@ -20,6 +20,7 @@
         "html2text/html2text": "^4.3.2",
         "symfony/polyfill-mbstring": "^v1.31.0",
         "symfony/polyfill-php73": "^v1.31.0",
+        "symfony/polyfill-php74": "^v1.31.0",
         "symfony/polyfill-php80": "^v1.31.0",
         "symfony/polyfill-php81": "^v1.31.0",
         "symfony/polyfill-php82": "^v1.31.0",

include/inc_lib/revision/revision.php

@@ -9,6 +9,6 @@
  *
  **/
 
-const PHPWCMS_VERSION = '1.9.43';
-const PHPWCMS_RELEASE_DATE = '2025/03/20';
+const PHPWCMS_VERSION = '1.9.44';
+const PHPWCMS_RELEASE_DATE = '2025/04/08';
 const PHPWCMS_REVISION = '553';

include/vendor/algo26-matthias/idna-convert/.travis.yml

@@ -1,7 +1,6 @@
 # IDNA Convert - pure PHP IDNA converter
 
 ![latest stable version](https://img.shields.io/github/tag/algo26-matthias/idna-convert.svg)
-![Travis CI status](https://img.shields.io/travis/algo26-matthias/idna-convert.svg)
 
 Project homepage: <http://idnaconv.net><br>
 by Matthias Sommerfeld <matthias.sommerfeld@algo26.de><br>
@@ -21,7 +20,7 @@ for details) as they can be used with various registries worldwide to be transla
 The library provides two classes (`ToIdn` and `ToUnicode` respectively), which expose three public methods to convert between the respective forms. See the Example section below. 
 This allows you to convert host names (simple labels like `localhost` or FQHNs like `some-host.domain.example`), email addresses and complete URLs.
 
-Errors, incorrectly encoded or invalid strings will lead to various exceptions.  They should help you to find out, what went wrong.  
+Errors, incorrectly encoded or invalid strings will lead to various exceptions.  They should help you find out, what went wrong.  
 
 Unicode strings are expected to be UTF-8 strings. ACE strings (the Punycode form) are always 7bit ASCII strings.
 
@@ -35,7 +34,7 @@ composer require algo26-matthias/idna-convert
 
 ### Official ZIP Package
 
-The official ZIP packages are discontinued. Stick to Composer or Github to acquire your copy, please.
+The official ZIP packages are discontinued. Stick to Composer or GitHub to acquire your copy, please.
 
 ## Upgrading from a previous version
 
@@ -85,7 +84,7 @@ echo utf8_decode($output); // This will read: andre@börse.knörz.info
 
 ### Example 3. 
 
-The input is read from a UCS-4 coded file and encoded line by line. By appending the optional second parameter we tell enode() about the input format to be used
+The input is read from a UCS-4 coded file and encoded line by line. By appending the optional second parameter we tell encode() about the input format to be used
 
 ```php
 <?php  
@@ -132,29 +131,29 @@ Per default, the class converts strings according to IDNA version 2008. To suppo
 // Include the class  
 use Algo26\IdnaConvert\ToIdn;
 // Instantiate it, switching to IDNA 2003, the original, now outdated standard
-$IDN = new ToIdn(2008);
-// Sth. containing the German letter ß  
+$IDN = new ToIdn(2003);
+// Something containing the German letter ß  
 $input = 'meine-straße.example';
-// Encode it to its punycode presentation  
+// Encode it to its punycode representation  
 $output = $IDN->convert($input);  
-// Output, what we got now  
+// Output what we got now  
 echo $output; // xn--meine-strae-46a.example
 
 // Switch back to IDNA 2008
-$IDN = new ToIdn(2003);
-// Sth. containing the German letter ß  
+$IDN = new ToIdn(2008);
+// Something containing the German letter ß  
 $input = 'meine-straße.example';  
-// Encode it to its punycode presentation  
+// Encode it to its punycode representation  
 $output = $IDN->convert($input);
-// Output, what we got now  
+// Output what we got now  
 echo $output; // meine-strasse.example
 ```
 
 
 ## Encoding helper
 
 In case you have strings in encodings other than ISO-8859-1 and UTF-8 you might need to translate these strings to UTF-8 before feeding the IDNA converter with it.
-PHP's built in functions `utf8_encode()` and `utf8_decode()` can only deal with ISO-8859-1.  
+PHP's built-in functions `utf8_encode()` and `utf8_decode()` can only deal with ISO-8859-1.  
 Use the encoding helper class supplied with this package for the conversion. It requires either iconv, libiconv or mbstring installed together with one of the relevant PHP extensions. The functions you will find useful are
 `toUtf8()` as a replacement for `utf8_encode()` and
 `fromUtf8()` as a replacement for `utf8_decode()`.
@@ -209,7 +208,7 @@ Please use the [issues tab on GitHub](https://github.com/algo26-matthias/idna-co
 
 ## Contact the author
 
-For questions, bug reports and security issues just send me an email.
+For questions, bug reports and security issues just drop me a line.
 
 algo26 Beratungs GmbH<br>
 c/o Matthias Sommerfeld<br>

include/vendor/algo26-matthias/idna-convert/README.md

@@ -1,14 +1,25 @@
 # Upgrading from previous versions
 
-## 3.0
+## 3.2.0
+
+The extra dependency to ext/intl, accidentally introduced with v 3.1 is no longer required.
+
+
+## 3.1.0
+
+We changed the behaviour of the Punycode algorithm to now include all basic ASCII characters in the output when using `ToPunycode->convert()`.
+This change is expected to have no negative effect, but work more closely to the respective RFCs. The old behaviour even led to some endless loops for a few Unicode characters.
+
+
+## 3.0.0
 
 The library has been broken down into various specific classes, thus more closely following SOLID principles.
 
 As such the single class `IdnaConvert` has been broken down into `ToIdn` and `ToUnicode` respectively. Their naming reflects 
-the format of the outcome, so it's more clear to distinguish, what you need. This should be easier to grasp then the old method names `encode()` and `decode()`.
+the format of the outcome, so it's easier picking the right conversion direction.
 Usually you will only need one conversion direction per script run, so why bother loading and parsing all the other unused code, then?  
 
-Also the handling of host names (simple labels like `my-hostname` or FQHNs like `some-host.my-domain.example`) is now separated from 
+Also, the handling of host names (simple labels like `my-hostname` or FQHNs like `some-host.my-domain.example`) is now separated from
 that of email addresses and URLs. 
 Both classes offer the same set of public methods:
 
@@ -19,41 +30,46 @@ Both classes offer the same set of public methods:
 | `convertUrl()`          |  To convert the host name of an URL | 
 
 There's no "strict mode" anymore, this is achieved by the separate methods above. The IDN version is selected when instantiating the class, no more setting during runtime.
-Also the encoding (for the Unicode side of things) is now **always UTF-8**. Use `TransCodeUnicode` or `EncodingHelper` for converting to and from various encodings to UTF-8.
+Also, the encoding (for the Unicode side of things) is now **always UTF-8**. Use `TransCodeUnicode` or `EncodingHelper` for converting to and from various encodings to UTF-8.
 
-All actual sub classes like that for NamePrep and the actual Punycode transformation are put in their own namespaces under `Algo26\IdnaConvert`, e.g. `Algo26\IdnaConvert\NamePrep`. 
-Interfaces and Exceptions also have their own namespace to declutter the class structure even more. 
+All actual subclasses like that for NamePrep and the actual Punycode transformation are put in their own namespaces under `Algo26\IdnaConvert`, e.g. `Algo26\IdnaConvert\NamePrep`. 
+Interfaces and Exceptions also have their own namespace to declutter the class structure even more.
 
 The class `EncodingHelper` is now called separated into the two classes `ToUtf8` and `FromUtf8` respectively and lies under the namespace `Algo26\idnaConvert\EncodingHelper`.
 The class `UnicodeTranscoder` is now called `TransCodeUnicode` under the namespace `Algo26\idnaConvert\TransCodeUnicode`.
 
 All examples are updated to reflect the new usage. See the ReadMe for more details.
 
-Also the **minimum PHP version is now 7.2**.
+Finally, the **minimum PHP version is now 7.2**.
 
-## 2.0
-The library has been handed over to actively maintained GitHub and Packagist accounts. This lead to a change in the namespace.
+
+## 2.0.0
+The library has been handed over to actively maintained GitHub and Packagist accounts. This led to a change in the namespace.
 Replace all occurrences of 
 `Mso\IdnaConvert` or `PhlyLabs\IdnaConvert` to `Algo26\IdnaConvert`.
 There's no further changes to the class signatures. 
 
-## 1.0
+
+## 1.0.0
 **BC break:**
 As of version 1.0.0 the class closely follows the PSRs PSR-1, PSR-2 and PSR-4 of the PHP-FIG. 
 As such the classes' naming has been changed, a namespace has been introduced and the default IDN version has changed from 2003 to 2008 and minimum PHP engine version raised to 5.6.0.
 
+
 ## 0.8.0
 As of version 0.8.0 the class fully supports IDNA 2008. 
-Thus the aforementioned parameter is deprecated and replaced by a parameter to switch between the standards. See the updated example 5 in the ReadMe.
+Thus, the aforementioned parameter is deprecated and replaced by a parameter to switch between the standards. See the updated example 5 in the ReadMe.
+
 
 ## 0.6.4
 **BC break:** 
 As of version 0.6.4 the class per default allows the German ligature ß to be encoded as the DeNIC, the registry for .DE allows domains containing ß.  
 
+
 ## 0.6.0
 **ATTENTION:** As of version 0.6.0 this class is written in the OOP style of PHP 5. 
-Since PHP 4 is no longer actively maintained, you should switch to PHP 5 as fast as possible. 
-We expect to see no compatibility issues with the upcoming PHP 6, too.
+Since PHP 4 is no longer actively maintained, you should switch to PHP 5 as quickly as possible.
+We expect no compatibility issues with the upcoming ~~PHP 6~~ PHP 7 as well.
 
 
 

include/vendor/algo26-matthias/idna-convert/UPGRADING.md

@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+
+namespace Algo26\IdnaConvert\NamePrep;
+
+class CaseFolding
+{
+    /** @var CaseFoldingData */
+    private $caseFoldingData;
+
+    public function __construct()
+    {
+        $this->caseFoldingData = new CaseFoldingData();
+    }
+
+    public function apply(array $inputArray, string $idnaVersion): array
+    {
+        if ($idnaVersion == 2003) {
+            return $inputArray;
+        }
+
+        $outputArray = [];
+        foreach ($inputArray as $codePoint) {
+            if (isset($this->caseFoldingData->foldingMap[$codePoint])) {
+                foreach ($this->caseFoldingData->foldingMap[$codePoint] as $folded) {
+                    $outputArray[] = $folded;
+                }
+            } else {
+                $outputArray[] = $codePoint;
+            }
+        }
+
+        return $outputArray;
+    }
+}