Skip to content

Commit fefa7c3

Browse files
ralflangralflang
committed
Released SessionHandler-3.0.0alpha3
1 parent e92bb17 commit fefa7c3

27 files changed

+562
-199
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: CI
4+
5+
# Controls when the action will run.
6+
on:
7+
# Triggers the workflow on push or pull request events but only for the master branch
8+
push:
9+
branches:
10+
- master
11+
- maintaina-composerfixed
12+
- FRAMEWORK_6_0
13+
pull_request:
14+
branches:
15+
- master
16+
- maintaina-composerfixed
17+
- FRAMEWORK_6_0
18+
19+
20+
# Allows you to run this workflow manually from the Actions tab
21+
workflow_dispatch:
22+
23+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
24+
jobs:
25+
run:
26+
runs-on: ${{ matrix.operating-system }}
27+
strategy:
28+
matrix:
29+
operating-system: ['ubuntu-20.04']
30+
php-versions: ['7.4', '8.0', 'latest']
31+
phpunit-versions: ['latest', '9.5']
32+
steps:
33+
- name: Setup github ssh key
34+
run: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com > ~/.ssh/known_hosts
35+
- name: Checkout
36+
uses: actions/checkout@v2
37+
38+
- name: Setup PHP
39+
uses: shivammathur/setup-php@v2
40+
with:
41+
php-version: ${{ matrix.php-versions }}
42+
extensions: bcmath, ctype, curl, dom, gd, gettext, iconv, imagick, json, ldap, mbstring, mysql, opcache, openssl, pcntl, pdo, posix, redis, soap, sockets, sqlite, tokenizer, xmlwriter
43+
ini-values: post_max_size=512M, max_execution_time=360
44+
coverage: xdebug
45+
tools: php-cs-fixer, phpunit:${{ matrix.phpunit-versions }}, composer:v2
46+
- name: Setup Github Token as composer credential
47+
run: composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
48+
- name: Install horde/test dependency and other dependencies
49+
run: |
50+
## For unclear reasons, github action fails randomly if we do not install before we require.
51+
COMPOSER_ROOT_VERSION=dev-FRAMEWORK_6_0 composer install
52+
COMPOSER_ROOT_VERSION=dev-FRAMEWORK_6_0 composer require --dev horde/test dev-FRAMEWORK_6_0 horde/log dev-FRAMEWORK_6_0
53+
- name: install horde/db ^3
54+
run: composer require horde/db ^3
55+
- name: install horde/log ^3
56+
run: composer require horde/log ^3
57+
- name: install horde/cli ^3
58+
run: composer require horde/cli ^3
59+
- name: run phpunit
60+
run: phpunit --bootstrap test/Horde/SessionHandler/bootstrap.php test/Horde/SessionHandler/

‎.github/workflows/phpdoc.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: PHPDOC
4+
5+
# Controls when the action will run.
6+
on:
7+
# Triggers the workflow on push or pull request events but only for the master branch
8+
push:
9+
branches:
10+
- master
11+
- maintaina-composerfixed
12+
- FRAMEWORK_6_0
13+
# Allows you to run this workflow manually from the Actions tab
14+
workflow_dispatch:
15+
16+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
17+
jobs:
18+
run:
19+
runs-on: ubuntu-20.04
20+
steps:
21+
- name: Setup github ssh key
22+
run: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com > ~/.ssh/known_hosts
23+
- name: Setup uut dir
24+
run: |
25+
export REPO=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//")
26+
export UUT_DIR=$(pwd)
27+
export WORK_DIR=~
28+
export BIN_DIR="${WORK_DIR}/bin"
29+
mkdir -p $BIN_DIR
30+
git config --global user.name "PHPDOC CI Job"
31+
git config --global user.email "[email protected]"
32+
- name: Checkout
33+
uses: actions/checkout@v2
34+
- name: Checkout Doc Dir
35+
uses: actions/checkout@v2
36+
with:
37+
repository: maintaina/phpdoc
38+
token: ${{secrets.PHPDOC_TOKEN}}
39+
path: "phpdoc-git"
40+
- name: Setup PHP
41+
uses: shivammathur/setup-php@v2
42+
with:
43+
php-version: 7.4
44+
extensions: bcmath, ctype, curl, dom, gd, gettext, iconv, imagick, json, ldap, mbstring, mysql, opcache, openssl, pcntl, pdo, posix, redis, soap, sockets, sqlite, tokenizer, xmlwriter
45+
ini-values: post_max_size=512M, max_execution_time=360
46+
coverage: xdebug
47+
tools: composer:v2
48+
- name: Setup Github Token as composer credential
49+
run: composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
50+
- name: phpdocumentor run
51+
run: |
52+
export UUT_DIR=$(pwd)
53+
export REPO=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//")
54+
export WORK_DIR=/home/runner/
55+
export BIN_DIR="${WORK_DIR}/bin"
56+
wget https://phpdoc.org/phpDocumentor.phar
57+
mkdir "${WORK_DIR}/phpdoc-out"
58+
mv phpDocumentor.phar $BIN_DIR/phpdocumentor
59+
chmod +x "${BIN_DIR}/phpdocumentor"
60+
echo "Creating UUT related dir in docu repo"
61+
mkdir -p $UUT_DIR/phpdoc-git/${GITHUB_REF##*/}/${REPO}/
62+
## Look into any of lib, src, app (if they exist) but not test, migration, bin, locale or script dirs
63+
$BIN_DIR/phpdocumentor -d $UUT_DIR/lib/ -d $UUT_DIR/src/ -d $UUT_DIR/app/ -t "${UUT_DIR}/phpdoc-git/${GITHUB_REF##*/}/${REPO}/"
64+
cd ${UUT_DIR}/phpdoc-git
65+
git add "${GITHUB_REF##*/}/${REPO}"
66+
php indexer.php ${GITHUB_REF##*/} $REPO
67+
git add index.html index.json
68+
git commit -m "Updated phpdoc for $GITHUB_REPOSITORY (${GITHUB_REF##*/} branch) from ci"
69+
git push

‎.github/workflows/update-satis.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: Update Satis
4+
5+
# Controls when the action will run.
6+
on:
7+
# Triggers the workflow on push or pull request events but only for the master branch
8+
push:
9+
branches:
10+
- FRAMEWORK_6_0
11+
# Allows you to run this workflow manually from the Actions tab
12+
workflow_dispatch:
13+
14+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
15+
jobs:
16+
run:
17+
runs-on: ubuntu-20.04
18+
steps:
19+
- name: Setup github ssh key
20+
run: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com > ~/.ssh/known_hosts
21+
- name: Setup uut dir
22+
run: |
23+
export REPO=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//")
24+
export UUT_DIR=$(pwd)
25+
export WORK_DIR=~
26+
export BIN_DIR="${WORK_DIR}/bin"
27+
mkdir -p $BIN_DIR
28+
git config --global user.name "PHPDOC CI Job"
29+
git config --global user.email "[email protected]"
30+
- name: Checkout
31+
uses: actions/checkout@v2
32+
- name: Checkout satis web dir
33+
uses: actions/checkout@v2
34+
with:
35+
repository: maintaina-com/maintaina-com.github.io
36+
token: ${{secrets.PHPDOC_TOKEN}}
37+
path: "maintaina-com.github.io"
38+
- name: Setup PHP
39+
uses: shivammathur/setup-php@v2
40+
with:
41+
php-version: 7.4
42+
extensions: bcmath, ctype, curl, dom, gd, gettext, iconv, imagick, json, ldap, mbstring, mysql, opcache, openssl, pcntl, pdo, posix, redis, soap, sockets, sqlite, tokenizer, xmlwriter
43+
ini-values: post_max_size=512M, max_execution_time=3600
44+
coverage: xdebug
45+
tools: composer:v2
46+
- name: Setup Github Token as composer credential
47+
run: composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
48+
- name: Run Satis
49+
run: |
50+
export UUT_DIR=$(pwd)
51+
export REPO=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//")
52+
export WORK_DIR=/home/runner/
53+
export BIN_DIR="${WORK_DIR}/bin"
54+
composer create-project composer/satis:dev-main
55+
php satis/bin/satis build -vvv maintaina-com.github.io/satis.json maintaina-com.github.io/ horde/${REPO,,}
56+
cd maintaina-com.github.io
57+
git add include/ index.html p2/ packages.json
58+
git commit -m "Update for horde/${REPO,,}"
59+
git push

‎.horde.yml‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,30 @@ authors:
2828
active: false
2929
role: lead
3030
version:
31-
release: 2.3.1
32-
api: 2.2.0
31+
release: 3.0.0alpha3
32+
api: 3.0.0alpha1
3333
state:
34-
release: stable
35-
api: stable
34+
release: alpha
35+
api: alpha
3636
license:
37-
identifier: LGPL-2.1
37+
identifier: LGPL-2.1-only
3838
uri: http://www.horde.org/licenses/lgpl21
3939
dependencies:
4040
required:
41-
php: ^5.3 || ^7
42-
pear:
43-
pear.horde.org/Horde_Exception: ^2
44-
pear.horde.org/Horde_Support: ^2
41+
php: ^7.4 || ^8
42+
composer:
43+
horde/exception: ^3
44+
horde/support: ^3
4545
optional:
46-
pear:
47-
pear.horde.org/Horde_Db: ^2.2
48-
pear.horde.org/Horde_HashTable: ^1.1
49-
pear.horde.org/Horde_Log: ^2
50-
pear.horde.org/Horde_Mongo: ^1
51-
pear.horde.org/Horde_Test: ^2.1
46+
composer:
47+
horde/db: ^3
48+
horde/hashtable: ^2
49+
horde/log: ^3
50+
horde/mongo: ^2
51+
dev:
52+
composer:
53+
horde/db: ^3
54+
horde/hashtable: ^2
55+
horde/log: ^3
56+
horde/mongo: ^2
57+
horde/test: ^3

‎composer.json‎

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Session handler library",
44
"type": "library",
55
"homepage": "https://www.horde.org/libraries/Horde_SessionHandler",
6-
"license": "LGPL-2.1",
6+
"license": "LGPL-2.1-only",
77
"authors": [
88
{
99
"name": "Jan Schneider",
@@ -21,33 +21,44 @@
2121
"role": "lead"
2222
}
2323
],
24-
"version": "2.3.1",
25-
"time": "2021-02-17",
24+
"time": "2022-11-04",
2625
"repositories": [
2726
{
28-
"type": "pear",
29-
"url": "https://pear.horde.org"
27+
"type": "composer",
28+
"url": "https://horde-satis.maintaina.com"
3029
}
3130
],
3231
"require": {
33-
"php": "^5.3 || ^7",
34-
"pear-pear.horde.org/Horde_Exception": "^2",
35-
"pear-pear.horde.org/Horde_Support": "^2"
32+
"php": "^7.4 || ^8",
33+
"horde/exception": "^3 || dev-FRAMEWORK_6_0",
34+
"horde/support": "^3 || dev-FRAMEWORK_6_0"
3635
},
37-
"suggest": {
38-
"pear-pear.horde.org/Horde_Db": "^2.2",
39-
"pear-pear.horde.org/Horde_HashTable": "^1.1",
40-
"pear-pear.horde.org/Horde_Log": "^2",
41-
"pear-pear.horde.org/Horde_Mongo": "^1",
42-
"pear-pear.horde.org/Horde_Test": "^2.1"
36+
"require-dev": {
37+
"horde/db": "^3 || dev-FRAMEWORK_6_0",
38+
"horde/hashtable": "^2 || dev-FRAMEWORK_6_0",
39+
"horde/log": "^3 || dev-FRAMEWORK_6_0",
40+
"horde/mongo": "^2 || dev-FRAMEWORK_6_0",
41+
"horde/test": "^3 || dev-FRAMEWORK_6_0"
4342
},
44-
"replace": {
45-
"pear-pear.horde.org/Horde_SessionHandler": "2.*",
46-
"pear-horde/Horde_SessionHandler": "2.*"
43+
"suggest": {
44+
"horde/db": "^3 || dev-FRAMEWORK_6_0",
45+
"horde/hashtable": "^2 || dev-FRAMEWORK_6_0",
46+
"horde/log": "^3 || dev-FRAMEWORK_6_0",
47+
"horde/mongo": "^2 || dev-FRAMEWORK_6_0"
4748
},
4849
"autoload": {
4950
"psr-0": {
5051
"Horde_SessionHandler": "lib/"
5152
}
53+
},
54+
"autoload-dev": {
55+
"psr-4": {
56+
"Horde\\SessionHandler\\Test\\": "test/"
57+
}
58+
},
59+
"config": {
60+
"allow-plugins": {
61+
"horde/horde-installer-plugin": true
62+
}
5263
}
5364
}

‎doc/Horde/SessionHandler/CHANGES‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
1+
------------
2+
v3.0.0alpha3
3+
------------
4+
5+
[rla] Consolidated with H5 master and fixed metadata for PHP 8.
6+
|+
7+
8+
9+
------------
10+
v3.0.0alpha2
11+
------------
12+
13+
|+
14+
15+
------------
16+
v3.0.0alpha1
17+
------------
18+
19+
[rla] Initial release for composer.
20+
21+
122
------
223
v2.3.1
324
------
425

5-
6-
26+
|+
727

828
------
929
v2.3.0

‎doc/Horde/SessionHandler/changelog.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,37 @@
11
---
2+
3.0.0alpha3:
3+
api: 3.0.0alpha1
4+
state:
5+
release: alpha
6+
api: alpha
7+
date: 2022-11-04
8+
license:
9+
identifier: LGPL-2.1
10+
uri: http://www.horde.org/licenses/lgpl21
11+
notes: |
12+
[rla] Consolidated with H5 master and fixed metadata for PHP 8.
13+
|+
14+
3.0.0alpha2:
15+
api: 3.0.0alpha1
16+
state:
17+
release: alpha
18+
api: alpha
19+
date: 2021-02-24
20+
license:
21+
identifier: LGPL-2.1
22+
uri: http://www.horde.org/licenses/lgpl21
23+
notes: |+
24+
3.0.0alpha1:
25+
api: 3.0.0alpha1
26+
state:
27+
release: stable
28+
api: stable
29+
date: 2021-02-24
30+
license:
31+
identifier: LGPL-2.1
32+
uri: http://www.horde.org/licenses/lgpl21
33+
notes: |
34+
[rla] Initial release for composer.
235
2.3.1:
336
api: 2.2.0
437
state:

0 commit comments

Comments
 (0)