API Stop using deprecated API #10565

emteknetnz · 2022-11-02T02:00:47Z

emteknetnz · 2022-11-02T22:41:24Z

tests/php/Dev/DeprecationTest.php

@@ -42,7 +45,9 @@ protected function setup(): void

    protected function tearDown(): void
    {
-        Deprecation::disable();
+        if (!$this->noticesWereEnabled) {


When doing multi-pr tests using silverstripe/installer, I'm calling Deprecation::enable() in _config.php. I've added funtionality to DeprecationTest to ensure we don't disable Deprecation notices after running DeprecatonTest

emteknetnz · 2022-11-02T22:42:45Z

src/Dev/Deprecation.php

@@ -179,7 +179,7 @@ public static function get_enabled()
        // noop
    }

-    private static function get_is_enabled(): bool
+    public static function get_is_enabled(): bool


This needs to be public now as we use this for skipping unit test of deprecated code, i.e.

if (Deprecation::get_is_enabled()) { $this->markTestSkipped('Test calls deprecated code'); }

emteknetnz · 2022-11-07T00:56:38Z

tests/php/Security/MemberAuthenticator/SessionAuthenticationHandlerTest.php

@@ -15,10 +15,6 @@ class SessionAuthenticationHandlerTest extends SapphireTest

    protected $usesDatabase = true;

-    /**
-     * @runInSeparateProcess


These annotations were removed because they will cause phpunit to fail on any deprecations warnings e.g. swiftmailer is deprecated - running phpunit in isolation seems to upgrade deprecation notices to warnings

emteknetnz · 2022-11-07T04:12:08Z

src/Dev/Tasks/MigrateFileTask.php


 /**
 * Migrates all 3.x file dataobjects to use the new DBFile field.
+ *
+ * @deprected 4.12.0 Will be removed without equivalent functionality to replace it


Deprecating this class because it uses a load of other deprecated classes from silverstripe/assets. It was used to migrate CMS 3 files.

emteknetnz · 2022-11-07T04:18:34Z

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.


Undeprecating because there is no upgrade path. Also this is a private method so no need to deprecate.

emteknetnz · 2022-11-07T04:19:50Z

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


Undeprecating because recursivelyApplyChanges() has different API - have raised issue to investigate

emteknetnz · 2022-11-07T04:20:24Z

src/Core/BaseKernel.php

@@ -259,12 +259,9 @@ protected function bootErrorHandling()
     * Get the environment type
     *
     * @return string
-     *
-     * @deprecated 4.12.0 Use Director::get_environment_type() instead


Undeprecating because Director::get_environment_type() will call this method i.e. this deprecation was nonsensical

emteknetnz · 2022-11-07T04:21:30Z

src/Core/BaseKernel.php

@@ -288,12 +285,9 @@ public function getEnvironment()
     * Check or update any temporary environment specified in the session.
     *
     * @return null|string
-     *
-     * @deprecated 4.12.0 Use Director::get_session_environment_type() instead


Undeprecating because this is used by Director::sessionEnvironment()

emteknetnz · 2022-11-07T04:22:47Z

src/Forms/TreeDropdownField.php

@@ -622,26 +621,22 @@ public function getAttributes()
    /**
     * HTML-encoded label for this node, including css classes and other markup.
     *
-     * @deprecated 4.0.1 Use setTitleField() instead


Undeprecating this because getLabelField() because setTitleField() uses $this->titleField instead of $this->labelField

emteknetnz · 2022-11-07T04:23:58Z

src/ORM/Connect/DBSchemaManager.php

@@ -60,12 +59,9 @@ abstract class DBSchemaManager
    /**
     * @param string $table
     * @param string $class
-     *
-     * @deprecated 4.0.1 Will be removed without equivalent functionality


Undeprecating this because it is used by DataObjectSchema::buildTableName()

emteknetnz · 2022-11-07T04:25:14Z

tests/php/ORM/SQLSelectTest.php

@@ -24,18 +23,6 @@ class SQLSelectTest extends SapphireTest

    protected $oldDeprecation = null;

-    protected function setUp(): void


Removed because they called functionality that was previously removed from Deprecation

emteknetnz · 2022-11-07T04:25:46Z

tests/php/View/ArrayDataTest.php

@@ -67,9 +66,6 @@ public function testSetField()

    public function testGetArray()
    {
-        $originalDeprecation = Deprecation::dump_settings();


Removed because this functionality was previously removed from Deprecation

emteknetnz · 2022-11-09T01:07:42Z

src/Control/Middleware/FlushMiddleware.php

-        if (Director::isManifestFlushed()) {
+        /** @var BaseKernel $kernel */
+        $kernel = Injector::inst()->get(Kernel::class);
+        if ((method_exists($kernel, 'isFlushed') && $kernel->isFlushed())) {


isFlushed() is not on the Kernel interface

emteknetnz · 2022-11-09T01:08:04Z

src/Control/Middleware/URLSpecialsMiddleware/FlushScheduler.php

-        if (!$flush || Director::isManifestFlushed()) {
+        /** @var BaseKernel $kernel */
+        $kernel = Injector::inst()->get(Kernel::class);
+        if (!$flush || (method_exists($kernel, 'isFlushed') && $kernel->isFlushed())) {


isFlushed() is not on the Kernel interface

emteknetnz · 2022-11-09T01:10:23Z

src/Dev/Deprecation.php

@@ -179,12 +203,12 @@ public static function get_enabled()
        // noop
    }

-    private static function get_is_enabled(): bool
+    public static function isEnabled(): bool


Needs to be public so that it can be called by unit tests that wish to skip because they are testing deprecated code i.e.

if (Deprecation::isEnabled()) { $this->markTestSkipped('Test calls deprecated code'); }

src/Control/Middleware/HTTPCacheControlMiddleware.php

src/Dev/Tasks/MigrateFileTask.php

tests/php/Control/HTTPTest.php

tests/php/Dev/DeprecationTest.php

tests/php/Forms/CurrencyFieldTest.php

tests/php/View/ViewableDataTest.php

tests/php/View/SSViewerTest.php

tests/php/Security/RandomGeneratorTest.php

sabina-talipova · 2022-11-15T01:40:46Z

tests/php/Security/MemberCsvBulkLoaderTest.php

@@ -9,6 +9,7 @@
 use SilverStripe\Security\PasswordValidator;
 use SilverStripe\Security\Security;
 use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Security\MemberAuthenticator\MemberAuthenticator;


Could we use alphabetical order?

This new import is needed in testCleartextPasswordsAreHashedWithDefaultAlgo()

sabina-talipova · 2022-11-15T01:42:06Z

tests/php/Security/MemberAuthenticator/SessionAuthenticationHandlerTest.php

 use SilverStripe\Security\Member;
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Core\Config\Config;
+use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Security\MemberAuthenticator\SessionAuthenticationHandler;


Could we use alphabetical order?

emteknetnz mentioned this pull request Nov 2, 2022

Stop using deprecated code in CMS 4 for core #10542

Closed

5 tasks

emteknetnz force-pushed the pulls/4/stop-depr branch 4 times, most recently from ee3f54f to d10acbf Compare November 2, 2022 04:55

emteknetnz force-pushed the pulls/4/stop-depr branch from d10acbf to b3320f3 Compare November 2, 2022 22:27

emteknetnz mentioned this pull request Nov 2, 2022

API Stop using deprecated API silverstripe/silverstripe-elemental#1018

Merged

emteknetnz commented Nov 2, 2022

View reviewed changes

emteknetnz mentioned this pull request Nov 2, 2022

MNT Only disable deprecations if they were not previously enabled #10564

Closed

emteknetnz force-pushed the pulls/4/stop-depr branch 4 times, most recently from fc06859 to 80e5901 Compare November 6, 2022 22:25

emteknetnz mentioned this pull request Nov 6, 2022

Look at VersionedTestSessionExtension deprecation silverstripe/silverstripe-versioned#378

Open

emteknetnz force-pushed the pulls/4/stop-depr branch 6 times, most recently from a75200e to 98e654e Compare November 7, 2022 00:55

emteknetnz commented Nov 7, 2022

View reviewed changes

emteknetnz force-pushed the pulls/4/stop-depr branch from 98e654e to 0666366 Compare November 7, 2022 03:10

emteknetnz commented Nov 7, 2022

View reviewed changes

emteknetnz force-pushed the pulls/4/stop-depr branch 8 times, most recently from 228d227 to cb14003 Compare November 8, 2022 23:17

emteknetnz commented Nov 9, 2022

View reviewed changes

emteknetnz marked this pull request as ready for review November 9, 2022 01:25

sabina-talipova suggested changes Nov 15, 2022

View reviewed changes

emteknetnz force-pushed the pulls/4/stop-depr branch 2 times, most recently from b90ca77 to d0911f5 Compare November 15, 2022 04:49

API Stop using deprecated API

137ebce

emteknetnz force-pushed the pulls/4/stop-depr branch from d0911f5 to 137ebce Compare November 15, 2022 05:21

emteknetnz mentioned this pull request Nov 15, 2022

API Update deprecations silverstripe/silverstripe-auditor#46

Merged

sabina-talipova approved these changes Nov 16, 2022

View reviewed changes

sabina-talipova merged commit ad116c6 into silverstripe:4 Nov 16, 2022

sabina-talipova deleted the pulls/4/stop-depr branch November 16, 2022 01:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

API Stop using deprecated API #10565

API Stop using deprecated API #10565

emteknetnz commented Nov 2, 2022 •

edited

Loading

emteknetnz Nov 2, 2022

emteknetnz Nov 2, 2022

emteknetnz Nov 7, 2022 •

edited

Loading

emteknetnz Nov 7, 2022

emteknetnz Nov 7, 2022 •

edited

Loading

emteknetnz Nov 7, 2022

emteknetnz Nov 7, 2022 •

edited

Loading

emteknetnz Nov 7, 2022

emteknetnz Nov 7, 2022 •

edited

Loading

emteknetnz Nov 7, 2022

emteknetnz Nov 7, 2022

emteknetnz Nov 7, 2022

emteknetnz Nov 9, 2022

emteknetnz Nov 9, 2022

emteknetnz Nov 9, 2022

sabina-talipova Nov 15, 2022

emteknetnz Nov 15, 2022

sabina-talipova Nov 15, 2022

emteknetnz Nov 15, 2022

		@@ -24,18 +23,6 @@ class SQLSelectTest extends SapphireTest

		protected $oldDeprecation = null;

		protected function setUp(): void

API Stop using deprecated API #10565

API Stop using deprecated API #10565

Conversation

emteknetnz commented Nov 2, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emteknetnz Nov 7, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emteknetnz Nov 7, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emteknetnz Nov 7, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emteknetnz Nov 7, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emteknetnz commented Nov 2, 2022 •

edited

Loading

emteknetnz Nov 7, 2022 •

edited

Loading

emteknetnz Nov 7, 2022 •

edited

Loading

emteknetnz Nov 7, 2022 •

edited

Loading

emteknetnz Nov 7, 2022 •

edited

Loading