8000 Update PHP deps (#6) · JBZoo/Mermaid-PHP@d461d30 · GitHub
[go: up one dir, main page]
Skip to content

Commit d461d30

Browse files
SmetDenisSmetDenis
authored
Update PHP deps (#6)
1 parent 42fbb12 commit d461d30

File tree

5 files changed

+155
-25
lines changed

5 files changed

+155
-25
lines changed

‎.gitattributes

+11-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,14 @@
1111
# @link https://github.com/JBZoo/Mermaid-PHP
1212
#
1313

14-
* text eol=lf
14+
/.github export-ignore
15+
/build export-ignore
16+
/tests export-ignore
17+
/.editorconfig export-ignore
18+
/.gitattributes export-ignore
19+
/.gitignore export-ignore
20+
/.travis.yml export-ignore
21+
/.phan.php export-ignore
22+
/Makefile export-ignore
23+
24+
* text eol=lf

‎.github/workflows/main.yml

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
#
2+
# JBZoo Toolbox - Mermaid-PHP
3+
#
4+
# This file is part of the JBZoo Toolbox project.
5+
# For the full copyright and license information, please view the LICENSE
6+
# file that was distributed with this source code.
7+
#
8+
# @package Mermaid-PHP
9+
# @license MIT
10+
# @copyright Copyright (C) JBZoo.com, All rights reserved.
11+
# @link https://github.com/JBZoo/Mermaid-PHP
12+
#
13+
14+
name: CI
15+
16+
on:
17+
pull_request:
18+
branches:
19+
- "*"
20+
push:
21+
branches:
22+
- 'master'
23+
schedule:
24+
- cron: '20 */8 * * *'
25+
26+
env:
27+
COLUMNS: 120
28+
TERM_PROGRAM: Hyper
29+
30+
jobs:
31+
phpunit:
32+
name: PHPUnit
33+
runs-on: ubuntu-latest
34+
env:
35+
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
36+
strategy:
37+
matrix:
38+
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
39+
composer_flags: [ "--prefer-lowest", "" ]
40+
steps:
41+
- name: Checkout code
42+
uses: actions/checkout@v2
43+
with:
44+
fetch-depth: 0
45+
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 - ${{ 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+
88+
- name: 👍 Code Quality
89+
run: make codestyle --no-print-directory
90+
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
121+
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

+1-1
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

+3-7
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

+13-16
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,40 @@
11
{
2-
"name" : "jbzoo/mermaid-php",
3-
"type" : "library",
4-
"description" : "Generate diagrams and flowcharts with the help of the mermaid script language",
5-
"license" : "MIT",
6-
"keywords" : ["mermaid", "mermaid-js", "diagrams", "flowcharts"],
7-
"authors" : [
2+
"name" : "jbzoo/mermaid-php",
3+
"type" : "library",
4+
"description" : "Generate diagrams and flowcharts with the help of the mermaid script language",
5+
"license" : "MIT",
6+
"keywords" : ["mermaid", "mermaid-js", "diagrams", "flowcharts"],
7+
"authors" : [
88
{
99
"name" : "Denis Smetannikov",
1010
"email" : "admin@jbzoo.com",
1111
"role" : "lead"
1212
}
1313
],
14-
"require" : {
14+
"require" : {
1515
"php" : ">=7.2",
1616
"ext-json" : "*"
1717
},
1818

19-
"require-dev" : {
20-
"jbzoo/toolbox-dev" : "^2.9.2"
19+
"require-dev" : {
20+
"jbzoo/toolbox-dev" : "^2.13.1"
2121
},
2222

23-
"autoload" : {
23+
"autoload" : {
2424
"psr-4" : {
2525
"JBZoo\\MermaidPHP\\" : "src"
2626
}
2727
},
2828

29-
"autoload-dev" : {
29+
"autoload-dev" : {
3030
"classmap" : ["tests"]
3131
},
3232

33-
"minimum-stability" : "dev",
34-
"prefer-stable" : true,
35-
36-
"config" : {
33+
"config" : {
3734
"optimize-autoloader" : true
3835
},
3936

40-
"extra" : {
37+
"extra" : {
4138
"branch-alias" : {
4239
"dev-master" : "2.x-dev"
4340
}

0 commit comments

Comments
 (0)
0