Skip to content

Commit

Permalink
Update PHP deps (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
SmetDenis committed Apr 28, 2021
1 parent 8356eaa commit a892294
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
# @link https://github.com/JBZoo/Path
#

/.phan export-ignore
/build export-ignore
/tests export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/.phan.php export-ignore
/phpunit.xml.dist export-ignore
/Makefile export-ignore

Expand Down
89 changes: 72 additions & 17 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# @link https://github.com/JBZoo/Path
#

name: Continuous Integration
name: CI

on:
pull_request:
Expand All @@ -21,7 +21,7 @@ on:
branches:
- 'master'
schedule:
- cron: '15 */8 * * *'
- cron: '30 */8 * * *'

env:
COLUMNS: 120
Expand All @@ -35,38 +35,93 @@ jobs:
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
strategy:
matrix:
php-version: [ 7.2, 7.3, 7.4 ]
coverage: [ xdebug, none ]
experimental: [ false ]
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
composer_flags: [ "--prefer-lowest", "" ]
include:
- php-version: "8.0"
experimental: true
- php-version: "8.1"
experimental: true
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup PHP and composer
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
coverage: ${{ matrix.coverage }}
coverage: xdebug
tools: composer

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

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

- name: Upload Artifacts
uses: actions/upload-artifact@v2
with:
name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }}
path: build/


linters:
name: Linters
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
extensions: ast
tools: composer

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

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

- name: 📝 Build All Reports at Once
continue-on-error: ${{ matrix.experimental }}
- name: Upload Artifacts
uses: actions/upload-artifact@v2
with:
name: Linters - ${{ matrix.php-version }}
path: build/


report:
name: Reports
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
coverage: xdebug
tools: composer

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

- name: 📝 Build Reports
run: make report-all --no-print-directory

- name: Upload Artifacts
uses: actions/upload-artifact@v2
with:
name: Reports - ${{ matrix.php-version }}
path: build/
2 changes: 1 addition & 1 deletion .phan/config.php → .phan.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

declare(strict_types=1);

$default = include __DIR__ . '/../vendor/jbzoo/codestyle/src/phan/default.php';
$default = include __DIR__ . '/vendor/jbzoo/codestyle/src/phan/default.php';

$config = array_merge($default, [
'directory_list' => [
Expand Down
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,11 @@ php:
- 7.3
- 7.4
- 8.0
- nightly

jobs:
fast_finish: true
allow_failures:
- php: 8.0
- php: nightly

env:
matrix:
- JBZOO_COMPOSER_UPDATE_FLAGS="--prefer-lowest --prefer-stable"
- JBZOO_COMPOSER_UPDATE_FLAGS=""
- XDEBUG_OFF="yes"

before_script:
- composer self-update
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ endif
update: ##@Project Install/Update all 3rd party dependencies
$(call title,"Install/Update all 3rd party dependencies")
@echo "Composer flags: $(JBZOO_COMPOSER_UPDATE_FLAGS)"
@composer update $(JBZOO_COMPOSER_UPDATE_FLAGS)
@composer update --no-progress $(JBZOO_COMPOSER_UPDATE_FLAGS)


test-all: ##@Project Run all project tests at once
@make test
@make test-performance-travis
@make codestyle
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"require" : {
"php" : ">=7.2",

"jbzoo/utils" : "^4.4.0",
"jbzoo/data" : "^4.2.1"
"jbzoo/utils" : "^4.5.0",
"jbzoo/data" : "^4.3.0"
},

"require-dev" : {
"jbzoo/toolbox-dev" : "^2.12.0"
"jbzoo/toolbox-dev" : "^2.13.1"
},

"autoload" : {
Expand Down
2 changes: 1 addition & 1 deletion src/Path.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* @package JBZoo\Path
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
*/
class Path
final class Path
{
// Minimal alias name length.
public const MIN_ALIAS_LENGTH = 2;
Expand Down

0 comments on commit a892294

Please sign in to comment.