Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
62b3687
Components updated the package files.
ralflang Feb 24, 2021
71a5dcb
Released Test-3.0.0alpha1
ralflang Feb 24, 2021
6bc9c19
Development mode for Test-3.0.0alpha3
ralflang Feb 24, 2021
d765574
Released Test-3.0.0alpha2
ralflang Feb 24, 2021
73d5526
Development mode for Test-3.0.0alpha4
ralflang Feb 24, 2021
c99c648
Unbundle old phpunit, add phpunit 9 dep
ralflang Mar 2, 2021
3e1776f
Make compatible with phpunit 9
ralflang Mar 2, 2021
4e59ec9
More phpunit 9.5 conversions
ralflang Mar 2, 2021
9d2119a
Fix a PHP notice for a missing array index in
ralflang Mar 2, 2021
43be48e
Fix fatal third argument type mismatch for phpunit 9.5 (and probably …
ralflang Mar 7, 2021
e9cc15c
Released Test-3.0.0alpha2
ralflang Mar 13, 2021
e97ca68
Development mode for Test-3.0.0alpha4
ralflang Mar 13, 2021
5ef21c6
Fix calling from outside uut dir
ralflang Mar 14, 2021
238407f
Released Test-3.0.0alpha3
ralflang Mar 14, 2021
88ed5ac
Development mode for Test-3.0.0alpha5
ralflang Mar 14, 2021
02866a2
Add CI job for satis repo update
Jul 15, 2021
05b49a9
Allow PHP 8
ralflang Aug 5, 2021
0a37e8d
Initial conversion to namespaced
ralflang Nov 3, 2021
c1d209b
Released Test-3.0.0alpha4
ralflang Nov 3, 2021
bd9e662
Development mode for Test-3.0.0alpha5
ralflang Nov 3, 2021
46d2bd0
Change to more specific type as further code relies on implementation…
ralflang Nov 3, 2021
01874b6
Released Test-3.0.0alpha5
ralflang Nov 3, 2021
e6c0297
Development mode for Test-3.0.0alpha6
ralflang Nov 3, 2021
420426a
Use OnlyMethods rather than addMethods
ralflang Nov 3, 2021
0055086
Released Test-3.0.0alpha6
ralflang Nov 3, 2021
8ca7330
Development mode for Test-3.0.0alpha7
ralflang Nov 3, 2021
3a6f2d0
Update metadata and workflows for PHP 8 support
ralflang Dec 18, 2021
72f87db
added TestCase::getMockDependencies method
midahp Sep 21, 2022
02cfbd7
Merge pull request #1 from midahp/FRAMEWORK_6_0
midahp Sep 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
57 changes: 57 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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
69 changes: 69 additions & 0 deletions .github/workflows/phpdoc.yml
Original file line number Diff line number Diff line change
@@ -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 "ci-job@maintaina.com"
- 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
59 changes: 59 additions & 0 deletions .github/workflows/update-satis.yml
Original file line number Diff line number Diff line change
@@ -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 "ci-job@maintaina.com"
- 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
35 changes: 23 additions & 12 deletions .horde.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 0 additions & 13 deletions bundle/composer.json

This file was deleted.

Loading