Skip to content

Commit 0515fd5

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # .github/workflows/main.yml # .travis.yml # composer.json
2 parents 59f51a7 + bef53f1 commit 0515fd5

File tree

4 files changed

+55
-31
lines changed

4 files changed

+55
-31
lines changed

.gitattributes

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
#
1313

1414
/.github export-ignore
15-
/.phan export-ignore
1615
/build export-ignore
1716
/tests export-ignore
1817
/.editorconfig export-ignore
1918
/.gitattributes export-ignore
2019
/.gitignore export-ignore
2120
/.travis.yml export-ignore
21+
/.phan.php export-ignore
2222
/demo.php export-ignore
23-
/phpunit.xml.dist export-ignore
2423
/Makefile export-ignore
2524

2625
* text eol=lf

.github/workflows/main.yml

Lines changed: 41 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# @link https://github.com/JBZoo/SimpleTypes
1212
#
1313

14-
name: Continuous Integration
14+
name: CI
1515

1616
on:
1717
pull_request:
@@ -21,47 +21,39 @@ on:
2121
branches:
2222
- 'master'
2323
schedule:
24-
- cron: '15 */8 * * *'
24+
- cron: '25 */8 * * *'
2525

2626
env:
2727
COLUMNS: 120
2828
TERM_PROGRAM: Hyper
2929

3030
jobs:
3131
phpunit:
32-
name: Tests
32+
name: PHPUnit
3333
runs-on: ubuntu-latest
3434
env:
3535
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
3636
strategy:
3737
matrix:
38-
php-version: [ 7.2, 7.3, 7.4 ]
39-
experimental: [ false ]
38+
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
4039
composer_flags: [ "--prefer-lowest", "" ]
41-
include:
42-
- php-version: "8.0"
43-
experimental: true
44-
- php-version: "8.1"
45-
experimental: true
4640
steps:
4741
- name: Checkout code
4842
uses: actions/checkout@v2
4943
with:
5044
fetch-depth: 0
5145

52-
- name: Setup PHP and composer
46+
- name: Setup PHP
5347
uses: shivammathur/setup-php@v2
5448
with:
5549
php-version: ${{ matrix.php-version }}
5650
coverage: xdebug
5751
tools: composer
5852

5953
- name: Build the Project
60-
continue-on-error: ${{ matrix.experimental }}
6154
run: make update --no-print-directory
6255

6356
- name: 🧪 PHPUnit Tests
64-
continue-on-error: ${{ matrix.experimental }}
6557
run: make test --no-print-directory
6658

6759
- name: Uploading coverage to coveralls
@@ -99,9 +91,42 @@ jobs:
9991
run: make update --no-print-directory
10092

10193
- name: 👍 Code Quality
102-
continue-on-error: ${{ matrix.experimental }}
10394
run: make codestyle --no-print-directory
10495

105-
- name: 📝 Build All Reports at Once
106-
continue-on-error: ${{ matrix.experimental }}
96+
- name: Upload Artifacts
97+
uses: actions/upload-artifact@v2
98+
with:
99+
name: Linters - ${{ matrix.php-version }}
100+
path: build/
101+
102+
103+
report:
104+
name: Reports
105+
runs-on: ubuntu-latest
106+
strategy:
107+
matrix:
108+
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
109+
steps:
110+
- name: Checkout code
111+
uses: actions/checkout@v2
112+
with:
113+
fetch-depth: 0
114+
115+
- name: Setup PHP
116+
uses: shivammathur/setup-php@v2
117+
with:
118+
php-version: ${{ matrix.php-version }}
119+
coverage: xdebug
120+
tools: composer
121+
122+
- name: Build the Project
123+
run: make update --no-print-directory
124+
125+
- name: 📝 Build Reports
107126
run: make report-all --no-print-directory
127+
128+
- name: Upload Artifacts
129+
uses: actions/upload-artifact@v2
130+
with:
131+
name: Reports - ${{ matrix.php-version }}
132+
path: build/

.phan/config.php renamed to .phan.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
declare(strict_types=1);
1717

18-
$default = include __DIR__ . '/../vendor/jbzoo/codestyle/src/phan/default.php';
18+
$default = include __DIR__ . '/vendor/jbzoo/codestyle/src/phan/default.php';
1919

2020
return array_merge($default, [
2121
'directory_list' => [

composer.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
{
2-
"name" : "jbzoo/simpletypes",
3-
"type" : "library",
4-
"description" : "The universal PHP library to convert any values and measures",
5-
"license" : "MIT",
6-
"keywords" : [
2+
"name" : "jbzoo/simpletypes",
3+
"type" : "library",
4+
"description" : "The universal PHP library to convert any values and measures",
5+
"license" : "MIT",
6+
"keywords" : [
77
"converter", "acceleration", "area", "degree", "info", "length", "money", "number", "pressure", "speed",
88
"temperature", "time", "volume", "weight"
99
],
10-
"authors" : [
10+
"authors" : [
1111
{
1212
"name" : "Denis Smetannikov",
1313
"email" : "admin@jbzoo.com",
1414
"role" : "lead"
1515
}
1616
],
1717

18-
"require" : {
18+
"require" : {
1919
"php" : ">=7.2"
2020
},
2121

22-
"require-dev" : {
22+
"require-dev" : {
2323
"jbzoo/toolbox-dev" : "^3.1.0"
2424
},
2525

26-
"autoload" : {
26+
"autoload" : {
2727
"psr-4" : {
2828
"JBZoo\\SimpleTypes\\" : "src"
2929
}
3030
},
3131

32-
"autoload-dev" : {
32+
"autoload-dev" : {
3333
"classmap" : ["tests"],
3434
"files" : ["tests/phpunit-functions.php"]
3535
},
3636

37-
"config" : {
37+
"config" : {
3838
"optimize-autoloader" : true
3939
},
4040

41-
"extra" : {
41+
"extra" : {
4242
"branch-alias" : {
4343
"dev-master" : "2.x-dev"
4444
}

0 commit comments

Comments
 (0)