ENH Remove unused properties and deprecation notices (#11543)

silverstripe · Jan 15, 2025 · 8b0c6ed · 8b0c6ed
1 parent b842972
commit 8b0c6ed
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 27 deletions.
diff --git a/src/Control/HTTP.php b/src/Control/HTTP.php
@@ -16,14 +16,6 @@ class HTTP
 {
     use Configurable;
 
-    /**
-     * Set to true to disable all deprecated HTTP Cache settings
-     *
-     * @var bool
-     * @deprecated 5.4.0 Will be removed without equivalent functionality to replace it.
-     */
-    private static $ignoreDeprecatedCaching = false;
-
     /**
      * Mapping of extension to mime types
      *

diff --git a/src/ORM/Search/BasicSearchContext.php b/src/ORM/Search/BasicSearchContext.php
@@ -7,7 +7,6 @@
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Dev\Deprecation;
 use SilverStripe\ORM\Filters\PartialMatchFilter;
 use SilverStripe\ORM\Filters\SearchFilter;
 use SilverStripe\Model\List\SS_List;

diff --git a/src/ORM/Search/SearchContext.php b/src/ORM/Search/SearchContext.php
@@ -19,7 +19,6 @@
 use Exception;
 use LogicException;
 use SilverStripe\Core\Config\Config;
-use SilverStripe\Dev\Deprecation;
 use SilverStripe\ORM\DataQuery;
 
 /**

diff --git a/src/Security/MemberAuthenticator/CookieAuthenticationHandler.php b/src/Security/MemberAuthenticator/CookieAuthenticationHandler.php
@@ -10,7 +10,6 @@
 use SilverStripe\Security\Member;
 use SilverStripe\Security\RememberLoginHash;
 use SilverStripe\Security\Security;
-use SilverStripe\Dev\Deprecation;
 
 /**
  * Authenticate a member passed on a session cookie

diff --git a/src/Security/RememberLoginHash.php b/src/Security/RememberLoginHash.php
@@ -6,7 +6,6 @@
 use DateTime;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBDatetime;
-use SilverStripe\Dev\Deprecation;
 
 /**
  * Persists a token associated with a device for users who opted for the "Remember Me"

diff --git a/tests/php/Logging/MonologErrorHandlerTest.php b/tests/php/Logging/MonologErrorHandlerTest.php
@@ -6,7 +6,6 @@
 use Psr\Log\LoggerInterface;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Logging\MonologErrorHandler;
-use SilverStripe\Dev\Deprecation;
 
 class MonologErrorHandlerTest extends SapphireTest
 {
@@ -20,9 +19,6 @@ public function testStartThrowsExceptionWithoutLoggerDefined()
 
     public function testSetLoggerResetsStack()
     {
-        if (Deprecation::isEnabled()) {
-            $this->markTestSkipped('Test calls deprecated code');
-        }
         /** @var LoggerInterface $logger */
         $logger = $this->createMock(LoggerInterface::class);
 

diff --git a/tests/php/ORM/SQLSelectTest.php b/tests/php/ORM/SQLSelectTest.php
@@ -29,8 +29,6 @@ class SQLSelectTest extends SapphireTest
         SQLSelectTest\CteRecursiveObject::class,
     ];
 
-    protected $oldDeprecation = null;
-
     public function testCount()
     {
 

diff --git a/tests/php/Security/PasswordEncryptorTest.php b/tests/php/Security/PasswordEncryptorTest.php
@@ -5,9 +5,7 @@
 use SilverStripe\Security\PasswordEncryptor_Blowfish;
 use SilverStripe\Security\PasswordEncryptor;
 use SilverStripe\Core\Config\Config;
-use SilverStripe\Dev\Deprecation;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Security\PasswordEncryptor_LegacyPHPHash;
 use SilverStripe\Security\PasswordEncryptor_NotFoundException;
 use SilverStripe\Security\PasswordEncryptor_PHPHash;
 use SilverStripe\Security\Tests\PasswordEncryptorTest\TestEncryptor;

diff --git a/tests/php/Security/RememberLoginHashTest.php b/tests/php/Security/RememberLoginHashTest.php
@@ -6,7 +6,6 @@
 use SilverStripe\Security\Member;
 use SilverStripe\Security\RememberLoginHash;
 use SilverStripe\SessionManager\Models\LoginSession;
-use SilverStripe\Dev\Deprecation;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 class RememberLoginHashTest extends SapphireTest
@@ -111,19 +110,13 @@ public function testRenew($replaceToken)
 
         $member = $this->objFromFixture(Member::class, 'main');
 
-        Deprecation::withSuppressedNotice(
-            fn() => RememberLoginHash::config()->set('replace_token_during_session_renewal', $replaceToken)
-        );
-
         $hash = RememberLoginHash::generate($member);
         $oldToken = $hash->getToken();
         $oldHash = $hash->Hash;
 
         // Fetch the token from the DB - otherwise we still have the token from when this was originally created
         $storedHash = RememberLoginHash::get()->find('ID', $hash->ID);
 
-        Deprecation::withSuppressedNotice(fn() => $storedHash->renew());
-
         if ($replaceToken) {
             $this->assertNotEquals($oldToken, $storedHash->getToken());
             $this->assertNotEquals($oldHash, $storedHash->Hash);
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,8 +29,6 @@ class SQLSelectTest extends SapphireTest @@
             SQLSelectTest\CteRecursiveObject::class,
         ];
-        protected $oldDeprecation = null;
         public function testCount()
         {
@@ Expand Down @@