Merge branch '5' into feature-5-trailing-slash-config-and-redirect

README.md

@@ -8,8 +8,8 @@ Requires a [`silverstripe-installer`](https://github.com/silverstripe/silverstri
 
 ## Installation ##
 
-See [installation on different platforms](https://doc.silverstripe.org/framework/en/installation/),
-and [installation from source](https://doc.silverstripe.org/framework/en/installation/from-source).
+See [getting started](https://docs.silverstripe.org/en/4/getting_started/),
+for instructions on how to start the installation process.
 
 ## Bugtracker ##
 

_config/mailer.yml

@@ -0,0 +1,28 @@
+---
+Name: mailer
+---
+SilverStripe\Core\Injector\Injector:
+  Symfony\Component\Mailer\MailerInterface:
+    class: Symfony\Component\Mailer\Mailer
+    constructor:
+      transport: '%$Symfony\Component\Mailer\Transport\TransportInterface'
+  Symfony\Component\EventDispatcher\EventDispatcherInterface.mailer:
+    class: Symfony\Component\EventDispatcher\EventDispatcher
+    calls:
+      - [addSubscriber, ['%$SilverStripe\Control\Email\MailerSubscriber']]
+  Symfony\Component\Mailer\Transport\TransportInterface:
+    factory: Symfony\Component\Mailer\Transport
+    factory_method: fromDsn
+    constructor:
+      dsn: 'sendmail://default'
+      dispatcher: '%$Symfony\Component\EventDispatcher\EventDispatcherInterface.mailer'
+---
+Name: mailer-dsn-env
+After: '*'
+Only:
+  envvarset: MAILER_DSN
+---
+SilverStripe\Core\Injector\Injector:
+  Symfony\Component\Mailer\Transport\TransportInterface:
+    constructor:
+      dsn: '`MAILER_DSN`'

composer.json

@@ -24,23 +24,24 @@
     "require": {
         "php": "^8.1",
         "bramus/monolog-colored-line-formatter": "^2.0.3",
-        "composer/installers": "^2.1.1",
-        "guzzlehttp/guzzle": "^7.4.5",
+        "composer/installers": "^2.2",
+        "guzzlehttp/guzzle": "^7.5.0",
         "guzzlehttp/psr7": "^2.4.0",
         "embed/embed": "^4.4.4",
         "league/csv": "^9.8.0",
         "m1/env": "^2.2.0",
-        "monolog/monolog": "^1.27.1",
-        "nikic/php-parser": "^4.14.0",
-        "psr/container": "^1.1.2",
+        "monolog/monolog": "^3.2.0",
+        "nikic/php-parser": "^4.15.0",
+        "psr/container": "^2.0",
         "silverstripe/config": "^2",
         "silverstripe/assets": "^2",
         "silverstripe/vendor-plugin": "^2",
         "sminnee/callbacklist": "^0.1.1",
-        "swiftmailer/swiftmailer": "^6.3.0",
         "symfony/cache": "^6.1",
         "symfony/config": "^6.1",
         "symfony/filesystem": "^6.1",
+        "symfony/mailer": "^6.1",
+        "symfony/mime": "^6.1",
         "symfony/translation": "^6.1",
         "symfony/yaml": "^6.1",
         "ext-ctype": "*",
@@ -96,14 +97,9 @@
         },
         "files": [
             "src/includes/constants.php"
-        ],
-        "classmap": [
-            "thirdparty/swiftmailer"
         ]
     },
     "include-path": [
-        "src/",
-        "src/includes/",
         "thirdparty/"
     ],
     "scripts": {
@@ -113,4 +109,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}

src/Control/Controller.php

@@ -73,10 +73,8 @@ class Controller extends RequestHandler implements TemplateGlobalProvider
      * The response object that the controller returns.
      *
      * Set in {@link handleRequest()}.
-     *
-     * @var HTTPResponse
      */
-    protected $response;
+    protected HTTPResponse $response;
 
     /**
      * Default URL handlers.
@@ -95,6 +93,12 @@ class Controller extends RequestHandler implements TemplateGlobalProvider
         'handleIndex',
     ];
 
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setResponse(HTTPResponse::create());
+    }
+
     /**
      * If true, a trailing slash is added to the end of URLs, e.g. from {@link Controller::join_links()}
      */
@@ -147,12 +151,11 @@ public function doInit()
      *
      * Also set the URLParams
      */
-    public function setRequest($request)
+    public function setRequest(HTTPRequest $request): static
     {
-        $return = parent::setRequest($request);
+        parent::setRequest($request);
         $this->setURLParams($this->getRequest()->allParams());
-
-        return $return;
+        return $this;
     }
 
     /**
@@ -197,11 +200,8 @@ protected function afterHandleRequest()
      * Important: If you are going to overload handleRequest,
      * make sure that you start the method with $this->beforeHandleRequest()
      * and end the method with $this->afterHandleRequest()
-     *
-     * @param HTTPRequest $request
-     * @return HTTPResponse
      */
-    public function handleRequest(HTTPRequest $request)
+    public function handleRequest(HTTPRequest $request): HTTPResponse
     {
         if (!$request) {
             throw new \RuntimeException('Controller::handleRequest() not passed a request!');
@@ -337,14 +337,9 @@ public function getURLParams()
     /**
      * Returns the HTTPResponse object that this controller is building up. Can be used to set the
      * status code and headers.
-     *
-     * @return HTTPResponse
      */
-    public function getResponse()
+    public function getResponse(): HTTPResponse
     {
-        if (!$this->response) {
-            $this->setResponse(new HTTPResponse());
-        }
         return $this->response;
     }
 
@@ -538,15 +533,11 @@ public function render($params = null)
      * called before Controller::init(). That is, you must call it in your controller's init method
      * before it calls parent::init().
      *
-     * @deprecated 4.1.0:5.0.0 Add this controller's url to
-     * SilverStripe\Security\BasicAuthMiddleware.URLPatterns injected property instead of setting false
+     * @deprecated 4.1.0 Add this controller's url to SilverStripe\Security\BasicAuthMiddleware.URLPatterns injected property instead
      */
     public function disableBasicAuth()
     {
-        Deprecation::notice(
-            '5.0',
-            'Add this controller\'s url to ' . BasicAuthMiddleware::class . '.URLPatterns injected property instead'
-        );
+        Deprecation::notice('4.1.0', 'Add this controller\'s url to SilverStripe\Security\BasicAuthMiddleware.URLPatterns injected property instead');
         $this->basicAuthEnabled = false;
     }
 
@@ -633,17 +624,14 @@ public function popCurrent()
 
     /**
      * Redirect to the given URL.
-     *
-     * @param string $url
-     * @param int $code
-     * @return HTTPResponse
      */
-    public function redirect($url, $code = 302)
+    public function redirect(string $url, int $code = 302): HTTPResponse
     {
-        if ($this->getResponse()->getHeader('Location') && $this->getResponse()->getHeader('Location') != $url) {
+        $response = $this->getResponse();
+        if ($response->getHeader('Location') && $response->getHeader('Location') != $url) {
             user_error("Already directed to " . $this->getResponse()->getHeader('Location')
                 . "; now trying to direct to $url", E_USER_WARNING);
-            return null;
+            return $response;
         }
         $response = parent::redirect($url, $code);
         $this->setResponse($response);

src/Control/CookieJar.php

@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Control;
 
+use SilverStripe\Dev\Deprecation;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use LogicException;
 
@@ -200,10 +201,11 @@ private function cookieIsSecure(string $sameSite, bool $secure): bool
     /**
      * Get the correct samesite value - Session cookies use a different configuration variable.
      *
-     * @deprecated 5.0 The relevant methods will include a `$sameSite` parameter instead.
+     * @deprecated 4.12.0 The relevant methods will include a `$sameSite` parameter instead.
      */
     private function getSameSite(string $name): string
     {
+        Deprecation::notice('4.12.0', 'The relevant methods will include a `$sameSite` parameter instead.');
         if ($name === session_name()) {
             return Session::config()->get('cookie_samesite');
         }

src/Control/Director.php

@@ -386,10 +386,11 @@ public function handleRequest(HTTPRequest $request)
      *
      * @return bool
      *
-     * @deprecated 5.0 Kernel::isFlushed to be used instead
+     * @deprecated 4.12.0 Use Kernel::isFlushed instead
      */
     public static function isManifestFlushed()
     {
+        Deprecation::notice('4.12.0', 'Use Kernel::isFlushed instead');
         $kernel = Injector::inst()->get(Kernel::class);
 
         // Only CoreKernel implements this method at the moment