Skip to content

Commit

Permalink
bump: infra (#165)
Browse files Browse the repository at this point in the history
* bump: sigwin/infra:~1.3.0

* bump: streamline copyright header

* fix: correct consecutive calls test

* fix: streamline with Infra init

* fix: SA baseline

* fix: remove Consecutive trait

* fix: require PHPUnit ^9.6

* fix: don't run Code analysis for build

* fix: conflict too old packages

* fix: Psalm baseline fix
  • Loading branch information
dkarlovi authored Mar 17, 2023
1 parent d41db69 commit 32ef69a
Show file tree
Hide file tree
Showing 74 changed files with 1,445 additions and 138 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

[{Makefile, *.mk}]
indent_style = tab

[*.md]
trim_trailing_whitespace = false

Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
/.* export-ignore
/*dist export-ignore
/*baseline* export-ignore
/composer.lock export-ignore
/Makefile export-ignore
3 changes: 0 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ jobs:
-
name: Composer install
run: make composer/install
-
name: Run code quality analysis
run: make analyze
-
name: Run build
working-directory: tests/functional/site
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/composer.lock
/tests/functional/init
!/tests/functional/init/vendor/sigwin/infra/resources/YASSG/default.mk
!/tests/functional/site/vendor/sigwin/infra/resources/YASSG/default.mk
/var/
/vendor/
/composer.lock
2 changes: 1 addition & 1 deletion .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
$configurator = require __DIR__ .'/vendor/sigwin/infra/resources/PHP/php-cs-fixer.php';

$header = <<<'EOF'
This file is part of the yassg project.
This file is part of the Sigwin Yassg project.
(c) sigwin.hr
Expand Down
2 changes: 1 addition & 1 deletion bin/yassg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
declare(strict_types=1);

/*
* This file is part of the yassg project.
* This file is part of the Sigwin Yassg project.
*
* (c) sigwin.hr
*
Expand Down
2 changes: 1 addition & 1 deletion bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
declare(strict_types=1);

/*
* This file is part of the yassg project.
* This file is part of the Sigwin Yassg project.
*
* (c) sigwin.hr
*
Expand Down
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"league/commonmark": "^2.3",
"phpdocumentor/type-resolver": "^1.0",
"phpstan/phpdoc-parser": "^1.0",
"sigwin/infra": "^1.0",
"sigwin/infra": "~1.3.0",
"spatie/commonmark-highlighter": "^3.0",
"symfony/console": "^5.4 || ^6.0",
"symfony/expression-language": "^5.4 || ^6.0",
Expand All @@ -28,10 +28,11 @@
"symfony/yaml": "^5.4 || ^6.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
"phpunit/phpunit": "^9.6"
},
"conflict": {
"nikic/php-parser": "< 4.12"
"nikic/php-parser": "< 4.12",
"symfony/dependency-injection": "< 5.4"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
declare(strict_types=1);

/*
* This file is part of the yassg project.
* This file is part of the Sigwin Yassg project.
*
* (c) sigwin.hr
*
Expand Down
Loading

0 comments on commit 32ef69a

Please sign in to comment.