Skip to content

Commit 015c796

Browse files
Merge pull request #32 from weierophinney/feature/gha-workflow
Switch to GHA CI Workflow
2 parents 515d8cf + 6fd89e3 commit 015c796

File tree

57 files changed

+5395
-864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+5395
-864
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: "Continuous Integration"
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- '[0-9]+.[0-9]+.x'
8+
- 'refs/pull/*'
9+
tags:
10+
11+
jobs:
12+
matrix:
13+
name: Generate job matrix
14+
runs-on: ubuntu-latest
15+
outputs:
16+
matrix: ${{ steps.matrix.outputs.matrix }}
17+
steps:
18+
- name: Gather CI configuration
19+
id: matrix
20+
uses: laminas/laminas-ci-matrix-action@v1
21+
22+
qa:
23+
name: QA Checks
24+
needs: [matrix]
25+
runs-on: ${{ matrix.operatingSystem }}
26+
strategy:
27+
fail-fast: false
28+
matrix: ${{ fromJSON(needs.matrix.outputs.matrix) }}
29+
steps:
30+
- name: ${{ matrix.name }}
31+
uses: laminas/laminas-continuous-integration-action@v1
32+
with:
33+
job: ${{ matrix.job }}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
/.phpcs-cache
12
/clover.xml
2-
/composer.lock
33
/coveralls-upload.json
44
/phpunit.xml
55
/vendor/

.laminas-ci.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"extensions": [
3+
"mongodb",
4+
"pdo",
5+
"pdo-sqlite"
6+
]
7+
}

.travis.yml

Lines changed: 0 additions & 69 deletions
This file was deleted.

bin/bcrypt.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
#!/usr/bin/env php
22
<?php
33

4-
/**
5-
* @see https://github.com/laminas-api-tools/api-tools-oauth2 for the canonical source repository
6-
* @copyright https://github.com/laminas-api-tools/api-tools-oauth2/blob/master/COPYRIGHT.md
7-
* @license https://github.com/laminas-api-tools/api-tools-oauth2/blob/master/LICENSE.md New BSD License
8-
*/
9-
104
use Laminas\Crypt\Password\Bcrypt;
115

126
$autoload = realpath(__DIR__ . '/../vendor/autoload.php');
@@ -23,7 +17,7 @@
2317

2418
include $autoload;
2519

26-
$help = <<< EOH
20+
$help = <<<EOH
2721
Usage:
2822
php bcrypt.php <password> [cost]
2923

composer.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,28 @@
2424
"extra": {
2525
},
2626
"require": {
27-
"php": "^5.6 || ^7.0",
27+
"php": "^7.3",
2828
"bshaffer/oauth2-server-php": "^1.10",
29-
"laminas-api-tools/api-tools-api-problem": "^1.2.1",
30-
"laminas-api-tools/api-tools-content-negotiation": "^1.2.1",
31-
"laminas/laminas-crypt": "^3.3",
32-
"laminas/laminas-http": "^2.5.4",
29+
"laminas-api-tools/api-tools-api-problem": "^1.4",
30+
"laminas-api-tools/api-tools-content-negotiation": "^1.5",
31+
"laminas/laminas-crypt": "^3.4",
32+
"laminas/laminas-http": "^2.13",
3333
"laminas/laminas-mvc": "^2.7.15 || ^3.0.2",
34+
"laminas/laminas-mvc-i18n": "^1.2",
3435
"laminas/laminas-servicemanager": "^2.7.6 || ^3.1",
35-
"laminas/laminas-zendframework-bridge": "^1.0"
36+
"laminas/laminas-zendframework-bridge": "^1.1"
3637
},
3738
"require-dev": {
38-
"laminas/laminas-authentication": "^2.5.3",
39-
"laminas/laminas-coding-standard": "~1.0.0",
40-
"laminas/laminas-db": "^2.8.1",
41-
"laminas/laminas-i18n": "^2.7.3",
42-
"laminas/laminas-log": "^2.9",
43-
"laminas/laminas-modulemanager": "^2.7.2",
44-
"laminas/laminas-serializer": "^2.8",
39+
"laminas/laminas-authentication": "^2.8",
40+
"laminas/laminas-coding-standard": "~2.2.0",
41+
"laminas/laminas-db": "^2.12",
42+
"laminas/laminas-i18n": "^2.11",
43+
"laminas/laminas-log": "^2.13",
44+
"laminas/laminas-modulemanager": "^2.10",
45+
"laminas/laminas-serializer": "^2.10",
4546
"laminas/laminas-test": "^2.6.1 || ^3.0.1",
46-
"mockery/mockery": "^1.0",
47-
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5"
47+
"mockery/mockery": "^1.3.1",
48+
"phpunit/phpunit": "^7.5.15"
4849
},
4950
"suggest": {
5051
"alcaeus/mongo-php-adapter": "^1.0.5, if you are using ext/mongodb and wish to use the MongoAdapter for OAuth2 credential storage."

0 commit comments

Comments
 (0)