diff --git a/src/Control/Director.php b/src/Control/Director.php index 119d4e746d0..12f2ac20974 100644 --- a/src/Control/Director.php +++ b/src/Control/Director.php @@ -12,6 +12,7 @@ use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Kernel; use SilverStripe\Core\Path; +use SilverStripe\Dev\Deprecation; use SilverStripe\Versioned\Versioned; use SilverStripe\View\Requirements; use SilverStripe\View\Requirements_Backend; @@ -1037,9 +1038,11 @@ public static function get_environment_type() * @param HTTPRequest $request * * @return string|null null if not overridden, otherwise the actual value + * @deprecated 5.4.0 Use get_environment_type() instead. */ public static function get_session_environment_type(HTTPRequest $request = null) { + Deprecation::notice('5.4.0', 'Use get_environment_type() instead.'); $request = static::currentRequest($request); if (!$request) { diff --git a/src/Control/HTTPApplication.php b/src/Control/HTTPApplication.php index b5bbd142f7c..ed3baffa91e 100644 --- a/src/Control/HTTPApplication.php +++ b/src/Control/HTTPApplication.php @@ -12,6 +12,7 @@ use SilverStripe\Core\Startup\RequestFlushDiscoverer; use SilverStripe\Core\Startup\ScheduledFlushDiscoverer; use SilverStripe\Core\Startup\DeployFlushDiscoverer; +use SilverStripe\Dev\Deprecation; class HTTPApplication implements Application { @@ -165,6 +166,8 @@ public function execute(HTTPRequest $request, callable $callback, $flush = false */ private function warnAboutDeprecatedSetups() { - // noop + if (defined('CUSTOM_INCLUDE_PATH')) { + Deprecation::notice('5.4.0', 'Use of the "CUSTOM_INCLUDE_PATH" constant is deprecated.', Deprecation::SCOPE_GLOBAL); + } } } diff --git a/src/Control/Middleware/URLSpecialsMiddleware/SessionEnvTypeSwitcher.php b/src/Control/Middleware/URLSpecialsMiddleware/SessionEnvTypeSwitcher.php index a3f7be39d69..ee3ed456460 100644 --- a/src/Control/Middleware/URLSpecialsMiddleware/SessionEnvTypeSwitcher.php +++ b/src/Control/Middleware/URLSpecialsMiddleware/SessionEnvTypeSwitcher.php @@ -8,6 +8,7 @@ /** * Implements switching user session into Test and Dev environment types + * @deprecated 5.4.0 Will be removed without equivalent functionality to replace it. */ trait SessionEnvTypeSwitcher { diff --git a/src/Core/Manifest/VersionProvider.php b/src/Core/Manifest/VersionProvider.php index b3477a3ba05..a951c0c9966 100644 --- a/src/Core/Manifest/VersionProvider.php +++ b/src/Core/Manifest/VersionProvider.php @@ -239,9 +239,11 @@ protected function getComposerLock($cache = true) /** * @return string + * @deprecated 5.4.0 Will be removed without equivalent functionality to replace it. */ protected function getComposerLockPath(): string { + Deprecation::noticeWithNoReplacment('5.4.0'); return BASE_PATH . '/composer.lock'; } } diff --git a/src/i18n/Messages/Symfony/FlushInvalidatedResource.php b/src/i18n/Messages/Symfony/FlushInvalidatedResource.php index 8ffa478f4c9..a24de272935 100644 --- a/src/i18n/Messages/Symfony/FlushInvalidatedResource.php +++ b/src/i18n/Messages/Symfony/FlushInvalidatedResource.php @@ -3,6 +3,7 @@ namespace SilverStripe\i18n\Messages\Symfony; use SilverStripe\Core\Flushable; +use SilverStripe\Dev\Deprecation; use Symfony\Component\Config\Resource\SelfCheckingResourceInterface; /** @@ -20,9 +21,12 @@ public function __toString() return md5(__CLASS__); } + /** + * @deprecated 5.4.0 Will be removed without equivalent functionality to replace it. + */ public function getResource() { - // @deprecated at 3.0, do nothing + Deprecation::noticeWithNoReplacment('5.4.0'); return null; }