Update with horde upstream

.github/workflows/ci.yml

@@ -0,0 +1,54 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. 
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches:
+      - master
+      - maintaina-composerfixed
+      - FRAMEWORK_6_0
+  pull_request:
+    branches:
+      - master
+      - maintaina-composerfixed
+      - FRAMEWORK_6_0
+
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  run:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: ['ubuntu-20.04']
+        php-versions: ['7.4', '8.0', 'latest']
+        phpunit-versions: ['latest', '9.5']
+    steps:
+    - name: Setup github ssh key
+      run:  mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com > ~/.ssh/known_hosts
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+        extensions: bcmath, ctype, curl, dom, gd, gettext, iconv, imagick, json, ldap, mbstring, mysql, opcache, openssl, pcntl, pdo, posix, redis, soap, sockets, sqlite, tokenizer, xmlwriter
+        ini-values: post_max_size=512M, max_execution_time=360
+        coverage: xdebug
+        tools: php-cs-fixer, phpunit:${{ matrix.phpunit-versions }}, composer:v2
+    - name: Setup Github Token as composer credential
+      run: composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+    - name: Install horde/test dependency and other dependencies
+      run: |
+        ## For unclear reasons, github action fails randomly if we do not install before we require.
+        COMPOSER_ROOT_VERSION=dev-FRAMEWORK_6_0 composer config minimum-stability dev
+        COMPOSER_ROOT_VERSION=dev-FRAMEWORK_6_0 composer install
+    - name: run phpunit
+      run: phpunit --bootstrap test/bootstrap.php

.github/workflows/phpdoc.yml

@@ -0,0 +1,69 @@
+# This is a basic workflow to help you get started with Actions
+
+name: PHPDOC
+
+# Controls when the action will run.
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches:
+      - master
+      - maintaina-composerfixed
+      - FRAMEWORK_6_0
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  run:
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Setup github ssh key
+      run:  mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com > ~/.ssh/known_hosts
+    - name: Setup uut dir
+      run: |
+        export REPO=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//")
+        export UUT_DIR=$(pwd)
+        export WORK_DIR=~
+        export BIN_DIR="${WORK_DIR}/bin"
+        mkdir -p $BIN_DIR
+        git config --global user.name "PHPDOC CI Job"
+        git config --global user.email "[email protected]"
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Checkout Doc Dir
+      uses: actions/checkout@v2
+      with:
+        repository: maintaina/phpdoc
+        token: ${{secrets.PHPDOC_TOKEN}}
+        path: "phpdoc-git"
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: 7.4
+        extensions: bcmath, ctype, curl, dom, gd, gettext, iconv, imagick, json, ldap, mbstring, mysql, opcache, openssl, pcntl, pdo, posix, redis, soap, sockets, sqlite, tokenizer, xmlwriter
+        ini-values: post_max_size=512M, max_execution_time=360
+        coverage: xdebug
+        tools: composer:v2
+    - name: Setup Github Token as composer credential
+      run: composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+    - name: phpdocumentor run
+      run: |
+        export UUT_DIR=$(pwd)
+        export REPO=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//")
+        export WORK_DIR=/home/runner/
+        export BIN_DIR="${WORK_DIR}/bin"
+        wget https://phpdoc.org/phpDocumentor.phar
+        mkdir "${WORK_DIR}/phpdoc-out"
+        mv phpDocumentor.phar $BIN_DIR/phpdocumentor
+        chmod +x "${BIN_DIR}/phpdocumentor"
+        echo "Creating UUT related dir in docu repo"
+        mkdir -p $UUT_DIR/phpdoc-git/${GITHUB_REF##*/}/${REPO}/
+        ## Look into any of lib, src, app (if they exist) but not test, migration, bin, locale or script dirs
+        $BIN_DIR/phpdocumentor -d $UUT_DIR/lib/ -d $UUT_DIR/src/ -d $UUT_DIR/app/ -t "${UUT_DIR}/phpdoc-git/${GITHUB_REF##*/}/${REPO}/"
+        cd ${UUT_DIR}/phpdoc-git
+        git add "${GITHUB_REF##*/}/${REPO}"
+        php indexer.php ${GITHUB_REF##*/} $REPO
+        git add index.html index.json
+        git commit -m "Updated phpdoc for $GITHUB_REPOSITORY (${GITHUB_REF##*/} branch) from ci"
+        git push

.github/workflows/release.yml

@@ -0,0 +1,61 @@
+---
+name: make release
+
+# manual workflow to make a new release for the default branch
+on:
+  workflow_dispatch:
+    branches:
+      - FRAMEWORK_6_0
+
+jobs:
+  run:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: ['ubuntu-20.04']
+        php-versions: ['7.4']
+    steps:
+    - name: Setup git
+      run:  |
+          mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com > ~/.ssh/known_hosts
+          git config --global user.name "Github CI Runner"
+          git config --global user.email "[email protected]"
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+        extensions: gettext
+        ini-values: post_max_size=512M, max_execution_time=360
+        tools: composer:v2
+    - name: Setup composer
+      run: |
+          composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+          composer global config repositories.0 composer https://horde-satis.maintaina.com
+          composer global config minimum-stability dev
+          composer global require horde/components "dev-FRAMEWORK_6_0"
+          alias horde-components="~/.config/composer/web/components/bin/horde-components -c ~/.config/composer/web/components/config/maintaina.conf.dist"
+    - name: write changelog
+      run: |
+          entries_amount=0; max_entries=100
+          PATTERN="^\[.*\] .*"
+
+          for commit in $(git rev-list FRAMEWORK_6_0)
+          do
+            msg=$(git log --format=%B -n 1 $commit | head -n 1)
+            if [ $entries_amount -gt $max_entries ]; then break; fi
+            if [[ $msg == 'Released'* ]]; then break; fi
+            if [[ $msg == 'Development mode for'* ]]; then break; fi
+            if [[ $msg =~ $PATTERN ]]; then
+              horde-components changed "$msg"
+              let "entries_amount+=1"
+            fi
+          done
+    - name: make release and push
+      run: |
+          horde-components release for maintaina
+          git push
+          git push origin --tags

.github/workflows/update-satis.yml

@@ -0,0 +1,62 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Update Satis
+
+# Controls when the action will run.
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches:
+      - FRAMEWORK_6_0
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  run:
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Setup github ssh key
+      run:  mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com > ~/.ssh/known_hosts
+    - name: Setup uut dir
+      run: |
+        export REPO=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//")
+        export UUT_DIR=$(pwd)
+        export WORK_DIR=~
+        export BIN_DIR="${WORK_DIR}/bin"
+        mkdir -p $BIN_DIR
+        git config --global user.name "PHPDOC CI Job"
+        git config --global user.email "[email protected]"
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Checkout satis web dir
+      uses: actions/checkout@v2
+      with:
+        repository: maintaina-com/maintaina-com.github.io
+        token: ${{secrets.PHPDOC_TOKEN}}
+        path: "maintaina-com.github.io"
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: 7.4
+        extensions: bcmath, ctype, curl, dom, gd, gettext, iconv, imagick, json, ldap, mbstring, mysql, opcache, openssl, pcntl, pdo, posix, redis, soap, sockets, sqlite, tokenizer, xmlwriter
+        ini-values: post_max_size=512M, max_execution_time=3600
+        coverage: xdebug
+        tools: composer:v2
+    - name: Setup Github Token as composer credential
+      run: composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+    - name: Run Satis
+      run: |
+        export UUT_DIR=$(pwd)
+        export REPO=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//")
+        export WORK_DIR=/home/runner/
+        export BIN_DIR="${WORK_DIR}/bin"
+        mkdir -p satis
+        cd satis
+        composer require "composer/satis:dev-main"
+        cd ..
+        php satis/vendor/composer/satis/bin/satis build -vvv  maintaina-com.github.io/satis.json maintaina-com.github.io/ horde/${REPO,,}
+        cd maintaina-com.github.io
+        git add include/ index.html p2/ packages.json
+        git commit -m "Update for horde/${REPO,,}"
+        git push

.horde.yml

@@ -7,7 +7,7 @@ description: >-
   integrated with Horde and the IMP Webmail client, and supports both
   server-side (Sieve, Procmail, Maildrop) and client-side (IMAP) message
   filtering.
-list:
+list: ~
 type: application
 homepage: https://www.horde.org/apps/ingo
 authors:
@@ -30,36 +30,36 @@ authors:
     active: false
     role: lead
 version:
-  release: 4.0.0
-  api: 4.0.0
+  release: 4.0.0alpha7
+  api: 4.0.0alpha1
 state:
-  release: beta
-  api: beta
+  release: alpha
+  api: alpha
 license:
   identifier: ASL
   uri: http://www.horde.org/licenses/apache
 dependencies:
   required:
-    php: ^5.3 || ^7
-    pear:
-      pear.horde.org/horde: ^5
-      pear.horde.org/Horde_Auth: ^2
-      pear.horde.org/Horde_Autoloader: ^2
-      pear.horde.org/Horde_Core: ^2.12
-      pear.horde.org/Horde_Exception: ^2
-      pear.horde.org/Horde_Group: ^2
-      pear.horde.org/Horde_Form: ^2
-      pear.horde.org/Horde_Imap_Client: ^2
-      pear.horde.org/Horde_Mime: ^2.5
-      pear.horde.org/Horde_Perms: ^2
-      pear.horde.org/Horde_Share: ^2
-      pear.horde.org/Horde_Util: ^2
-      pear.horde.org/Horde_View: ^2
+    php: ^7.4 || ^8
+    composer:
+      horde/horde: ^6
+      horde/auth: ^3
+      horde/autoloader: ^3
+      horde/core: ^3
+      horde/exception: ^3
+      horde/group: ^3
+      horde/form: ^3
+      horde/imap_client: ^3
+      horde/managesieve: ^2
+      horde/mime: ^3
+      horde/perms: ^3
+      horde/share: ^3
+      horde/util: ^3
+      horde/view: ^3
     ext:
       gettext: '*'
   optional:
-    pear:
-      pear.horde.org/Horde_ListHeaders: ^1
-      pear.horde.org/Horde_ManageSieve: ^1
-      pear.horde.org/Horde_Mongo: ^1
-      pear.horde.org/Horde_Vfs: ^2
+    composer:
+      horde/listheaders: ^2
+      horde/mongo: ^2
+      horde/vfs: ^3