Skip to content

Commit 0935420

Browse files
SlamdunkSlamdunk
committed
Move to Github Actions
1 parent d7a1fd2 commit 0935420

File tree

16 files changed

+242
-72
lines changed

16 files changed

+242
-72
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
/.github export-ignore
12
/tests export-ignore
23
.gitattributes export-ignore
34
.gitignore export-ignore
45
.php_cs export-ignore
5-
.scrutinizer.yml export-ignore
6-
.travis.yml export-ignore
6+
Makefile export-ignore
77
phpunit.xml export-ignore

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github: [Slamdunk]

‎.github/workflows/integrate.yaml‎

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
name: "Integrate"
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- "master"
8+
9+
jobs:
10+
composer-json-lint:
11+
name: "Lint composer.json"
12+
13+
runs-on: "ubuntu-latest"
14+
15+
strategy:
16+
matrix:
17+
php-version:
18+
- "7.4"
19+
20+
steps:
21+
- name: "Checkout"
22+
uses: "actions/checkout@v2"
23+
24+
- name: "Install PHP"
25+
uses: "shivammathur/setup-php@v2"
26+
with:
27+
coverage: "none"
28+
php-version: "${{ matrix.php-version }}"
29+
tools: composer-normalize
30+
31+
- name: "Get composer cache directory"
32+
id: composercache
33+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
34+
35+
- name: "Cache dependencies"
36+
uses: actions/cache@v2
37+
with:
38+
path: ${{ steps.composercache.outputs.dir }}
39+
key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }}
40+
restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
41+
42+
- name: "Install dependencies"
43+
run: "composer update --no-interaction --no-progress"
44+
45+
- name: "Validate composer.json"
46+
run: "composer validate --strict"
47+
48+
- name: "Normalize composer.json"
49+
run: "composer-normalize --dry-run"
50+
51+
tests:
52+
name: "Tests"
53+
54+
runs-on: "ubuntu-latest"
55+
56+
strategy:
57+
matrix:
58+
php-version:
59+
- "7.4"
60+
- "8.0"
61+
62+
steps:
63+
- name: "Checkout"
64+
uses: "actions/checkout@v2"
65+
66+
- name: "Install PHP"
67+
uses: "shivammathur/setup-php@v2"
68+
with:
69+
coverage: "none"
70+
php-version: "${{ matrix.php-version }}"
71+
ini-values: zend.assertions=1
72+
73+
- name: "Get composer cache directory"
74+
id: composercache
75+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
76+
77+
- name: "Cache dependencies"
78+
uses: actions/cache@v2
79+
with:
80+
path: ${{ steps.composercache.outputs.dir }}
81+
key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }}
82+
restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
83+
84+
- name: "Install dependencies"
85+
if: ${{ matrix.php-version != '8.0' }}
86+
run: "composer update --no-interaction --no-progress"
87+
88+
- name: "Install dependencies PHP 8.0"
89+
if: ${{ matrix.php-version == '8.0' }}
90+
run: "composer update --no-interaction --no-progress --ignore-platform-reqs"
91+
92+
- name: "Run tests"
93+
timeout-minutes: 3
94+
run: "vendor/bin/phpunit --no-coverage --no-logging"
95+
96+
code-coverage:
97+
name: "Code Coverage"
98+
99+
runs-on: "ubuntu-latest"
100+
101+
strategy:
102+
matrix:
103+
php-version:
104+
- "7.4"
105+
106+
steps:
107+
- name: "Checkout"
108+
uses: "actions/checkout@v2"
109+
110+
- name: "Install PHP"
111+
uses: "shivammathur/setup-php@v2"
112+
with:
113+
coverage: "pcov"
114+
php-version: "${{ matrix.php-version }}"
115+
ini-values: zend.assertions=1
116+
117+
- name: "Get composer cache directory"
118+
id: composercache
119+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
120+
121+
- name: "Cache dependencies"
122+
uses: actions/cache@v2
123+
with:
124+
path: ${{ steps.composercache.outputs.dir }}
125+
key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }}
126+
restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
127+
128+
- name: "Install dependencies"
129+
run: "composer update --no-interaction --no-progress"
130+
131+
- name: "Run tests"
132+
timeout-minutes: 3
133+
run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
134+
135+
- name: "Send code coverage report to Codecov.io"
136+
uses: codecov/codecov-action@v1
137+
with:
138+
token: ${{ secrets.CODECOV_TOKEN }}
139+
file: ./coverage.xml
140+
fail_ci_if_error: true
141+
142+
coding-standards:
143+
name: "Coding Standards"
144+
145+
runs-on: "ubuntu-latest"
146+
147+
strategy:
148+
matrix:
149+
php-version:
150+
- "7.4"
151+
152+
steps:
153+
- name: "Checkout"
154+
uses: "actions/checkout@v2"
155+
156+
- name: "Install PHP"
157+
uses: "shivammathur/setup-php@v2"
158+
with:
159+
coverage: "none"
160+
php-version: "${{ matrix.php-version }}"
161+
162+
- name: "Get composer cache directory"
163+
id: composercache
164+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
165+
166+
- name: "Cache dependencies"
167+
uses: actions/cache@v2
168+
with:
169+
path: ${{ steps.composercache.outputs.dir }}
170+
key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }}
171+
restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
172+
173+
- name: "Install dependencies"
174+
run: "composer update --no-interaction --no-progress"
175+
176+
- name: "Check coding standards"
177+
run: "vendor/bin/php-cs-fixer fix --verbose"

‎.php_cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
$config = new SlamCsFixer\Config(SlamCsFixer\Config::LIB);
3+
$config = new SlamCsFixer\Config();
44
$config->getFinder()
55
->in(__DIR__ . '/lib')
66
->in(__DIR__ . '/tests')

‎.scrutinizer.yml‎

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

‎.travis.yml‎

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

‎Makefile‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
all: csfix test
2+
@echo "Done."
3+
4+
vendor: composer.json
5+
composer update
6+
touch vendor
7+
8+
.PHONY: csfix
9+
csfix: vendor
10+
vendor/bin/php-cs-fixer fix --verbose
11+
12+
.PHONY: test
13+
test: vendor
14+
php -d zend.assertions=1 vendor/bin/phpunit

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# php-debug-r
22

3-
[![Build Status](https://travis-ci.org/Slamdunk/php-debug-r.svg?branch=master)](https://travis-ci.org/Slamdunk/php-debug-r)
4-
[![Code Coverage](https://scrutinizer-ci.com/g/Slamdunk/php-debug-r/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/Slamdunk/php-debug-r/?branch=master)
5-
[![Packagist](https://img.shields.io/packagist/v/slam/php-debug-r.svg)](https://packagist.org/packages/slam/php-debug-r)
3+
[![Latest Stable Version](https://img.shields.io/packagist/v/slam/php-debug-r.svg)](https://packagist.org/packages/slam/php-debug-r)
4+
[![Downloads](https://img.shields.io/packagist/dt/slam/php-debug-r.svg)](https://packagist.org/packages/slam/php-debug-r)
5+
[![Integrate](https://github.com/Slamdunk/php-debug-r/workflows/Integrate/badge.svg?branch=master)](https://github.com/Slamdunk/php-debug-r/actions)
6+
[![Code Coverage](https://codecov.io/gh/Slamdunk/php-debug-r/coverage.svg?branch=master)](https://codecov.io/gh/Slamdunk/php-debug-r?branch=master)
67

78
Custom function for debug purposes

‎composer.json‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,21 @@
1010
"role": "Developer"
1111
}
1212
],
13-
"autoload": {
14-
"files": ["lib/r.php"]
15-
},
16-
"autoload-dev": {
17-
"classmap": ["tests/"]
18-
},
1913
"require": {
20-
"php": "^7.3"
14+
"php": "^7.4 || ^8.0"
2115
},
2216
"require-dev": {
23-
"phpunit/phpunit": "^8.5",
24-
"roave/security-advisories": "dev-master",
25-
"slam/php-cs-fixer-extensions": "^1.19"
17+
"phpunit/phpunit": "^9.4.2",
18+
"slam/php-cs-fixer-extensions": "^2.0.0"
19+
},
20+
"autoload": {
21+
"files": [
22+
"lib/r.php"
23+
]
24+
},
25+
"autoload-dev": {
26+
"classmap": [
27+
"tests/"
28+
]
2629
}
2730
}

‎lib/r.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ function rq(string $query, array $params, bool $exit = true, int $level = 0, boo
3535
{
3636
final class R
3737
{
38-
/**
39-
* @var array
40-
*/
41-
public static $db = [];
38+
public static array $db = [];
4239

4340
private function __construct()
4441
{

0 commit comments

Comments
 (0)