Skip to content

Commit

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

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

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

name: CI
Expand All @@ -35,7 +34,7 @@ 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:
Expand Down Expand Up @@ -75,7 +74,7 @@ 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
Expand Down Expand Up @@ -107,7 +106,7 @@ 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
Expand Down
5 changes: 2 additions & 3 deletions .gitignore
@@ -1,14 +1,13 @@
#
# JBZoo Toolbox - Toolbox-Dev
# JBZoo Toolbox - Toolbox-Dev.
#
# 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 Toolbox-Dev
# @license MIT
# @copyright Copyright (C) JBZoo.com, All rights reserved.
# @link https://github.com/JBZoo/Toolbox-Dev
# @see https://github.com/JBZoo/Toolbox-Dev
#

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

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

declare(strict_types=1);

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

return array_merge($default, [
return \array_merge($default, [
'directory_list' => [
'src',
'vendor/symfony/var-dumper'
]
'vendor/symfony/var-dumper',
],
]);
5 changes: 2 additions & 3 deletions Makefile
@@ -1,14 +1,13 @@
#
# JBZoo Toolbox - Toolbox-Dev
# JBZoo Toolbox - Toolbox-Dev.
#
# 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 Toolbox-Dev
# @license MIT
# @copyright Copyright (C) JBZoo.com, All rights reserved.
# @link https://github.com/JBZoo/Toolbox-Dev
# @see https://github.com/JBZoo/Toolbox-Dev
#


Expand Down
4 changes: 2 additions & 2 deletions README.md
@@ -1,7 +1,7 @@
# JBZoo / Toolbox-Dev

[![CI](https://github.com/JBZoo/Toolbox-Dev/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/JBZoo/Toolbox-Dev/actions/workflows/main.yml?query=branch%3Amaster) [![codecov](https://codecov.io/gh/JBZoo/Toolbox-Dev/branch/master/graph/badge.svg)](https://codecov.io/gh/JBZoo/Toolbox-Dev/branch/master) [![Psalm Coverage](https://shepherd.dev/github/JBZoo/Toolbox-Dev/coverage.svg)](https://shepherd.dev/github/JBZoo/Toolbox-Dev) [![CodeFactor](https://www.codefactor.io/repository/github/jbzoo/toolbox-dev/badge)](https://www.codefactor.io/repository/github/jbzoo/toolbox-dev/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/toolbox-dev/version)](https://packagist.org/packages/jbzoo/toolbox-dev) [![Total Downloads](https://poser.pugx.org/jbzoo/toolbox-dev/downloads)](https://packagist.org/packages/jbzoo/toolbox-dev/stats) [![Dependents](https://poser.pugx.org/jbzoo/toolbox-dev/dependents)](https://packagist.org/packages/jbzoo/toolbox-dev/dependents?order_by=downloads) [![Visitors](https://visitor-badge.glitch.me/badge?page_id=jbzoo.toolbox-dev)]() [![GitHub License](https://img.shields.io/github/license/jbzoo/toolbox-dev)](https://github.com/JBZoo/Toolbox-Dev/blob/master/LICENSE)
[![CI](https://github.com/JBZoo/Toolbox-Dev/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/JBZoo/Toolbox-Dev/actions/workflows/main.yml?query=branch%3Amaster) [![Coverage Status](https://coveralls.io/repos/github/JBZoo/Toolbox-Dev/badge.svg?branch=master)](https://coveralls.io/github/JBZoo/Toolbox-Dev?branch=master) [![Psalm Coverage](https://shepherd.dev/github/JBZoo/Toolbox-Dev/coverage.svg)](https://shepherd.dev/github/JBZoo/Toolbox-Dev) [![Psalm Level](https://shepherd.dev/github/JBZoo/Toolbox-Dev/level.svg)](https://shepherd.dev/github/JBZoo/Toolbox-Dev) [![CodeFactor](https://www.codefactor.io/repository/github/jbzoo/toolbox-dev/badge)](https://www.codefactor.io/repository/github/jbzoo/toolbox-dev/issues)
[![Stable Version](https://poser.pugx.org/jbzoo/toolbox-dev/version)](https://packagist.org/packages/jbzoo/toolbox-dev/) [![Total Downloads](https://poser.pugx.org/jbzoo/toolbox-dev/downloads)](https://packagist.org/packages/jbzoo/toolbox-dev/stats) [![Dependents](https://poser.pugx.org/jbzoo/toolbox-dev/dependents)](https://packagist.org/packages/jbzoo/toolbox-dev/dependents?order_by=downloads) [![Visitors](https://visitor-badge.glitch.me/badge?page_id=jbzoo.toolbox-dev)]() [![GitHub License](https://img.shields.io/github/license/jbzoo/toolbox-dev)](https://github.com/JBZoo/Toolbox-Dev/blob/master/LICENSE)



Expand Down
14 changes: 7 additions & 7 deletions composer.json
Expand Up @@ -13,10 +13,10 @@
],

"require" : {
"php" : ">=7.4",
"php" : "^8.1",

"jbzoo/phpunit" : "^5.0.0",
"jbzoo/codestyle" : "^4.0.2",
"jbzoo/codestyle" : "7.x-dev",
"jbzoo/markdown" : "^1.1.1",

"jbzoo/jbdump" : ">=1.5.6",
Expand All @@ -36,19 +36,19 @@
},

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

"config" : {
"optimize-autoloader" : true,
"allow-plugins" : {
"composer/package-versions-deprecated" : true
}
"allow-plugins" : {"composer/package-versions-deprecated" : true}
},

"extra" : {
"branch-alias" : {
"dev-master" : "4.x-dev"
"dev-master" : "7.x-dev"
}
}
}
5 changes: 2 additions & 3 deletions phpunit.xml.dist
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
JBZoo Toolbox - Toolbox-Dev
JBZoo Toolbox - Toolbox-Dev.
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 Toolbox-Dev
@license MIT
@copyright Copyright (C) JBZoo.com, All rights reserved.
@link https://github.com/JBZoo/Toolbox-Dev
@see https://github.com/JBZoo/Toolbox-Dev
-->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
bootstrap="tests/autoload.php"
Expand Down
7 changes: 3 additions & 4 deletions src/var-dumper.php
@@ -1,16 +1,15 @@
<?php

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

declare(strict_types=1);
Expand All @@ -20,7 +19,7 @@
use Symfony\Component\VarDumper\Dumper\CliDumper;
use Symfony\Component\VarDumper\VarDumper;

if (!class_exists(VarDumper::class)) {
if (!\class_exists(VarDumper::class)) {
return false;
}

Expand Down
13 changes: 3 additions & 10 deletions tests/ToolboxDevCodestyleTest.php
@@ -1,28 +1,21 @@
<?php

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

declare(strict_types=1);

namespace JBZoo\PHPUnit;

/**
* Class Toolbox-DevCodestyleTest
*
* @package JBZoo\PHPUnit
*/
class ToolboxDevCodestyleTest extends AbstractCodestyleTest
final class ToolboxDevCodestyleTest extends \JBZoo\CodeStyle\PHPUnit\AbstractCodeStyleTest
{

}
12 changes: 3 additions & 9 deletions tests/ToolboxDevComposerTest.php
@@ -1,27 +1,21 @@
<?php

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

declare(strict_types=1);

namespace JBZoo\PHPUnit;

/**
* Class ToolboxDevComposerTest
* @package JBZoo\PHPUnit
*/
class ToolboxDevComposerTest extends AbstractComposerTest
final class ToolboxDevComposerTest extends \JBZoo\CodeStyle\PHPUnit\AbstractComposerTest
{
protected $phpVersion = '>=7.4';
}
18 changes: 4 additions & 14 deletions tests/ToolboxDevCopyrightTest.php
@@ -1,32 +1,22 @@
<?php

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

declare(strict_types=1);

namespace JBZoo\PHPUnit;

/**
* Class Toolbox-DevCopyrightTest
*
* @package JBZoo\PHPUnit
*/
class ToolboxDevCopyrightTest extends AbstractCopyrightTest
final class ToolboxDevCopyrightTest extends \JBZoo\CodeStyle\PHPUnit\AbstractCopyrightTest
{
/**
* @var string
*/
protected $packageName = 'Toolbox-Dev';
protected $isPhpStrictType = true;
protected string $packageName = 'Toolbox-Dev';
}
12 changes: 3 additions & 9 deletions tests/ToolboxDevReadmeTest.php
@@ -1,28 +1,22 @@
<?php

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

declare(strict_types=1);

namespace JBZoo\PHPUnit;

/**
* Class ToolboxDevReadmeTest
*
* @package JBZoo\PHPUnit
*/
class ToolboxDevReadmeTest extends AbstractReadmeTest
final class ToolboxDevReadmeTest extends \JBZoo\CodeStyle\PHPUnit\AbstractReadmeTest
{
protected string $packageName = 'Toolbox-Dev';
}

0 comments on commit 7ff83fa

Please sign in to comment.