Merge branch '4' into 5

silverstripe · Nov 21, 2022 · a52c779 · a52c779
2 parents 8e16b57 + ad116c6
commit a52c779
Show file tree

Hide file tree

Showing 73 changed files with 548 additions and 276 deletions.
diff --git a/_config.php b/_config.php
@@ -1,6 +1,5 @@
 <?php
 
-use SilverStripe\Dev\Deprecation;
 use SilverStripe\View\Shortcodes\EmbedShortcodeProvider;
 use SilverStripe\View\Parsers\ShortcodeParser;
 
@@ -14,6 +13,3 @@
 
 ShortcodeParser::get('default')
     ->register('embed', [EmbedShortcodeProvider::class, 'handle_shortcode']);
-
-// Set to 5.0.0 to show APIs marked for removal at that version
-Deprecation::notification_version('4.0.0');
diff --git a/_config/i18n.yml b/_config/i18n.yml
@@ -2,14 +2,14 @@
 Name: basei18n
 Before: '#defaulti18n'
 ---
-SilverStripe\i18n\Data\Sources:
+SilverStripe\Core\Manifest\ModuleManifest:
   module_priority:
     - silverstripe\admin
     - silverstripe\framework
 ---
 Name: defaulti18n
 ---
-SilverStripe\i18n\Data\Sources:
+SilverStripe\Core\Manifest\ModuleManifest:
   module_priority:
     - other_modules
 ---

diff --git a/src/Control/CookieJar.php b/src/Control/CookieJar.php
@@ -200,12 +200,9 @@ private function cookieIsSecure(string $sameSite, bool $secure): bool
 
     /**
      * Get the correct samesite value - Session cookies use a different configuration variable.
-     *
-     * @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');
         }

diff --git a/src/Control/Director.php b/src/Control/Director.php
@@ -228,7 +228,7 @@ public static function mockRequest(
             ? $cookies
             : Injector::inst()->createWithArgs(Cookie_Backend::class, [$cookies ?: []]);
         $newVars['_COOKIE'] = $cookieJar->getAll(false);
-        Cookie::config()->update('report_errors', false);
+        Cookie::config()->set('report_errors', false);
         Injector::inst()->registerService($cookieJar, Cookie_Backend::class);
 
         // Backup requirements

diff --git a/src/Control/HTTP.php b/src/Control/HTTP.php
@@ -126,7 +126,7 @@ public static function absoluteURLs($html)
             if (preg_match('/^\w+:/', $url ?? '')) {
                 return $url;
             }
-            return Director::absoluteURL($url, true);
+            return Director::absoluteURL($url);
         });
     }
 
@@ -474,6 +474,8 @@ public static function add_cache_headers($response = null)
      * Ensure that all deprecated HTTP cache settings are respected
      *
      * @deprecated 4.2.0 Use HTTPCacheControlMiddleware instead
+     * Simply delete this method in CMS 5 and the calls to it from HTTPCacheControlMiddleware
+     *
      * @throws \LogicException
      * @param HTTPRequest $request
      * @param HTTPResponse $response
@@ -491,32 +493,32 @@ public static function augmentState(HTTPRequest $request, HTTPResponse $response
 
         // if http caching is disabled by config, disable it - used on dev environments due to frequently changing
         // templates and other data. will be overridden by forced publicCache(true) or privateCache(true) calls
-        if ($config->get('disable_http_cache')) {
-            Deprecation::notice('5.0', 'Use HTTPCacheControlMiddleware.defaultState/.defaultForcingLevel instead');
-            $cacheControlMiddleware->disableCache();
-        }
+        Deprecation::withNoReplacement(function () use ($config, $cacheControlMiddleware) {
+            if ($config->get('disable_http_cache')) {
+                $cacheControlMiddleware->disableCache();
+            }
+        });
 
         // if no caching ajax requests, disable ajax if is ajax request
-        if (!$config->get('cache_ajax_requests') && Director::is_ajax()) {
-            Deprecation::notice(
-                '5.0',
-                'HTTP.cache_ajax_requests config is deprecated. Use HTTPCacheControlMiddleware::disableCache() instead'
-            );
-            $cacheControlMiddleware->disableCache();
-        }
+        Deprecation::withNoReplacement(function () use ($config, $cacheControlMiddleware) {
+            if (!$config->get('cache_ajax_requests') && Director::is_ajax()) {
+                $cacheControlMiddleware->disableCache();
+            }
+        });
 
         // Pass vary to middleware
-        $configVary = $config->get('vary');
+        $configVary = Deprecation::withNoReplacement(function () use ($config) {
+            return $config->get('vary');
+        });
         if ($configVary) {
-            Deprecation::notice('5.0', 'Use HTTPCacheControlMiddleware.defaultVary instead');
             $cacheControlMiddleware->addVary($configVary);
         }
 
         // Pass cache_control to middleware
-        $configCacheControl = $config->get('cache_control');
+        $configCacheControl = Deprecation::withNoReplacement(function () use ($config) {
+            return $config->get('cache_control');
+        });
         if ($configCacheControl) {
-            Deprecation::notice('5.0', 'Use HTTPCacheControlMiddleware API instead');
-
             $supportedDirectives = ['max-age', 'no-cache', 'no-store', 'must-revalidate'];
             if ($foundUnsupported = array_diff(array_keys($configCacheControl ?? []), $supportedDirectives)) {
                 throw new \LogicException(

diff --git a/src/Control/Middleware/FlushMiddleware.php b/src/Control/Middleware/FlushMiddleware.php
@@ -2,10 +2,12 @@
 
 namespace SilverStripe\Control\Middleware;
 
-use SilverStripe\Control\Director;
 use SilverStripe\Control\HTTPRequest;
+use SilverStripe\Core\BaseKernel;
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\Core\Flushable;
+use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Core\Kernel;
 
 /**
  * Triggers a call to flush() on all implementors of Flushable.
@@ -14,7 +16,9 @@ class FlushMiddleware implements HTTPMiddleware
 {
     public function process(HTTPRequest $request, callable $delegate)
     {
-        if (Director::isManifestFlushed()) {
+        /** @var BaseKernel $kernel */
+        $kernel = Injector::inst()->get(Kernel::class);
+        if ((method_exists($kernel, 'isFlushed') && $kernel->isFlushed())) {
             // Disable cache when flushing
             HTTPCacheControlMiddleware::singleton()->disableCache(true);
 

diff --git a/src/Control/Middleware/HTTPCacheControlMiddleware.php b/src/Control/Middleware/HTTPCacheControlMiddleware.php
@@ -12,6 +12,7 @@
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\Resettable;
 use SilverStripe\ORM\FieldType\DBDatetime;
+use SilverStripe\Dev\Deprecation;
 
 class HTTPCacheControlMiddleware implements HTTPMiddleware, Resettable
 {
@@ -51,7 +52,9 @@ public function process(HTTPRequest $request, callable $delegate)
         $this->augmentState($request, $response);
 
         // Update state based on deprecated HTTP settings
-        HTTP::augmentState($request, $response);
+        Deprecation::withNoReplacement(function () use ($request, $response) {
+            HTTP::augmentState($request, $response);
+        });
 
         // Add all headers to this response object
         $this->applyToResponse($response);

diff --git a/src/Control/Middleware/URLSpecialsMiddleware/FlushScheduler.php b/src/Control/Middleware/URLSpecialsMiddleware/FlushScheduler.php
@@ -2,10 +2,10 @@
 
 namespace SilverStripe\Control\Middleware\URLSpecialsMiddleware;
 
+use SilverStripe\Core\BaseKernel;
 use SilverStripe\Core\Kernel;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\Startup\ScheduledFlushDiscoverer;
-use SilverStripe\Control\Director;
 use SilverStripe\Control\HTTPRequest;
 
 /**
@@ -30,11 +30,12 @@ public function scheduleFlush(HTTPRequest $request)
     {
         $flush = array_key_exists('flush', $request->getVars() ?? []) || ($request->getURL() === 'dev/build');
 
-        if (!$flush || Director::isManifestFlushed()) {
+        /** @var BaseKernel $kernel */
+        $kernel = Injector::inst()->get(Kernel::class);
+        if (!$flush || (method_exists($kernel, 'isFlushed') && $kernel->isFlushed())) {
             return false;
         }
 
-        $kernel = Injector::inst()->get(Kernel::class);
         ScheduledFlushDiscoverer::scheduleFlush($kernel);
 
         return true;

diff --git a/src/Control/RSS/RSSFeed.php b/src/Control/RSS/RSSFeed.php
@@ -222,7 +222,7 @@ public function Description()
     public function outputToBrowser()
     {
         $prevState = SSViewer::config()->uninherited('source_file_comments');
-        SSViewer::config()->update('source_file_comments', false);
+        SSViewer::config()->set('source_file_comments', false);
 
         $response = Controller::curr()->getResponse();
 
@@ -236,7 +236,7 @@ public function outputToBrowser()
 
         $response->addHeader("Content-Type", "application/rss+xml; charset=utf-8");
 
-        SSViewer::config()->update('source_file_comments', $prevState);
+        SSViewer::config()->set('source_file_comments', $prevState);
         return $this->renderWith($this->getTemplates());
     }
 

diff --git a/src/Control/RequestProcessor.php b/src/Control/RequestProcessor.php
@@ -29,7 +29,9 @@ class RequestProcessor implements HTTPMiddleware
      */
     public function __construct($filters = [])
     {
-        Deprecation::notice('4.0.1', 'Use HTTPMiddleware directly instead.', Deprecation::SCOPE_CLASS);
+        Deprecation::withNoReplacement(function () {
+            Deprecation::notice('4.0.1', 'Use HTTPMiddleware directly instead.', Deprecation::SCOPE_CLASS);
+        });
         $this->filters = $filters;
     }
 

diff --git a/src/Control/Session.php b/src/Control/Session.php
@@ -586,13 +586,11 @@ public function save(HTTPRequest $request)
      * Recursively apply the changes represented in $data to $dest.
      * Used to update $_SESSION
      *
-     * @deprecated 4.1.0 Use recursivelyApplyChanges() instead
      * @param array $data
      * @param array $dest
      */
     protected function recursivelyApply($data, &$dest)
     {
-        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])) {

diff --git a/src/Control/SimpleResourceURLGenerator.php b/src/Control/SimpleResourceURLGenerator.php
@@ -82,7 +82,10 @@ public function urlForResource($relativePath)
             // Determine lookup mechanism based on existence of public/ folder.
             // From 5.0 onwards only resolvePublicResource() will be used.
             if (!Director::publicDir()) {
-                list($exists, $absolutePath, $relativePath) = $this->resolveUnsecuredResource($relativePath);
+                $ret = Deprecation::withNoReplacement(function () use ($relativePath) {
+                    return $this->resolveUnsecuredResource($relativePath);
+                });
+                list($exists, $absolutePath, $relativePath) = $ret;
             } else {
                 list($exists, $absolutePath, $relativePath) = $this->resolvePublicResource($relativePath);
             }

diff --git a/src/Core/BaseKernel.php b/src/Core/BaseKernel.php
@@ -180,10 +180,24 @@ protected function bootPHP()
     protected function bootManifests($flush)
     {
         // Setup autoloader
-        $this->getClassLoader()->init($this->getIncludeTests(), $flush);
+        $ignoredCIConfigs = Deprecation::withNoReplacement(function () {
+            return $this->getIgnoredCIConfigs();
+        });
+
+        Deprecation::withNoReplacement(function () use ($flush, $ignoredCIConfigs) {
+            $this->getClassLoader()->init(
+                $this->getIncludeTests(),
+                $flush,
+                $ignoredCIConfigs
+            );
 
-        // Find modules
-        $this->getModuleLoader()->init($this->getIncludeTests(), $flush);
+            // Find modules
+            $this->getModuleLoader()->init(
+                $this->getIncludeTests(),
+                $flush,
+                $ignoredCIConfigs
+            );
+        });
 
         // Flush config
         if ($flush) {
@@ -201,7 +215,13 @@ protected function bootManifests($flush)
             $defaultSet->setProject(
                 ModuleManifest::config()->get('project')
             );
-            $defaultSet->init($this->getIncludeTests(), $flush);
+            Deprecation::withNoReplacement(function () use ($defaultSet, $flush, $ignoredCIConfigs) {
+                $defaultSet->init(
+                    $this->getIncludeTests(),
+                    $flush,
+                    $ignoredCIConfigs
+                );
+            });
         }
     }
 
@@ -247,12 +267,9 @@ protected function bootErrorHandling()
      * Get the environment type
      *
      * @return string
-     *
-     * @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;

diff --git a/src/Core/Convert.php b/src/Core/Convert.php
@@ -275,7 +275,7 @@ public static function json2obj($val)
     /**
      * Convert a JSON string into an array.
      *
-     * @deprecated 4.4.0 Use json_decode() instead
+     * @deprecated 4.4.0 Use json_decode($val, true) instead
      * @param string $val JSON string to convert
      * @return array|boolean
      */

diff --git a/src/Core/Manifest/ClassLoader.php b/src/Core/Manifest/ClassLoader.php
@@ -126,7 +126,9 @@ public function init($includeTests = false, $forceRegen = false)
         foreach ($this->manifests as $manifest) {
             /** @var ClassManifest $instance */
             $instance = $manifest['instance'];
-            $instance->init($includeTests, $forceRegen);
+            Deprecation::withNoReplacement(function () use ($instance, $includeTests, $forceRegen, $ignoredCIConfigs) {
+                $instance->init($includeTests, $forceRegen, $ignoredCIConfigs);
+            });
         }
 
         $this->registerAutoloader();

diff --git a/src/Core/Manifest/ClassManifest.php b/src/Core/Manifest/ClassManifest.php
@@ -291,7 +291,9 @@ public function init($includeTests = false, $forceRegen = false)
         }
 
         // Build
-        $this->regenerate($includeTests);
+        Deprecation::withNoReplacement(function () use ($includeTests, $ignoredCIConfigs) {
+            $this->regenerate($includeTests, $ignoredCIConfigs);
+        });
     }
 
     /**