Update metadata and workflows for PHP 8 support

horde · Oct 28, 2023 · 6e99004 · 6e99004
1 parent a392011
commit 6e99004
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,8 +27,8 @@ jobs:
     strategy:
       matrix:
         operating-system: ['ubuntu-20.04']
-        php-versions: ['7.4']
-        phpunit-versions: ['latest', '9.5', '9.0']
+        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

diff --git a/.github/workflows/phpdoc.yml b/.github/workflows/phpdoc.yml
@@ -59,8 +59,8 @@ jobs:
         chmod +x "${BIN_DIR}/phpdocumentor"
         echo "Creating UUT related dir in docu repo"
         mkdir -p $UUT_DIR/phpdoc-git/${GITHUB_REF##*/}/${REPO}/
-        ## TODO: check for and include lib, src, app (if they exist) but not test or script dirs
-        $BIN_DIR/phpdocumentor -d $UUT_DIR/lib/ -t "${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

diff --git a/.github/workflows/update-satis.yml b/.github/workflows/update-satis.yml
@@ -52,12 +52,8 @@ jobs:
         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/pear
+        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/pear"
+        git commit -m "Update for horde/${REPO,,}"
         git push
-
-
-
-
diff --git a/.horde.yml b/.horde.yml
@@ -22,11 +22,11 @@ state:
   release: alpha
   api: alpha
 license:
-  identifier: LGPL-2.1
+  identifier: LGPL-2.1-only
   uri: http://www.horde.org/licenses/lgpl21
 dependencies:
   required:
-    php: ^7
+    php: ^7.4 || ^8
     composer:
       horde/exception: ^3
       horde/util: ^3

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "description": "PEAR infrastructure library",
     "type": "library",
     "homepage": "https://www.horde.org/libraries/Horde_Pear",
-    "license": "LGPL-2.1",
+    "license": "LGPL-2.1-only",
     "authors": [
         {
             "name": "Gunnar Wrobel",
@@ -20,7 +20,7 @@
         }
     ],
     "require": {
-        "php": "^7",
+        "php": "^7.4 || ^8",
         "horde/exception": "^3 || dev-FRAMEWORK_6_0",
         "horde/util": "^3 || dev-FRAMEWORK_6_0",
         "horde/xml_element": "^3 || dev-FRAMEWORK_6_0",