Merge remote-tracking branch 'origin/master' into pending

.env

@@ -31,16 +31,9 @@ DATABASE_URL=nothing
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/mailer ###
-# MAILER_DSN=smtp://localhost
+MAILER_DSN=smtp://localhost
 ###< symfony/mailer ###
 
-###> symfony/swiftmailer-bundle
-# For Gmail as a transport, use: "gmail://username:password@localhost"
-# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode="
-# Delivery is disabled by default via "null://localhost"
-MAILER_URL=null://localhost
-###< swiftmailer-bundle
-
 ###> zikula
 ZIKULA_INSTALLED='0.0.0'
 ###< zikula

CHANGELOG-3.0.md

@@ -36,6 +36,7 @@
     - `Zikula\Core\RouteUrl` moved into `Zikula\Bundle\CoreBundle\`.
     - `Zikula\Core\UrlInterface` moved into `Zikula\Bundle\CoreBundle\`.
     - `Zikula\ThemeModule\AbstractTheme` moved into `Zikula\ExtensionsModule\`.
+  - MailerApi and Swift_Mailer is fully removed in favor of the Symfony Mailer Component. Mailer is configurable in MailerModule (#4000).
   - Interface extensions and amendments
     - Removed second argument (`$first = true`) from `ZikulaHttpKernelInterface` methods `getModule`, `getTheme` and `isBundle` (#3377).
     - `ZikulaHttpKernelInterface` has dropped `getConnectionConfig()` method. Use environment variable `DATABASE_URL` instead.
@@ -91,10 +92,12 @@
     - Removed ramsey/array_column
     - Removed sensio/distribution-bundle (in favour of Flex)
     - Removed sensio/generator-bundle (in favour of symfony/maker-bundle)
+    - Removed swiftmailer/swiftmailer (in favour of symfony/mailer)
     - Removed symfony/polyfill-apcu
     - Removed symfony/polyfill-php56
     - Removed symfony/polyfill-php70
     - Removed symfony/polyfill-util
+    - Removed symfony/swiftmailer-bundle (in favour of symfony/mailer)
     - Removed twig/extensions (use new Twig Extra extensions instead)
     - Removed zikula/andreas08-theme (in favour of different styles in bootstrap theme)
     - Removed zikula/bootstrap-bundle (in favour of direct usage of components/bootstrap)
@@ -223,6 +226,7 @@
   - Added CLI Command to import users `bin/console zikula:users:import`.
   - Added CLI Command to create any number of users for testing purposes `bin/console zikula:users:generate`.
   - Added CLI Command to delete any number of users `bin/console zikula:users:delete`.
+  - Added `Zikula\Bundle\CoreBundle\Helper\LocalDotEnvHelper` to assist in writing to the `.env.local` file.
 
 - Vendor updates:
   - antishov/doctrine-extensions-bundle updated from 1.2.2 to 1.4.2
@@ -282,13 +286,11 @@
   - seld/phar-utils installed in 1.1.0
   - sensio/framework-extra-bundle updated from 3.0.29 to 5.5.3
   - sensiolabs/security-checker updated from 5.0.3 to 6.0.3
-  - swiftmailer/swiftmailer updated from 5.4.12 to 6.2.3
   - symfony/contracts installed in 2.0.1
   - symfony/maker-bundle installed in 1.14.6
   - symfony/monolog-bundle updated from 3.2.0 to 3.5.0
-  - symfony/phpunit-bridge updated from 3.4.14 to 5.0.5
+  - symfony/phpunit-bridge updated from 3.4.14 to 5.0.6
   - symfony/polyfill-ctype updated from 1.12.0 to 1.15.0
-  - symfony/polyfill-iconv installed in 1.15.0
   - symfony/polyfill-intl-grapheme installed in 1.15.0
   - symfony/polyfill-intl-icu updated from 1.11.0 to 1.15.0
   - symfony/polyfill-intl-idn updated from 1.11.0 to 1.15.0
@@ -298,8 +300,7 @@
   - symfony/polyfill-php72 installed in 1.15.0
   - symfony/polyfill-php73 installed in 1.15.0
   - symfony/profiler-pack installed in 1.0.4
-  - symfony/swiftmailer-bundle updated from 2.4.3 to 3.4.0
-  - symfony/symfony updated from 3.4.35 to 5.0.5
+  - symfony/symfony updated from 3.4.35 to 5.0.6
   - thomaspark/bootswatch installed in 4.4.1
   - tijsverkoyen/css-to-inline-styles installed in 2.2.2
   - twig/extra-bundle installed in 3.0.3

composer.json

@@ -20,11 +20,10 @@
     "require": {
         "php": "^7.2.5",
         "wikimedia/composer-merge-plugin": "1.*",
-
         "zikula/legal-module": "dev-master",
-        "zikula/profile-module": "dev-master",
         "zikula/oauth-module": "dev-master",
-        "zikula/pagelock-module": "dev-master"
+        "zikula/pagelock-module": "dev-master",
+        "zikula/profile-module": "dev-master"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "5.*"