Merge pull request #3 from maintaina-com/FRAMEWORK_6_0

Contribute back FRAMEWORK_6_0 branch
horde · Oct 24, 2023 · 83d1080 · 83d1080
2 parents df21066 + 02cfbd7
commit 83d1080
Show file tree

Hide file tree

Showing 831 changed files with 2,801 additions and 86,259 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,57 @@
+# 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
+      - main
+      - FRAMEWORK_6_0
+  pull_request:
+    branches:
+      - master
+      - main
+      - 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, phpstan
+    - 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: Setup problem matchers for PHPUnit
+      run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+    - name: run phpunit
+      run: phpunit --bootstrap test/bootstrap.php
+    - name: run phpstan
+      run: phpstan analyze src/ --level 2
diff --git a/.github/workflows/phpdoc.yml b/.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
diff --git a/.github/workflows/update-satis.yml b/.github/workflows/update-satis.yml
@@ -0,0 +1,59 @@
+# 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"
+        composer create-project composer/satis:dev-main
+        php 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
diff --git a/.horde.yml b/.horde.yml
@@ -20,24 +20,35 @@ authors:
     active: false
     role: lead
 version:
-  release: 2.6.5
-  api: 2.6.0
+  release: 3.0.0alpha7
+  api: 3.0.0alpha1
 state:
-  release: stable
-  api: stable
+  release: alpha
+  api: alpha
 license:
-  identifier: LGPL-2.1
+  identifier: LGPL-2.1-only
   uri: http://www.horde.org/licenses/lgpl21
 dependencies:
   required:
-    php: ^5.3.3 || ^7
-    pear:
-      pear.horde.org/Horde_Support: ^2
-      pear.horde.org/Horde_Util: ^2
+    php: ^7.4 || ^8
+    composer:
+      horde/support: ^3
+      horde/util: ^3
   optional:
-    pear:
-      pear.horde.org/Horde_Cli: ^2
-      pear.horde.org/Horde_Log: ^2
+    composer:
+      horde/cli: ^3
+      horde/log: ^3
     ext:
       dom: '*'
       json: '*'
+  dev:
+    composer:
+      phpunit/phpunit: ^9
+      horde/injector: ^3
+      horde/log: ^3
+      horde/cache: ^3
+      horde/argv: ^3
+      horde/cli: ^3
+      horde/core: ^3
+      horde/history: ^3
+      horde/mongo: ^2
diff --git a/bundle/composer.json b/bundle/composer.json