Skip to content

Commit ad44e40

Browse files
SmetDenisSmetDenis
authored
Update PHP deps (#7)
* Update PHP deps * Fixes in GitHub CI
1 parent 329386a commit ad44e40

File tree

6 files changed

+564
-813
lines changed

6 files changed

+564
-813
lines changed

‎.github/workflows/main.yml‎

Lines changed: 86 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,80 +18,142 @@ on:
1818
branches:
1919
- "*"
2020
push:
21-
branches: [ master ]
21+
branches:
22+
- 'master'
2223
schedule:
23-
- cron: '30 */8 * * *'
24+
- cron: '15 */8 * * *'
2425

2526
env:
2627
COLUMNS: 120
2728
TERM_PROGRAM: Hyper
2829

2930
jobs:
30-
phpunit:
31-
name: PHPUnit
31+
phpunit-update:
32+
name: PHPUnit (update)
3233
runs-on: ubuntu-latest
3334
env:
3435
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
3536
strategy:
3637
matrix:
37-
php-version: [ 7.2, 7.3, 7.4 ]
38-
experimental: [ false ]
38+
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
3939
composer_flags: [ "--prefer-lowest", "" ]
40-
include:
41-
- php-version: "8.0"
42-
experimental: true
43-
- php-version: "8.1"
44-
experimental: true
4540
steps:
4641
- name: Checkout code
4742
uses: actions/checkout@v2
4843
with:
4944
fetch-depth: 0
5045

51-
- name: Setup PHP and composer
46+
- name: Setup PHP
47+
uses: shivammathur/setup-php@v2
48+
with:
49+
php-version: ${{ matrix.php-version }}
50+
coverage: xdebug
51+
tools: composer
52+
53+
- name: Build the Project
54+
run: make update --no-print-directory
55+
56+
- name: 🧪 PHPUnit Tests
57+
run: make test --no-print-directory
58+
59+
- name: Upload Artifacts
60+
uses: actions/upload-artifact@v2
61+
with:
62+
name: PHPUnit (update) - ${{ matrix.php-version }} - ${{ matrix.coverage }} - ${{ matrix.build-way }}
63+
path: build/
64+
65+
66+
phpunit-build:
67+
name: PHPUnit (build)
68+
runs-on: ubuntu-latest
69+
strategy:
70+
matrix:
71+
php-version: [ 7.2, 7.3, 7.4 ]
72+
steps:
73+
- name: Checkout code
74+
uses: actions/checkout@v2
75+
with:
76+
fetch-depth: 0
77+
78+
- name: Setup PHP
5279
uses: shivammathur/setup-php@v2
5380
with:
5481
php-version: ${{ matrix.php-version }}
5582
coverage: xdebug
5683
tools: composer
5784

5885
- name: Build the Project
59-
continue-on-error: ${{ matrix.experimental }}
6086
run: make build --no-print-directory
6187

6288
- name: 🧪 PHPUnit Tests
63-
continue-on-error: ${{ matrix.experimental }}
6489
run: make test --no-print-directory
6590

91+
- name: Upload Artifacts
92+
uses: actions/upload-artifact@v2
93+
with:
94+
name: PHPUnit (build) - ${{ matrix.php-version }} - ${{ matrix.coverage }} - ${{ matrix.build-way }}
95+
path: build/
96+
6697

6798
linters:
6899
name: Linters
69100
runs-on: ubuntu-latest
70101
strategy:
71102
matrix:
72-
php-version: [ 7.2, 7.3, 7.4 ]
73-
experimental: [ false ]
74-
include:
75-
- php-version: "8.0"
76-
experimental: true
77-
- php-version: "8.1"
78-
experimental: true
103+
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
79104
steps:
80105
- name: Checkout code
81106
uses: actions/checkout@v2
82107
with:
83108
fetch-depth: 0
84109

85-
- name: Setup PHP and composer
110+
- name: Setup PHP
86111
uses: shivammathur/setup-php@v2
87112
with:
88113
php-version: ${{ matrix.php-version }}
114+
extensions: ast
89115
tools: composer
90116

91117
- name: Build the Project
92-
continue-on-error: ${{ matrix.experimental }}
93118
run: make update --no-print-directory
94119

95120
- name: 👍 Code Quality
96-
continue-on-error: ${{ matrix.experimental }}
97121
run: make codestyle --no-print-directory
122+
123+
- name: Upload Artifacts
124+
uses: actions/upload-artifact@v2
125+
with:
126+
name: Linters - ${{ matrix.php-version }}
127+
path: build/
128+
129+
130+
report:
131+
name: Reports
132+
runs-on: ubuntu-latest
133+
strategy:
134+
matrix:
135+
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
136+
steps:
137+
- name: Checkout code
138+
uses: actions/checkout@v2
139+
with:
140+
fetch-depth: 0
141+
142+
- name: Setup PHP
143+
uses: shivammathur/setup-php@v2
144+
with:
145+
php-version: ${{ matrix.php-version }}
146+
coverage: xdebug
147+
tools: composer
148+
149+
- name: Build the Project
150+
run: make update --no-print-directory
151+
152+
- name: 📝 Build Reports
153+
run: make report-all --no-print-directory
154+
155+
- name: Upload Artifacts
156+
uses: actions/upload-artifact@v2
157+
with:
158+
name: Reports - ${{ matrix.php-version }}
159+
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: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,9 @@ php:
2020
- 7.3
2121
- 7.4
2222
- 8.0
23-
- nightly
2423

25-
jobs:
26-
fast_finish: true
27-
allow_failures:
28-
- php: 8.0
29-
- php: nightly
24+
git:
25+
depth: false
3026

3127
before_script:
3228
- composer self-update

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ update: ##@Project Install/Update all 3rd party dependencies
2828
$(call title,"Install/Update all 3rd party dependencies")
2929
@echo "Composer flags: $(JBZOO_COMPOSER_UPDATE_FLAGS)"
3030
@composer update $(JBZOO_COMPOSER_UPDATE_FLAGS)
31+
@make build-phar
3132

3233

3334
test-all: ##@Project Run all project tests at once

‎composer.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name" : "jbzoo/composer-graph",
33
"type" : "library",
4-
"description" : "Render composer.json dependencies ad graph",
4+
"description" : "Render composer.json + composer.lock dependencies graph",
55
"license" : "MIT",
66
"keywords" : [
77
"composer", "diagram", "jbzoo", "dependencies", "composer-dependency", "composer-packages", "mermaidjs",
@@ -19,15 +19,15 @@
1919
"require" : {
2020
"php" : ">=7.2",
2121

22-
"jbzoo/data" : "^4.2.1",
23-
"jbzoo/mermaid-php" : "^2.2.0",
24-
"jbzoo/utils" : "^4.4.0",
22+
"jbzoo/data" : "^4.3.0",
23+
"jbzoo/mermaid-php" : "^2.3.0",
24+
"jbzoo/utils" : "^4.5.0",
2525

2626
"symfony/console" : "^4.4|^5.0"
2727
},
2828

2929
"require-dev" : {
30-
"jbzoo/toolbox-dev" : "^2.12.0",
30+
"jbzoo/toolbox-dev" : "^2.13.1",
3131
"symfony/process" : "^4.4|^5.0"
3232
},
3333

0 commit comments

Comments
 (0)