Skip to content

Commit

Permalink
[shopsys] stop using excluded_404s in monolog config for incompatible…
Browse files Browse the repository at this point in the history
… types (#1154)

- the excluded_404s config works only for fingers_crossed type
- the config should be unset when the type is changed
- this makes the configuration compatible with symfony/monolog-bundle in v3.4.0
  • Loading branch information
PetrHeinz authored Jun 24, 2019
1 parent f9d03fd commit 5a2418a
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 11 deletions.
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@
},
"conflict": {
"symfony/dependency-injection": "3.4.15|3.4.16",
"symfony/monolog-bundle": ">=3.4.0",
"symplify/better-phpdoc-parser": "5.4.14|5.4.15",
"twig/twig": "2.6.1"
},
Expand Down
27 changes: 19 additions & 8 deletions docs/upgrade/UPGRADE-unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,25 @@ There you can find links to upgrade notes for other versions too.
+ - method: setSqlLoggerFacade
+ - method: setEntityManager
```
- set `symfony/monolog-bundle` as conflicting in your `composer.json` and run `composer update` command ([#1148](https://github.com/shopsys/shopsys/pull/1148))
```diff
"conflict": {
"symfony/dependency-injection": "3.4.15|3.4.16",
+ "symfony/monolog-bundle": ">=3.4.0",
"twig/twig": "2.6.1"
},
```
- unset the incompatible `excluded_404s` configuration from monolog handlers that don't use the `fingers_crossed` type ([#1154](https://github.com/shopsys/shopsys/pull/1154))
- in `app/config/packages/dev/monolog.yml`:
```diff
monolog:
handlers:
main:
# change "fingers_crossed" handler to "group" that works as a passthrough to "nested"
type: group
members: [ nested ]
+ excluded_404s: false
```
- in `app/config/packages/test/monolog.yml`:
```diff
monolog:
handlers:
main:
type: "null"
+ excluded_404s: false
```

### Tools
- use the `build.xml` [Phing configuration](/docs/introduction/console-commands-for-application-management-phing-targets.md) from the `shopsys/framework` package ([#1068](https://github.com/shopsys/shopsys/pull/1068))
Expand Down
1 change: 0 additions & 1 deletion packages/framework/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
},
"conflict": {
"symfony/dependency-injection": "3.4.15|3.4.16",
"symfony/monolog-bundle": ">=3.4.0",
"twig/twig": "2.6.1"
}
}
1 change: 1 addition & 0 deletions project-base/app/config/packages/dev/monolog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ monolog:
# change "fingers_crossed" handler to "group" that works as a passthrough to "nested"
type: group
members: [ nested ]
excluded_404s: false
1 change: 1 addition & 0 deletions project-base/app/config/packages/test/monolog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ monolog:
handlers:
main:
type: "null"
excluded_404s: false
nested:
type: "null"
cron:
Expand Down
1 change: 0 additions & 1 deletion project-base/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
},
"conflict": {
"symfony/dependency-injection": "3.4.15|3.4.16",
"symfony/monolog-bundle": ">=3.4.0",
"twig/twig": "2.6.1"
},
"scripts": {
Expand Down

0 comments on commit 5a2418a

Please sign in to comment.