Skip to content

Commit

Permalink
Merge pull request #43 from mteu/task/remove-conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mteu committed Sep 13, 2024
2 parents d46e109 + 7beffee commit 5251a6d
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 35 deletions.
2 changes: 1 addition & 1 deletion Classes/Exception/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/**
* Exception.
*
* @author Martin Adler <[email protected]>
* @author Martin Adler <[email protected]>
* @license GPL-3.0-or-later
*/
abstract class Exception extends \Exception {}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/**
* InvalidLogWriterConfigurationException.
*
* @author Martin Adler <[email protected]>
* @author Martin Adler <[email protected]>
* @license GPL-3.0-or-later
*/
final class InvalidLogWriterConfigurationException extends Exception {}
2 changes: 1 addition & 1 deletion Classes/Exception/InvalidLogWriterOptionException.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/**
* InvalidOptionException.
*
* @author Martin Adler <[email protected]>
* @author Martin Adler <[email protected]>
* @license GPL-3.0-or-later
*/
final class InvalidLogWriterOptionException extends Exception {}
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"mteu/docblock-rules": "^0.3",
"mteu/zealous-stan": "^0.6",
"phpstan/extension-installer": "^1.4",
"phpstan/phpstan": "^1.11",
"phpstan/phpstan": "^1.12",
"phpstan/phpstan-phpunit": "^1.4",
"phpunit/php-code-coverage": "^10.1",
"phpunit/phpcov": "^9.0",
Expand All @@ -31,9 +31,6 @@
"typo3/coding-standards": "^0.8.0",
"typo3/testing-framework": "^8.2"
},
"conflict": {
"phpstan/phpstan": ">=1.11.9"
},
"autoload": {
"psr-4": {
"mteu\\StreamWriter\\": "Classes/"
Expand Down
56 changes: 28 additions & 28 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5251a6d

Please sign in to comment.