Skip to content

Commit

Permalink
Bump PHP version & dependencies (#19)
Browse files Browse the repository at this point in the history
  • Loading branch information
SmetDenis committed Mar 6, 2023
1 parent 3fe7321 commit e9ef60d
Show file tree
Hide file tree
Showing 33 changed files with 424 additions and 758 deletions.
5 changes: 2 additions & 3 deletions .editorconfig
@@ -1,14 +1,13 @@
#
# JBZoo Toolbox - Data
# JBZoo Toolbox - Data.
#
# 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 Data
# @license MIT
# @copyright Copyright (C) JBZoo.com, All rights reserved.
# @link https://github.com/JBZoo/Data
# @see https://github.com/JBZoo/Data
#

# EditorConfig is awesome: http://EditorConfig.org
Expand Down
5 changes: 2 additions & 3 deletions .gitattributes
@@ -1,14 +1,13 @@
#
# JBZoo Toolbox - Data
# JBZoo Toolbox - Data.
#
# 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 Data
# @license MIT
# @copyright Copyright (C) JBZoo.com, All rights reserved.
# @link https://github.com/JBZoo/Data
# @see https://github.com/JBZoo/Data
#

/.github export-ignore
Expand Down
33 changes: 18 additions & 15 deletions .github/workflows/main.yml
@@ -1,14 +1,13 @@
#
# JBZoo Toolbox - Data
# JBZoo Toolbox - Data.
#
# 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 Data
# @license MIT
# @copyright Copyright (C) JBZoo.com, All rights reserved.
# @link https://github.com/JBZoo/Data
# @see https://github.com/JBZoo/Data
#

name: CI
Expand All @@ -21,7 +20,7 @@ on:
branches:
- 'master'
schedule:
- cron: '55 */8 * * *'
- cron: '38 */8 * * *'

env:
COLUMNS: 120
Expand All @@ -35,12 +34,12 @@ jobs:
JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
strategy:
matrix:
php-version: [ 7.4, 8.0, 8.1 ]
php-version: [ 8.1, 8.2 ]
coverage: [ xdebug, none ]
composer_flags: [ "--prefer-lowest", "" ]
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand All @@ -50,6 +49,7 @@ jobs:
php-version: ${{ matrix.php-version }}
coverage: ${{ matrix.coverage }}
tools: composer
extensions: ast

- name: Build the Project
run: make update --no-print-directory
Expand All @@ -62,10 +62,10 @@ jobs:
continue-on-error: true
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: make report-coveralls --no-print-directory
run: make report-coveralls --no-print-directory || true

- name: Upload Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
continue-on-error: true
with:
name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }}
Expand All @@ -77,19 +77,20 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ 7.4, 8.0, 8.1 ]
php-version: [ 8.1, 8.2 ]
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

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

- name: Build the Project
run: make update --no-print-directory
Expand All @@ -98,7 +99,7 @@ jobs:
run: make codestyle --no-print-directory

- name: Upload Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
continue-on-error: true
with:
name: Linters - ${{ matrix.php-version }}
Expand All @@ -110,18 +111,20 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ 7.4, 8.0, 8.1 ]
php-version: [ 8.1, 8.2 ]
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

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

- name: Build the Project
run: make update --no-print-directory
Expand All @@ -130,7 +133,7 @@ jobs:
run: make report-all --no-print-directory

- name: Upload Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
continue-on-error: true
with:
name: Reports - ${{ matrix.php-version }}
Expand Down
5 changes: 2 additions & 3 deletions .gitignore
@@ -1,14 +1,13 @@
#
# JBZoo Toolbox - Data
# JBZoo Toolbox - Data.
#
# 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 Data
# @license MIT
# @copyright Copyright (C) JBZoo.com, All rights reserved.
# @link https://github.com/JBZoo/Data
# @see https://github.com/JBZoo/Data
#

.idea
Expand Down
15 changes: 7 additions & 8 deletions .phan.php
@@ -1,25 +1,24 @@
<?php

/**
* JBZoo Toolbox - Data
* JBZoo Toolbox - Data.
*
* 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 Data
* @license MIT
* @copyright Copyright (C) JBZoo.com, All rights reserved.
* @link https://github.com/JBZoo/Data
* @see https://github.com/JBZoo/Data
*/

declare(strict_types=1);

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

$config = array_merge($default, [
$config = \array_merge($default, [
'file_list' => [
'src/functions.php'
'src/functions.php',
],

'directory_list' => [
Expand All @@ -29,13 +28,13 @@
// Libs
'vendor/jbzoo/utils',
'vendor/symfony/yaml',
'vendor/symfony/polyfill-php81'
]
'vendor/symfony/polyfill-php81',
],
]);

$config['plugins'][] = 'NotFullyQualifiedUsagePlugin';

$configIndex = array_search('UnusedSuppressionPlugin', $config['plugins'], true);
$configIndex = \array_search('UnusedSuppressionPlugin', $config['plugins'], true);
if ($configIndex !== false) {
unset($config['plugins'][$configIndex]);
}
Expand Down
6 changes: 3 additions & 3 deletions Makefile
@@ -1,16 +1,16 @@
#
# JBZoo Toolbox - Data
# JBZoo Toolbox - Data.
#
# 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 Data
# @license MIT
# @copyright Copyright (C) JBZoo.com, All rights reserved.
# @link https://github.com/JBZoo/Data
# @see https://github.com/JBZoo/Data
#


ifneq (, $(wildcard ./vendor/jbzoo/codestyle/src/init.Makefile))
include ./vendor/jbzoo/codestyle/src/init.Makefile
endif
Expand Down
4 changes: 2 additions & 2 deletions README.md
@@ -1,7 +1,7 @@
# JBZoo / Data

[![Coverage Status](https://coveralls.io/repos/JBZoo/Data/badge.svg)](https://coveralls.io/github/JBZoo/Data) [![Psalm Coverage](https://shepherd.dev/github/JBZoo/Data/coverage.svg)](https://shepherd.dev/github/JBZoo/Data) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/jbzoo/data/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/jbzoo/data/?branch=master) [![CodeFactor](https://www.codefactor.io/repository/github/jbzoo/data/badge)](https://www.codefactor.io/repository/github/jbzoo/data/issues) [![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)
[![Stable Version](https://poser.pugx.org/jbzoo/data/version)](https://packagist.org/packages/jbzoo/data) [![Latest Unstable Version](https://poser.pugx.org/jbzoo/data/v/unstable)](https://packagist.org/packages/jbzoo/data) [![Dependents](https://poser.pugx.org/jbzoo/data/dependents)](https://packagist.org/packages/jbzoo/data/dependents?order_by=downloads) [![GitHub Issues](https://img.shields.io/github/issues/jbzoo/data)](https://github.com/JBZoo/Data/issues) [![Total Downloads](https://poser.pugx.org/jbzoo/data/downloads)](https://packagist.org/packages/jbzoo/data/stats) [![GitHub License](https://img.shields.io/github/license/jbzoo/data)](https://github.com/JBZoo/Data/blob/master/LICENSE)
[![CI](https://github.com/JBZoo/Data/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/JBZoo/Data/actions/workflows/main.yml?query=branch%3Amaster) [![Coverage Status](https://coveralls.io/repos/github/JBZoo/Data/badge.svg?branch=master)](https://coveralls.io/github/JBZoo/Data?branch=master) [![Psalm Coverage](https://shepherd.dev/github/JBZoo/Data/coverage.svg)](https://shepherd.dev/github/JBZoo/Data) [![Psalm Level](https://shepherd.dev/github/JBZoo/Data/level.svg)](https://shepherd.dev/github/JBZoo/Data) [![CodeFactor](https://www.codefactor.io/repository/github/jbzoo/data/badge)](https://www.codefactor.io/repository/github/jbzoo/data/issues)
[![Stable Version](https://poser.pugx.org/jbzoo/data/version)](https://packagist.org/packages/jbzoo/data/) [![Total Downloads](https://poser.pugx.org/jbzoo/data/downloads)](https://packagist.org/packages/jbzoo/data/stats) [![Dependents](https://poser.pugx.org/jbzoo/data/dependents)](https://packagist.org/packages/jbzoo/data/dependents?order_by=downloads) [![Visitors](https://visitor-badge.glitch.me/badge?page_id=jbzoo.data)]() [![GitHub License](https://img.shields.io/github/license/jbzoo/data)](https://github.com/JBZoo/Data/blob/master/LICENSE)


An extended version of the [ArrayObject](http://php.net/manual/en/class.arrayobject.php) object for working with system settings or just for working with data arrays.
Expand Down
5 changes: 2 additions & 3 deletions phpunit.xml.dist
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
JBZoo Toolbox - Data
JBZoo Toolbox - Data.
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 Data
@license MIT
@copyright Copyright (C) JBZoo.com, All rights reserved.
@link https://github.com/JBZoo/Data
@see https://github.com/JBZoo/Data
-->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
bootstrap="tests/autoload.php"
Expand Down

0 comments on commit e9ef60d

Please sign in to comment.