Skip to content

Commit

Permalink
Update PHP deps (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
SmetDenis committed Apr 28, 2021
1 parent 69e9b4d commit 5c5ef8d
Show file tree
Hide file tree
Showing 5 changed files with 146 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Expand Up @@ -11,13 +11,13 @@
# @link https://github.com/JBZoo/Assets
#

/.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
127 changes: 127 additions & 0 deletions .github/workflows/main.yml
@@ -0,0 +1,127 @@
#
# JBZoo Toolbox - Assets
#
# This file is part of the JBZoo Toolbox project.
# For the full copyright and license information, please view the LICENSE
# file that was distributed with this source code.
#
# @package Assets
# @license MIT
# @copyright Copyright (C) JBZoo.com, All rights reserved.
# @link https://github.com/JBZoo/Assets
#

name: CI

on:
pull_request:
branches:
- "*"
push:
branches:
- 'master'
schedule:
- cron: '30 */8 * * *'

env:
COLUMNS: 120
TERM_PROGRAM: Hyper

jobs:
phpunit:
name: PHPUnit
runs-on: ubuntu-latest
env:
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
strategy:
matrix:
php-version: [ 7.2, 7.3, 7.4, 8.0 ]
composer_flags: [ "--prefer-lowest", "" ]
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: 🧪 PHPUnit Tests
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
run: make codestyle --no-print-directory

- 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
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
7 changes: 0 additions & 7 deletions .travis.yml
Expand Up @@ -23,13 +23,6 @@ php:
- 7.3
- 7.4
- 8.0
- nightly

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

env:
matrix:
Expand Down
37 changes: 17 additions & 20 deletions composer.json
@@ -1,10 +1,10 @@
{
"name" : "jbzoo/assets",
"type" : "library",
"description" : "Manage any asset files (js, css, less) and their depending + compressing and merging",
"license" : "MIT",
"keywords" : ["javascript", "js", "css", "less", "assets", "compress"],
"authors" : [
"name" : "jbzoo/assets",
"type" : "library",
"description" : "Manage any asset files (js, css, less) and their depending + compressing and merging",
"license" : "MIT",
"keywords" : ["javascript", "js", "css", "less", "assets", "compress"],
"authors" : [
{
"name" : "Denis Smetannikov",
"email" : "admin@jbzoo.com",
Expand All @@ -16,38 +16,35 @@
}
],

"require" : {
"require" : {
"php" : ">=7.2",

"jbzoo/utils" : "^4.4.0",
"jbzoo/path" : "^3.1.0",
"jbzoo/less" : "^4.1.0",
"jbzoo/data" : "^4.2.1"
"jbzoo/utils" : "^4.5.0",
"jbzoo/path" : "^3.2.0",
"jbzoo/less" : "^4.2.0",
"jbzoo/data" : "^4.3.0"
},

"require-dev" : {
"jbzoo/toolbox-dev" : "^2.11.0",
"require-dev" : {
"jbzoo/toolbox-dev" : "^2.13.1",
"symfony/filesystem" : "^5.2.3"
},

"autoload" : {
"autoload" : {
"psr-4" : {
"JBZoo\\Assets\\" : "src"
}
},

"minimum-stability" : "dev",
"prefer-stable" : true,

"autoload-dev" : {
"autoload-dev" : {
"classmap" : ["tests"]
},

"config" : {
"config" : {
"optimize-autoloader" : true
},

"extra" : {
"extra" : {
"branch-alias" : {
"dev-master" : "4.x-dev"
}
Expand Down

0 comments on commit 5c5ef8d

Please sign in to comment.