Skip to content

Commit bef53f1

Browse files
SmetDenisSmetDenis
authored
Update PHP deps (#6)
1 parent 1623fe6 commit bef53f1

File tree

5 files changed

+88
-40
lines changed

5 files changed

+88
-40
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: 70 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,53 +21,107 @@ 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

59+
- name: Upload Artifacts
60+
uses: actions/upload-artifact@v2
61+
with:
62+
name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }}
63+
path: build/
64+
65+
66+
linters:
67+
name: Linters
68+
runs-on: ubuntu-latest
69+
strategy:
70+
matrix:
71+
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
72+
steps:
73+
- name: Checkout code
74+
uses: actions/checkout@v2
75+
with:
76+
fetch-depth: 0
77+
78+
- name: Setup PHP
79+
uses: shivammathur/setup-php@v2
80+
with:
81+
php-version: ${{ matrix.php-version }}
82+
extensions: ast
83+
tools: composer
84+
85+
- name: Build the Project
86+
run: make update --no-print-directory
87+
6788
- name: 👍 Code Quality
68-
continue-on-error: ${{ matrix.experimental }}
6989
run: make codestyle --no-print-directory
7090

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

‎.travis.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,14 @@ language: php
1515
os: linux
1616
dist: xenial
1717

18+
git:
19+
depth: false
20+
1821
php:
1922
- 7.2
2023
- 7.3
2124
- 7.4
2225
- 8.0
23-
- nightly
24-
25-
jobs:
26-
fast_finish: true
27-
allow_failures:
28-
- php: 8.0
29-
- php: nightly
3026

3127
env:
3228
matrix:

‎composer.json‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +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" : "[email protected]",
1414
"role" : "lead"
1515
}
1616
],
1717

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

22-
"require-dev" : {
23-
"jbzoo/toolbox-dev" : "^2.11.0",
24-
"jbzoo/utils" : "^4.4.0"
22+
"require-dev" : {
23+
"jbzoo/toolbox-dev" : "^2.13.1"
2524
},
2625

27-
"autoload" : {
26+
"autoload" : {
2827
"psr-4" : {
2928
"JBZoo\\SimpleTypes\\" : "src"
3029
}
3130
},
3231

33-
"autoload-dev" : {
32+
"autoload-dev" : {
3433
"classmap" : ["tests"],
3534
"files" : ["tests/phpunit-functions.php"]
3635
},
3736

38-
"config" : {
37+
"config" : {
3938
"optimize-autoloader" : true
4039
},
4140

42-
"extra" : {
41+
"extra" : {
4342
"branch-alias" : {
4443
"dev-master" : "2.x-dev"
4544
}

0 commit comments

Comments
 (0)