Merge branch '5.0-dev' into menu_order

.appveyor.yml

@@ -8,16 +8,13 @@ clone_folder: C:\projects\joomla-cms
 environment:
   PHPBuild: "x64"
   matrix:
-  - php_ver_target: 8.0
+  - php_ver_target: 8.1
 
 
 init:
   - SET PATH=C:\Tools\php;%PATH%
   - SET COMPOSER_NO_INTERACTION=1
   - SET ANSICON=121x90 (121x90)
-services:
-  - mysql
-  - iis
 
 ## Install PHP and composer, and run the appropriate composer command
 install:
@@ -44,13 +41,42 @@ install:
     - choco install composer
     - cd C:\projects\joomla-cms
     - refreshenv
-    - composer install --no-progress --profile --ignore-platform-req=ext-sodium
+    - echo "TODO Ignore platform reqs till all composer dependencies are compatible with php 8.1"
+    - composer install --no-progress --profile --ignore-platform-req=ext-sodium --ignore-platform-reqs
+
+hosts:
+  openldap: 127.0.0.1
+
+services:
+  - mysql
+  - iis
+
 before_test:
+#  Run openldap docker image
+  - ps: docker pull bitnami/openldap:2.6.3
+  - ps: docker run --rm --name openldap --publish 1389:1389 --publish 1636:1636 -v ${pwd}\tests\certs:/certificates --env LDAP_ADMIN_USERNAME=admin --env LDAP_ADMIN_PASSWORD=adminpassword --env LDAP_USERS=customuser --env LDAP_PASSWORDS=custompassword --env LDAP_ENABLE_TLS=yes --env LDAP_TLS_CERT_FILE=/certificates/openldap.crt --env LDAP_TLS_KEY_FILE=/certificates/openldap.key --env LDAP_TLS_CA_FILE=/certificates/CA.crt --env BITNAMI_DEBUG=true --env LDAP_CONFIG_ADMIN_ENABLED=yes --env LDAP_CONFIG_ADMIN_USERNAME=admin --env LDAP_CONFIG_ADMIN_PASSWORD=configpassword -d bitnami/openldap:2.6.3
 #  Database setup for MySQL via PowerShell tools
   - >
     "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql" -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS test_joomla;"
+# Wait till slapd has started
+  - ps: |
+      $Counter=0
+      $Found=$false
+      While ( ! $Found -and $Counter -lt 60 ) {
+        $Found = ( docker logs openldap 2>&1 | Select-String -Quiet "\*\* Starting slapd \*\*" )
+        Start-Sleep -Seconds 1
+        $Counter++
+        "$Counter Waiting for slapd"
+      }
+      if ( ! $Found ) {
+        Write-Error -Message "`nERROR: slapd not started (in time)!" -ErrorAction Stop
+        exit 1
+      }
 
 test_script:
   - cd C:\projects\joomla-cms
   - libraries/vendor/bin/phpunit --testsuite Unit
   - libraries/vendor/bin/phpunit --testsuite Integration  --configuration tests/phpunit-appveyor.xml.dist
+
+on_failure:
+  - ps: docker logs openldap 2>&1