Skip to content

Commit

Permalink
Update dependencies... (#49)
Browse files Browse the repository at this point in the history
- Upgrading jms/serializer (3.17.1 => 3.23.0)
- Upgrading phpunit/phpunit (9.5.20 => 9.5.23)
- Upgrading friendsofphp/php-cs-fixer (v2.19.3 => v3.16.0)
  • Loading branch information
PATROMO authored Apr 24, 2023
1 parent d7d763d commit 5803d08
Show file tree
Hide file tree
Showing 15 changed files with 478 additions and 933 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
include:
- { operating-system: 'ubuntu-latest', php-version: '7.4', dependencies: '--ignore-platform-req=php' }
- { operating-system: 'ubuntu-latest', php-version: '8.2', dependencies: '' }

name: PHP ${{ matrix.php-version }}

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ jobs:
include:
- { operating-system: 'ubuntu-latest', php-version: '7.4', dependencies: '--ignore-platform-req=php' }
- { operating-system: 'ubuntu-latest', php-version: '8.0', dependencies: '--ignore-platform-req=php' }
- { operating-system: 'ubuntu-latest', php-version: '8.1', dependencies: '--ignore-platform-req=php' }
- { operating-system: 'ubuntu-latest', php-version: '8.1', dependencies: '' }
- { operating-system: 'ubuntu-latest', php-version: '8.2', dependencies: '' }

name: PHP ${{ matrix.php-version }}

Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ vendor
/zugferd20
/zugferd211de
.phpunit.result.cache
.php_cs.cache
.php-cs-fixer.cache
.vscode
30 changes: 15 additions & 15 deletions .php_cs.dist → .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?php

return PhpCsFixer\Config::create()

$finder = (new PhpCsFixer\Finder())
->in([__DIR__ . '/src', __DIR__ . '/tests']);

return (new PhpCsFixer\Config())
->setRiskyAllowed(false)
->setRules([
'@PSR2' => true,
Expand All @@ -9,27 +13,23 @@
'array_syntax' => ['syntax' => 'short'],
'cast_spaces' => ['space' => 'none'],
'concat_space' => ['spacing' => 'one'],
'yoda_style' => null,
'ordered_class_elements' => null,
'ordered_imports' => null,
'yoda_style' => false,
'ordered_class_elements' => false,
'ordered_imports' => false,
//'method_argument_space' => null,
//'no_whitespace_in_blank_line' => null,
//'no_extra_blank_lines' => null,
//'braces' => null,
'blank_line_before_statement' => null,
'blank_line_before_statement' => false,
'phpdoc_align' => ['align' => 'left'],
'phpdoc_var_without_name' => null,
'phpdoc_types_order' => null,
'phpdoc_order' => null,
'phpdoc_separation' => null,
'phpdoc_var_without_name' => false,
'phpdoc_types_order' => false,
'phpdoc_order' => false,
'phpdoc_separation' => false,
//'no_superfluous_elseif' => null,
'class_definition' => null,
'class_definition' => false,
'ternary_to_null_coalescing' => true,
'php_unit_test_class_requires_covers' => false,
'php_unit_internal_class' => false,
])
->setFinder(
PhpCsFixer\Finder::create()
->in(__DIR__ . '/src')
)
;
->setFinder($finder);
9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ test8:
docker run --rm -v $(current_dir):/app -w /app php:8.0 vendor/bin/phpunit

test81:
docker run --rm -v $(current_dir):/app -w /app php:8.1.0RC6-zts-buster vendor/bin/phpunit
docker run --rm -v $(current_dir):/app -w /app php:8.1 vendor/bin/phpunit

test82:
docker run --rm -v $(current_dir):/app -w /app php:8.2 vendor/bin/phpunit

cs-fix:
./vendor/bin/php-cs-fixer fix ./src --config .php_cs.dist
./vendor/bin/php-cs-fixer fix --config .php-cs-fixer.dist.php
7 changes: 5 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
"require-dev": {
"phpunit/phpunit": "^9.3",
"friendsofphp/php-cs-fixer": "^2.19.3",
"ext-libxml": "*"
"ext-libxml": "*",
"friendsofphp/php-cs-fixer": "^3.16"
},
"autoload": {
"psr-4": {
Expand All @@ -37,5 +37,8 @@
"Easybill\\ZUGFeRD\\": "tests/zugferd10",
"Easybill\\ZUGFeRD211\\": "tests/zugferd211"
}
},
"config": {
"platform-check": false
}
}
Loading

0 comments on commit 5803d08

Please sign in to comment.