Skip to content

Commit 08fb3ab

Browse files
SmetDenisSmetDenis
authored
Bump PHP version (#1)
1 parent 4919f5d commit 08fb3ab

15 files changed

Lines changed: 161 additions & 216 deletions

‎.gitattributes‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
#
2-
# JBZoo - Toolbox
2+
# JBZoo Toolbox - Toolbox.
33
#
4-
# This file is part of the JBZoo project.
4+
# This file is part of the JBZoo Toolbox project.
55
# For the full copyright and license information, please view the LICENSE
66
# file that was distributed with this source code.
77
#
8-
# @package Toolbox
98
# @license MIT
109
# @copyright Copyright (C) JBZoo.com, All rights reserved.
11-
# @link https://github.com/JBZoo/Toolbox
10+
# @see https://github.com/JBZoo/Toolbox
1211
#
1312

1413
/.github export-ignore

‎.github/workflows/main.yml‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
#
2-
# JBZoo - Toolbox
2+
# JBZoo Toolbox - Toolbox.
33
#
4-
# This file is part of the JBZoo project.
4+
# This file is part of the JBZoo Toolbox project.
55
# For the full copyright and license information, please view the LICENSE
66
# file that was distributed with this source code.
77
#
8-
# @package Toolbox
98
# @license MIT
109
# @copyright Copyright (C) JBZoo.com, All rights reserved.
11-
# @link https://github.com/JBZoo/Toolbox
10+
# @see https://github.com/JBZoo/Toolbox
1211
#
1312

1413
name: CI
@@ -21,7 +20,7 @@ on:
2120
branches:
2221
- 'master'
2322
schedule:
24-
- cron: '45 */8 * * *'
23+
- cron: '30 */8 * * *'
2524

2625
env:
2726
COLUMNS: 120
@@ -35,29 +34,39 @@ jobs:
3534
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
3635
strategy:
3736
matrix:
38-
php-version: [ 7.4, 8.0, 8.1 ]
37+
php-version: [ 8.1, 8.2 ]
38+
coverage: [ xdebug, none ]
3939
composer_flags: [ "--prefer-lowest", "" ]
4040
steps:
4141
- name: Checkout code
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v3
4343
with:
4444
fetch-depth: 0
4545

4646
- name: Setup PHP
4747
uses: shivammathur/setup-php@v2
4848
with:
4949
php-version: ${{ matrix.php-version }}
50-
coverage: xdebug
50+
coverage: ${{ matrix.coverage }}
5151
tools: composer
52+
extensions: ast
5253

5354
- name: Build the Project
5455
run: make update --no-print-directory
5556

5657
- name: 🧪 PHPUnit Tests
5758
run: make test --no-print-directory
5859

60+
- name: Uploading coverage to coveralls
61+
if: ${{ matrix.coverage == 'xdebug' }}
62+
continue-on-error: true
63+
env:
64+
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
65+
run: make report-coveralls --no-print-directory || true
66+
5967
- name: Upload Artifacts
60-
uses: actions/upload-artifact@v2
68+
uses: actions/upload-artifact@v3
69+
continue-on-error: true
6170
with:
6271
name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }}
6372
path: build/
@@ -68,29 +77,30 @@ jobs:
6877
runs-on: ubuntu-latest
6978
strategy:
7079
matrix:
71-
php-version: [ 7.4, 8.0, 8.1 ]
80+
php-version: [ 8.1, 8.2 ]
7281
steps:
7382
- name: Checkout code
74-
uses: actions/checkout@v2
83+
uses: actions/checkout@v3
7584
with:
7685
fetch-depth: 0
7786

7887
- name: Setup PHP
7988
uses: shivammathur/setup-php@v2
8089
with:
8190
php-version: ${{ matrix.php-version }}
82-
extensions: ast
91+
coverage: none
8392
tools: composer
93+
extensions: ast
8494

8595
- name: Build the Project
8696
run: make update --no-print-directory
8797

8898
- name: 👍 Code Quality
89-
continue-on-error: true
9099
run: make codestyle --no-print-directory
91100

92101
- name: Upload Artifacts
93-
uses: actions/upload-artifact@v2
102+
uses: actions/upload-artifact@v3
103+
continue-on-error: true
94104
with:
95105
name: Linters - ${{ matrix.php-version }}
96106
path: build/
@@ -101,10 +111,10 @@ jobs:
101111
runs-on: ubuntu-latest
102112
strategy:
103113
matrix:
104-
php-version: [ 7.4, 8.0, 8.1 ]
114+
php-version: [ 8.1, 8.2 ]
105115
steps:
106116
- name: Checkout code
107-
uses: actions/checkout@v2
117+
uses: actions/checkout@v3
108118
with:
109119
fetch-depth: 0
110120

@@ -114,6 +124,7 @@ jobs:
114124
php-version: ${{ matrix.php-version }}
115125
coverage: xdebug
116126
tools: composer
127+
extensions: ast
117128

118129
- name: Build the Project
119130
run: make update --no-print-directory
@@ -122,7 +133,8 @@ jobs:
122133
run: make report-all --no-print-directory
123134

124135
- name: Upload Artifacts
125-
uses: actions/upload-artifact@v2
136+
uses: actions/upload-artifact@v3
137+
continue-on-error: true
126138
with:
127139
name: Reports - ${{ matrix.php-version }}
128140
path: build/

‎.gitignore‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
#
2-
# JBZoo - Toolbox
2+
# JBZoo Toolbox - Toolbox.
33
#
4-
# This file is part of the JBZoo project.
4+
# This file is part of the JBZoo Toolbox project.
55
# For the full copyright and license information, please view the LICENSE
66
# file that was distributed with this source code.
77
#
8-
# @package Toolbox
98
# @license MIT
109
# @copyright Copyright (C) JBZoo.com, All rights reserved.
11-
# @link https://github.com/JBZoo/Toolbox
10+
# @see https://github.com/JBZoo/Toolbox
1211
#
1312

1413
.idea

‎.phan.php‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
<?php
22

33
/**
4-
* JBZoo - Toolbox
4+
* JBZoo Toolbox - Toolbox.
55
*
6-
* This file is part of the JBZoo project.
6+
* This file is part of the JBZoo Toolbox project.
77
* For the full copyright and license information, please view the LICENSE
88
* file that was distributed with this source code.
99
*
10-
* @package Toolbox
1110
* @license MIT
1211
* @copyright Copyright (C) JBZoo.com, All rights reserved.
13-
* @link https://github.com/JBZoo/Toolbox
12+
* @see https://github.com/JBZoo/Toolbox
1413
*/
1514

1615
declare(strict_types=1);
1716

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

20-
$index = array_search('UnusedSuppressionPlugin', $default['plugins'], true);
19+
$index = \array_search('UnusedSuppressionPlugin', $default['plugins'], true);
2120
unset($default['plugins'][$index]);
2221

23-
return array_merge($default, [
22+
return \array_merge($default, [
2423
'file_list' => [
2524
'src/phpunit/functions/defines.php',
2625
'src/phpunit/functions/aliases.php',
27-
'src/phpunit/functions/tools.php'
26+
'src/phpunit/functions/tools.php',
2827
],
2928

3029
'directory_list' => [
@@ -43,19 +42,23 @@
4342
'vendor/wikimedia/less.php',
4443

4544
// utils
45+
'vendor/bluepsyduck/symfony-process-manager/src',
4646
'vendor/symfony/console',
4747
'vendor/symfony/process',
4848

4949
// phpunit
50-
'vendor/phpunit/phpunit/src',
5150
'vendor/phpunit/php-code-coverage/src',
52-
'vendor/ulrichsg/getopt-php/src',
51+
'vendor/phpunit/php-file-iterator/src',
52+
'vendor/phpunit/phpunit/src',
5353
'vendor/symfony/finder',
54+
'vendor/ulrichsg/getopt-php/src',
5455

5556
// composer-diff
5657
'vendor/composer/semver/src',
5758

5859
// codestyle
59-
'vendor/phan/phan/src'
60-
]
60+
'vendor/friendsofphp/php-cs-fixer/src',
61+
'vendor/kubawerlos/php-cs-fixer-custom-fixers/src',
62+
'vendor/phan/phan/src',
63+
],
6164
]);

‎Makefile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
#
2-
# JBZoo - Toolbox
2+
# JBZoo Toolbox - Toolbox.
33
#
4-
# This file is part of the JBZoo project.
4+
# This file is part of the JBZoo Toolbox project.
55
# For the full copyright and license information, please view the LICENSE
66
# file that was distributed with this source code.
77
#
8-
# @package Toolbox
98
# @license MIT
109
# @copyright Copyright (C) JBZoo.com, All rights reserved.
11-
# @link https://github.com/JBZoo/Toolbox
10+
# @see https://github.com/JBZoo/Toolbox
1211
#
1312

1413
ifneq (, $(wildcard ./vendor/jbzoo/codestyle/src/init.Makefile))
@@ -25,21 +24,22 @@ update: ##@Project Install/Update all 3rd party dependencies
2524
@mkdir `pwd`/src
2625
@touch `pwd`/src/.gitkeep
2726
@cp -r `pwd`/vendor/jbzoo/assets/src `pwd`/src/assets
27+
@cp -r `pwd`/vendor/jbzoo/ci-report-converter/src `pwd`/src/ci-report-converter
28+
@cp -r `pwd`/vendor/jbzoo/cli/src `pwd`/src/cli
29+
@cp -r `pwd`/vendor/jbzoo/codestyle/src `pwd`/src/codestyle
30+
@cp -r `pwd`/vendor/jbzoo/composer-diff/src `pwd`/src/composer-diff
31+
@cp -r `pwd`/vendor/jbzoo/composer-graph/src `pwd`/src/composer-graph
2832
@cp -r `pwd`/vendor/jbzoo/data/src `pwd`/src/data
2933
@cp -r `pwd`/vendor/jbzoo/event/src `pwd`/src/event
3034
@cp -r `pwd`/vendor/jbzoo/http-client/src `pwd`/src/http-client
3135
@cp -r `pwd`/vendor/jbzoo/image/src `pwd`/src/image
3236
@cp -r `pwd`/vendor/jbzoo/less/src `pwd`/src/less
37+
@cp -r `pwd`/vendor/jbzoo/markdown/src `pwd`/src/markdown
3338
@cp -r `pwd`/vendor/jbzoo/mermaid-php/src `pwd`/src/mermaid-php
3439
@cp -r `pwd`/vendor/jbzoo/path/src `pwd`/src/path
35-
@cp -r `pwd`/vendor/jbzoo/utils/src `pwd`/src/utils
36-
@cp -r `pwd`/vendor/jbzoo/retry/src `pwd`/src/retry
37-
@cp -r `pwd`/vendor/jbzoo/composer-graph/src `pwd`/src/composer-graph
38-
@cp -r `pwd`/vendor/jbzoo/composer-diff/src `pwd`/src/composer-diff
39-
@cp -r `pwd`/vendor/jbzoo/codestyle/src `pwd`/src/codestyle
4040
@cp -r `pwd`/vendor/jbzoo/phpunit/src `pwd`/src/phpunit
41-
@cp -r `pwd`/vendor/jbzoo/ci-report-converter/src `pwd`/src/ci-report-converter
42-
@cp -r `pwd`/vendor/jbzoo/markdown/src `pwd`/src/markdown
41+
@cp -r `pwd`/vendor/jbzoo/retry/src `pwd`/src/retry
42+
@cp -r `pwd`/vendor/jbzoo/utils/src `pwd`/src/utils
4343

4444

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

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# JBZoo / Toolbox
22

3-
[![Psalm Coverage](https://shepherd.dev/github/JBZoo/Toolbox/coverage.svg)](https://shepherd.dev/github/JBZoo/Toolbox) [![PHP Strict Types](https://img.shields.io/badge/strict__types-%3D1-brightgreen)](https://www.php.net/manual/en/language.types.declarations.php#language.types.declarations.strict)
4-
[![Stable Version](https://poser.pugx.org/jbzoo/toolbox/version)](https://packagist.org/packages/jbzoo/toolbox) [![Latest Unstable Version](https://poser.pugx.org/jbzoo/toolbox/v/unstable)](https://packagist.org/packages/jbzoo/toolbox) [![Dependents](https://poser.pugx.org/jbzoo/toolbox/dependents)](https://packagist.org/packages/jbzoo/toolbox/dependents?order_by=downloads) [![GitHub Issues](https://img.shields.io/github/issues/jbzoo/toolbox)](https://github.com/JBZoo/Toolbox/issues) [![Total Downloads](https://poser.pugx.org/jbzoo/toolbox/downloads)](https://packagist.org/packages/jbzoo/toolbox/stats) [![GitHub License](https://img.shields.io/github/license/jbzoo/toolbox)](https://github.com/JBZoo/Toolbox/blob/master/LICENSE)
5-
6-
3+
[![CI](https://github.com/JBZoo/Toolbox/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/JBZoo/Toolbox/actions/workflows/main.yml?query=branch%3Amaster) [![Coverage Status](https://coveralls.io/repos/github/JBZoo/Toolbox/badge.svg?branch=master)](https://coveralls.io/github/JBZoo/Toolbox?branch=master) [![Psalm Coverage](https://shepherd.dev/github/JBZoo/Toolbox/coverage.svg)](https://shepherd.dev/github/JBZoo/Toolbox) [![Psalm Level](https://shepherd.dev/github/JBZoo/Toolbox/level.svg)](https://shepherd.dev/github/JBZoo/Toolbox) [![CodeFactor](https://www.codefactor.io/repository/github/jbzoo/toolbox/badge)](https://www.codefactor.io/repository/github/jbzoo/toolbox/issues)
4+
[![Stable Version](https://poser.pugx.org/jbzoo/toolbox/version)](https://packagist.org/packages/jbzoo/toolbox/) [![Total Downloads](https://poser.pugx.org/jbzoo/toolbox/downloads)](https://packagist.org/packages/jbzoo/toolbox/stats) [![Dependents](https://poser.pugx.org/jbzoo/toolbox/dependents)](https://packagist.org/packages/jbzoo/toolbox/dependents?order_by=downloads) [![Visitors](https://visitor-badge.glitch.me/badge?page_id=jbzoo.toolbox)]() [![GitHub License](https://img.shields.io/github/license/jbzoo/toolbox)](https://github.com/JBZoo/Toolbox/blob/master/LICENSE)
75

86

97

0 commit comments

Comments
 (0)