API Update deprecations

src/Control/Controller.php

@@ -533,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 of setting false
      */
     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 of setting false');
         $this->basicAuthEnabled = false;
     }
 

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 Use Kernel::isFlushed 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

src/Control/Email/Email.php

@@ -737,7 +737,7 @@ public function BaseURL()
     }
 
     /**
-     * @deprecated Will be removed without equivalent functionality to replace it
+     * @deprecated 4.12.0 Will be removed without equivalent functionality to replace it
      *
      * Debugging help
      *

src/Control/Email/SwiftMailer.php

@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Control\Email;
 
+use SilverStripe\Dev\Deprecation;
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
@@ -37,6 +38,11 @@ class SwiftMailer implements Mailer
      * @param Email $message
      * @return bool Whether the sending was "successful" or not
      */
+    public function __construct()
+    {
+        Deprecation::notice('4.12.0', 'Will be replaced with symfony/mailer', Deprecation::SCOPE_CLASS);
+    }
+
     public function send($message)
     {
         $swiftMessage = $message->getSwiftMessage();

src/Control/Email/SwiftPlugin.php

@@ -2,6 +2,8 @@
 
 namespace SilverStripe\Control\Email;
 
+use SilverStripe\Dev\Deprecation;
+
 /**
  * @deprecated 4.12.0 Will be replaced with symfony/mailer
  */
@@ -12,6 +14,11 @@ class SwiftPlugin implements \Swift_Events_SendListener
      *
      * @param \Swift_Events_SendEvent $evt
      */
+    public function __construct()
+    {
+        Deprecation::notice('4.12.0', 'Will be replaced with symfony/mailer', Deprecation::SCOPE_CLASS);
+    }
+
     public function beforeSendPerformed(\Swift_Events_SendEvent $evt)
     {
         /** @var \Swift_Message $message */

src/Control/HTTP.php

@@ -372,43 +372,43 @@ public static function get_mime_type($filename)
     /**
      * Set the maximum age of this page in web caches, in seconds.
      *
-     * @deprecated 4.2.0:5.0.0 Use HTTPCacheControlMiddleware::singleton()->setMaxAge($age) instead
+     * @deprecated 4.2.0 Use HTTPCacheControlMiddleware::singleton()->setMaxAge($age) instead
      * @param int $age
      */
     public static function set_cache_age($age)
     {
-        Deprecation::notice('5.0', 'Use HTTPCacheControlMiddleware::singleton()->setMaxAge($age) instead');
+        Deprecation::notice('4.2.0', 'Use HTTPCacheControlMiddleware::singleton()->setMaxAge($age) instead');
         self::$cache_age = $age;
         HTTPCacheControlMiddleware::singleton()->setMaxAge($age);
     }
 
     /**
      * @param string $dateString
-     * @deprecated 4.2.0:5.0.0 Use HTTPCacheControlMiddleware::registerModificationDate() instead
+     * @deprecated 4.2.0 Use HTTPCacheControlMiddleware::registerModificationDate() instead
      */
     public static function register_modification_date($dateString)
     {
-        Deprecation::notice('5.0', 'Use HTTPCacheControlMiddleware::registerModificationDate() instead');
+        Deprecation::notice('4.2.0', 'Use HTTPCacheControlMiddleware::registerModificationDate() instead');
         HTTPCacheControlMiddleware::singleton()->registerModificationDate($dateString);
     }
 
     /**
      * @param int $timestamp
-     * @deprecated 4.2.0:5.0.0 Use HTTPCacheControlMiddleware::registerModificationDate() instead
+     * @deprecated 4.2.0 Use HTTPCacheControlMiddleware::registerModificationDate() instead
      */
     public static function register_modification_timestamp($timestamp)
     {
-        Deprecation::notice('5.0', 'Use HTTPCacheControlMiddleware::registerModificationDate() instead');
+        Deprecation::notice('4.2.0', 'Use HTTPCacheControlMiddleware::registerModificationDate() instead');
         HTTPCacheControlMiddleware::singleton()->registerModificationDate($timestamp);
     }
 
     /**
-     * @deprecated 4.2.0:5.0.0 Use ChangeDetectionMiddleware instead
+     * @deprecated 4.2.0 Use ChangeDetectionMiddleware instead
      * @param string $etag
      */
     public static function register_etag($etag)
     {
-        Deprecation::notice('5.0', 'Use ChangeDetectionMiddleware instead');
+        Deprecation::notice('4.2.0', 'Use ChangeDetectionMiddleware instead');
         if (strpos($etag ?? '', '"') !== 0) {
             $etag =  "\"{$etag}\"";
         }
@@ -426,11 +426,11 @@ public static function register_etag($etag)
      * output directly.
      *
      * @param HTTPResponse $response
-     * @deprecated 4.2.0:5.0.0 Headers are added automatically by HTTPCacheControlMiddleware instead.
+     * @deprecated 4.2.0 Headers are added automatically by HTTPCacheControlMiddleware instead.
      */
     public static function add_cache_headers($response = null)
     {
-        Deprecation::notice('5.0', 'Headers are added automatically by HTTPCacheControlMiddleware instead.');
+        Deprecation::notice('4.2.0', 'Headers are added automatically by HTTPCacheControlMiddleware instead.');
 
         // Skip if deprecated API is disabled
         if (Config::inst()->get(HTTP::class, 'ignoreDeprecatedCaching')) {
@@ -473,13 +473,14 @@ public static function add_cache_headers($response = null)
     /**
      * Ensure that all deprecated HTTP cache settings are respected
      *
-     * @deprecated 4.2.0:5.0.0 Use HTTPCacheControlMiddleware instead
+     * @deprecated 4.2.0 Use HTTPCacheControlMiddleware instead
      * @throws \LogicException
      * @param HTTPRequest $request
      * @param HTTPResponse $response
      */
     public static function augmentState(HTTPRequest $request, HTTPResponse $response)
     {
+        Deprecation::notice('4.2.0', 'Use HTTPCacheControlMiddleware instead');
         // Skip if deprecated API is disabled
         $config = Config::forClass(HTTP::class);
         if ($config->get('ignoreDeprecatedCaching')) {
@@ -560,11 +561,12 @@ public static function augmentState(HTTPRequest $request, HTTPResponse $response
      * is always in GMT: the number of seconds since January 1 1970 00:00:00 GMT)
      *
      * @param int $timestamp
-     * @deprecated 4.2.0:5.0.0 Use native php function gmdate() instead
+     * @deprecated 4.2.0 Use native php function gmdate() instead
      * @return string
      */
     public static function gmt_date($timestamp)
     {
+        Deprecation::notice('4.2.0', 'Use native php function gmdate() instead');
         return gmdate('D, d M Y H:i:s', $timestamp) . ' GMT';
     }
 

src/Control/HTTPRequest.php

@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Control;
 
+use SilverStripe\Dev\Deprecation;
 use ArrayAccess;
 use BadMethodCallException;
 use InvalidArgumentException;
@@ -914,6 +915,7 @@ private static function isValidHttpMethod($method)
      */
     public static function detect_method($origMethod, $postVars)
     {
+        Deprecation::notice('4.4.7', 'Will be removed without equivalent functionality');
         if (isset($postVars['_method'])) {
             if (!self::isValidHttpMethod($postVars['_method'])) {
                 throw new InvalidArgumentException('HTTPRequest::detect_method(): Invalid "_method" parameter');

src/Control/RequestProcessor.php

@@ -9,7 +9,7 @@
 /**
  * Middleware that provides back-support for the deprecated RequestFilter API.
  *
- * @deprecated 4.0.0:5.0.0 Use HTTPMiddleware directly instead.
+ * @deprecated 4.0.1 Use HTTPMiddleware directly instead.
  */
 class RequestProcessor implements HTTPMiddleware
 {
@@ -29,6 +29,7 @@ class RequestProcessor implements HTTPMiddleware
      */
     public function __construct($filters = [])
     {
+        Deprecation::notice('4.0.1', 'Use HTTPMiddleware directly instead.', Deprecation::SCOPE_CLASS);
         $this->filters = $filters;
     }
 

src/Control/Session.php

@@ -586,13 +586,13 @@ public function save(HTTPRequest $request)
      * Recursively apply the changes represented in $data to $dest.
      * Used to update $_SESSION
      *
-     * @deprecated 4.1.0:5.0.0 Use recursivelyApplyChanges() instead
+     * @deprecated 4.1.0 Use recursivelyApplyChanges() instead
      * @param array $data
      * @param array $dest
      */
     protected function recursivelyApply($data, &$dest)
     {
-        Deprecation::notice('5.0', 'Use recursivelyApplyChanges() instead');
+        Deprecation::notice('4.1.0', 'Use recursivelyApplyChanges() instead');
         foreach ($data as $k => $v) {
             if (is_array($v)) {
                 if (!isset($dest[$k]) || !is_array($dest[$k])) {

src/Control/SimpleResourceURLGenerator.php

@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Control;
 
+use SilverStripe\Dev\Deprecation;
 use InvalidArgumentException;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Convert;
@@ -159,12 +160,13 @@ protected function resolveModuleResource(ModuleResource $resource)
     /**
      * Resolve resource in the absence of a public/ folder
      *
-     * @deprecated 4.1.0:5.0.0 Will be removed without equivalent functionality when public/ folder becomes mandatory
+     * @deprecated 4.1.0 Will be removed without equivalent functionality when public/ folder becomes mandatory
      * @param string $relativePath
      * @return array List of [$exists, $absolutePath, $relativePath]
      */
     protected function resolveUnsecuredResource($relativePath)
     {
+        Deprecation::notice('4.1.0', 'Will be removed without equivalent functionality when public/ folder becomes mandatory');
         // Check if the path requested is public-only, but we have no public folder
         $publicOnly = $this->inferPublicResourceRequired($relativePath);
         if ($publicOnly) {

src/Core/BaseKernel.php

@@ -260,10 +260,11 @@ protected function bootErrorHandling()
      *
      * @return string
      *
-     * @deprecated 5.0 use Director::get_environment_type() instead
+     * @deprecated 4.12.0 Use Director::get_environment_type() instead
      */
     public function getEnvironment()
     {
+        Deprecation::notice('4.12.0', 'Use Director::get_environment_type() instead');
         // Check set
         if ($this->enviroment) {
             return $this->enviroment;
@@ -288,10 +289,11 @@ public function getEnvironment()
      *
      * @return null|string
      *
-     * @deprecated 5.0 Use Director::get_session_environment_type() instead
+     * @deprecated 4.12.0 Use Director::get_session_environment_type() instead
      */
     protected function sessionEnvironment()
     {
+        Deprecation::notice('4.12.0', 'Use Director::get_session_environment_type() instead');
         if (!$this->booted) {
             // session is not initialyzed yet, neither is manifest
             return null;
@@ -378,11 +380,11 @@ protected function buildManifestCacheFactory()
      * The purpose of this method is to avoid loading PHPUnit test files with incompatible definitions.
      *
      * @return string[] List of CI types to ignore as defined by `Module`.
-     * @deprecated 5.0.0 Will be removed without equivalent functionality
+     * @deprecated 4.12.0 Will be removed without equivalent functionality
      */
     protected function getIgnoredCIConfigs(): array
     {
-        Deprecation::notice('5.0.0', 'This method will be removed in CMS 5');
+        Deprecation::notice('4.12.0', 'Will be removed without equivalent functionality');
         return [];
     }
 

src/Core/ClassInfo.php

@@ -156,13 +156,13 @@ public static function dataClassesFor($nameOrObject)
     }
 
     /**
-     * @deprecated 4.0.0:5.0.0
+     * @deprecated 4.0.1 Use DataObject::getSchema()->baseDataClass()
      * @param string $class
      * @return string
      */
     public static function baseDataClass($class)
     {
-        Deprecation::notice('5.0', 'Use DataObject::getSchema()->baseDataClass()');
+        Deprecation::notice('4.0.1', 'Use DataObject::getSchema()->baseDataClass()');
         return DataObject::getSchema()->baseDataClass($class);
     }
 
@@ -371,11 +371,11 @@ public static function has_method_from($class, $method, $compclass)
     }
 
     /**
-     * @deprecated 4.0.0:5.0.0
+     * @deprecated 4.0.1 Use DataObject::getSchema()->tableForField()
      */
     public static function table_for_object_field($candidateClass, $fieldName)
     {
-        Deprecation::notice('5.0', 'Use DataObject::getSchema()->tableForField()');
+        Deprecation::notice('4.0.1', 'Use DataObject::getSchema()->tableForField()');
         return DataObject::getSchema()->tableForField($candidateClass, $fieldName);
     }
 

src/Core/Config/Config_ForClass.php

@@ -46,7 +46,7 @@ public function __set($name, $val)
      */
     public function update($name, $value)
     {
-        Deprecation::notice('5.0', 'Use merge() instead');
+        Deprecation::notice('4.12.0', 'Use merge() instead');
         return $this->merge($name, $value);
     }