Skip to content

Commit

Permalink
Merge pull request #131 from RonasIT/fix-warning-with-logging
Browse files Browse the repository at this point in the history
Fix warning with logging
  • Loading branch information
DenTray authored Jul 24, 2024
2 parents 0949e83 + be4756f commit 11cf7ed
Show file tree
Hide file tree
Showing 6 changed files with 1,885 additions and 703 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.idea
.phpunit.result.cache
vendor/
.php-cs-fixer.cache
cghooks.lock
22 changes: 22 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

$finder = PhpCsFixer\Finder::create()
->exclude(['vendor', 'bootstrap/cache'])
->in(__DIR__);

$config = new PhpCsFixer\Config();

return $config
->setRules([
'@PSR12' => true,
'array_syntax' => ['syntax' => 'short'],
'type_declaration_spaces' => [
'elements' => ['function', 'property'],
],
'no_extra_blank_lines' => true,
'blank_line_before_statement' => [
'statements' => ['return'],
],
'trailing_comma_in_multiline' => true,
])
->setFinder($finder);
12 changes: 11 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
"phpunit/phpunit": "9.*",
"php-coveralls/php-coveralls": "^2.5",
"orchestra/testbench": "^8.23",
"mpyw/laravel-database-mock": "0.0.1-alpha5"
"mpyw/laravel-database-mock": "0.0.1-alpha5",
"friendsofphp/php-cs-fixer": "^3.59",
"brainmaestro/composer-git-hooks": "^3.0"
},
"autoload": {
"psr-4": {
Expand All @@ -47,6 +49,14 @@
"providers": [
"RonasIT\\Support\\HelpersServiceProvider"
]
},
"hooks": {
"config": {
"stop-on-failure": ["pre-commit"]
},
"pre-commit": [
"docker-compose up -d php && docker-compose exec -T php vendor/bin/php-cs-fixer fix && docker-compose exec -T php vendor/bin/tlint"
]
}
}
}
Loading

0 comments on commit 11cf7ed

Please sign in to comment.