Merge branch '5.x' into 6.x

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -40,4 +40,4 @@
 ## 6.0.0 - 2024-03-19
 
 - Feed Me now requires Craft CMS 5.0.0-beta.2 or later.
-- Added support for importing into Icon fields.
+- Added support for importing into Icon fields.

README.md

@@ -34,9 +34,22 @@ composer require craftcms/feed-me
 ## Customizing Logs
 
 As of version `5.6`/`6.2`, logging is handled by Craft's log component and stored in the database instead of the filesystem.
-If you want them logged to files (or anywhere else), you can add your own log target in your `config/app.php` file:
+To log to files (or anywhere else) instead, you can disable the default logging add your own log target:
+
+### config/feed-me.php
+
+```php
+<?php
+return [
+    // disable default logging to database
+    'logging' => false,
+];
+```
+
+### config/app.php
 
 ```php
+<?php
 return [
     'components' => [
         'log' => [
@@ -48,9 +61,16 @@ return [
             // add your own log target to write logs to file
             'targets' => [
                 [
-                    'class' => \yii\log\FileTarget::class,
-                    'logFile' => '@storage/logs/feed-me.log',
+                    // log to file or STDOUT/STDERR if CRAFT_STREAM_LOG=1 is set
+                    'class' => \craft\log\MonologTarget::class,
+                    'name' => 'feed-me',
                     'categories' => ['feed-me'],
+
+                    // Don't log request and env vars
+                    'logContext' => true,
+
+                    // Minimum level to log
+                    'level' => \Psr\Log\LogLevel::INFO,
                 ],
             ],
         ],