tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4' into 5

Browse Source
This commit is contained in:
Guy Sartorelli 2022-11-21 18:13:01 +13:00
commit 8e16b57646
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
9 changed files with 215 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/Dev/Deprecation.php
View File

@ -3,7 +3,6 @@
namespace SilverStripe\Dev;
use BadMethodCallException;
use Exception;
use SilverStripe\Control\Director;
use SilverStripe\Core\Environment;
use SilverStripe\Core\Injector\InjectorLoader;
@ -41,6 +40,7 @@ class Deprecation
const SCOPE_METHOD = 1;
const SCOPE_CLASS = 2;
const SCOPE_GLOBAL = 4;
const SCOPE_CONFIG = 8;
/**
* @var string
@ -67,8 +67,10 @@ class Deprecation
* must be available before this to avoid infinite loops.
*
* This will be overriden by the SS_DEPRECATION_ENABLED environment if present
*
* @internal - Marked as internal so this and other private static's are not treated as config
*/
protected static bool $is_enabled = false;
private static bool $is_enabled = false;
/**
* @var array
@ -76,20 +78,35 @@ class Deprecation
*/
protected static $module_version_overrides = [];
protected static bool $inside_notice = false;
/**
* @internal
*/
private static bool $inside_notice = false;
/**
* Switched out by unit-testing to E_USER_NOTICE because E_USER_DEPRECATED is not
* caught by $this->expectDeprecated() by default
* https://github.com/laminas/laminas-di/pull/30#issuecomment-927585210
*
* @var int
* @var array
* @deprecated 4.12.0 Will be removed without equivalent functionality to replace it
*/
public static $notice_level = E_USER_DEPRECATED;
/**
* Buffer of user_errors to be raised when enabled() is called
*
* This is used when setting deprecated config via yaml, before Deprecation::enable() has been called in _config.php
* Deprecated config set via yaml will only be shown in the browser when using ?flush=1
* It will not show in CLI when running dev/build flush=1
*
* @internal
*/
private static array $user_error_message_buffer = [];
public static function enable(): void
{
static::$is_enabled = true;
foreach (self::$user_error_message_buffer as $message) {
user_error($message, E_USER_DEPRECATED);
}
self::$user_error_message_buffer = [];
}
public static function disable(): void
@ -167,10 +184,7 @@ class Deprecation
if (!Director::isDev()) {
return false;
}
if (Environment::getEnv('SS_DEPRECATION_ENABLED')) {
return true;
}
return static::$is_enabled;
return static::$is_enabled || Environment::getEnv('SS_DEPRECATION_ENABLED');
}
/**
@ -202,13 +216,16 @@ class Deprecation
// try block needs to wrap all code in case anything inside the try block
// calls something else that calls Deprecation::notice()
try {
if (!self::get_is_enabled()) {
return;
if ($scope === self::SCOPE_CONFIG) {
if (self::get_is_enabled()) {
user_error($string, E_USER_DEPRECATED);
} else {
self::$user_error_message_buffer[] = $string;
}
// If you pass #.#, assume #.#.0
if (preg_match('/^[0-9]+\.[0-9]+$/', $atVersion ?? '')) {
$atVersion .= '.0';
} else {
if (!self::get_is_enabled()) {
// Do not add to self::$user_error_message_buffer, as the backtrace is too expensive
return;
}
// Getting a backtrace is slow, so we only do it if we need it
@ -233,9 +250,10 @@ class Deprecation
$string .= " Called from " . self::get_called_method_from_trace($backtrace, 2) . '.';
if ($caller) {
user_error($caller . ' is deprecated.' . ($string ? ' ' . $string : ''), self::$notice_level);
user_error($caller . ' is deprecated.' . ($string ? ' ' . $string : ''), E_USER_DEPRECATED);
} else {
user_error($string, self::$notice_level);
user_error($string, E_USER_DEPRECATED);
}
}
} catch (BadMethodCallException $e) {
if ($e->getMessage() === InjectorLoader::NO_MANIFESTS_AVAILABLE) {

7
src/Forms/Form.php
View File

@ -1552,10 +1552,13 @@ class Form extends ViewableData implements HasRequestHandler
HTTPCacheControlMiddleware::singleton()->disableCache();
}
$return = $this->renderWith($this->getTemplates());
$context = $this;
$this->extend('onBeforeRender', $context);
$return = $context->renderWith($context->getTemplates());
// Now that we're rendered, clear message
$this->clearMessage();
$context->clearMessage();
return $return;
}

6
src/Forms/FormField.php
View File

@ -927,7 +927,7 @@ class FormField extends RequestHandler
$context = $context->customise($properties);
}
$result = $context->renderWith($this->getTemplates());
$result = $context->renderWith($context->getTemplates());
// Trim whitespace from the result, so that trailing newlines are suppressed. Works for strings and HTMLText values
if (is_string($result)) {
@ -959,10 +959,10 @@ class FormField extends RequestHandler
$this->extend('onBeforeRenderHolder', $context, $properties);
if (count($properties ?? [])) {
$context = $this->customise($properties);
$context = $context->customise($properties);
}
return $context->renderWith($this->getFieldHolderTemplates());
return $context->renderWith($context->getFieldHolderTemplates());
}
/**

2
src/Security/DefaultAdminService.php
View File

@ -171,7 +171,7 @@ class DefaultAdminService
$admin = Member::create();
$admin->FirstName = $name ?: $email;
$admin->Email = $email;
$admin->PasswordEncryption = 'none';
$admin->PasswordEncryption = Security::config()->get('password_encryption_algorithm');
$admin->write();
}

3
src/Security/Member.php
View File

@ -828,9 +828,12 @@ class Member extends DataObject
* filesystem.
*
* @return string Returns a random password.
*
* @deprecated 4.12.0 Will be removed without equivalent functionality to replace it
*/
public static function create_new_password()
{
Deprecation::notice('4.12.0', 'Will be removed without equivalent functionality to replace it');
$words = Security::config()->uninherited('word_list');
if ($words && file_exists($words ?? '')) {

2
src/Security/Security.php
View File

@ -88,6 +88,8 @@ class Security extends Controller implements TemplateGlobalProvider
*
* @config
* @var string
*
* @deprecated 4.12 Will be removed without equivalent functionality to replace it
*/
private static $word_list = './wordlist.txt';

107
tests/php/Dev/DeprecationTest.php
View File

@ -2,16 +2,49 @@
namespace SilverStripe\Dev\Tests;
use PHPUnit\Framework\Error\Deprecated;
use SilverStripe\Core\Config\Config;
use SilverStripe\Dev\Deprecation;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\Dev\Tests\DeprecationTest\TestDeprecation;
use SilverStripe\Dev\Tests\DeprecationTest\DeprecationTestObject;
class DeprecationTest extends SapphireTest
{
protected static $extra_dataobjects = [
DeprecationTestObject::class,
];
private $oldHandler = null;
protected function setup(): void
{
// Use custom error handler for two reasons:
// - Filter out errors for deprecated class properities unrelated to this unit test
// - Allow the use of expectDeprecation(), which doesn't work with E_USER_DEPRECATION by default
// https://github.com/laminas/laminas-di/pull/30#issuecomment-927585210
parent::setup();
$this->oldHandler = set_error_handler(function (int $errno, string $errstr, string $errfile, int $errline) {
if ($errno === E_USER_DEPRECATED) {
if (str_contains($errstr, 'SilverStripe\\Dev\\Tests\\DeprecationTest')) {
throw new Deprecated($errstr, $errno, '', 1);
} else {
// Surpress any E_USER_DEPRECATED unrelated to this unit-test
return true;
}
}
if (is_callable($this->oldHandler)) {
return call_user_func($this->oldHandler, $errno, $errstr, $errfile, $errline);
}
// Fallback to default PHP error handler
return false;
});
}
protected function tearDown(): void
{
Deprecation::$notice_level = E_USER_DEPRECATED;
Deprecation::disable();
restore_error_handler();
$this->oldHandler = null;
parent::tearDown();
}
@ -22,9 +55,8 @@ class DeprecationTest extends SapphireTest
'My message.',
'Called from PHPUnit\Framework\TestCase->runTest.'
]);
$this->expectError();
$this->expectErrorMessage($message);
Deprecation::$notice_level = E_USER_NOTICE;
$this->expectDeprecation();
$this->expectDeprecationMessage($message);
Deprecation::enable();
Deprecation::notice('1.2.3', 'My message');
}
@ -34,8 +66,71 @@ class DeprecationTest extends SapphireTest
*/
public function testDisabled()
{
Deprecation::$notice_level = E_USER_NOTICE;
// test that no error error is raised because by default Deprecation is disabled
Deprecation::notice('4.5.6', 'My message');
}
// The following tests would be better to put in the silverstripe/config module, however this is not
// possible to do in a clean way as the config for the DeprecationTestObject will not load if it
// is inside the silverstripe/config directory, as there is no _config.php file or _config folder.
// Adding a _config.php file will break existing unit-tests within silverstripe/config
// It is possible to put DeprecationTestObject in framework and the unit tests in config, however
// that's probably messier then just having everything within framework
public function testConfigGetFirst()
{
$message = implode(' ', [
'Config SilverStripe\Dev\Tests\DeprecationTest\DeprecationTestObject.first_config is deprecated.',
'My first config message.'
]);
$this->expectDeprecation();
$this->expectDeprecationMessage($message);
Deprecation::enable();
Config::inst()->get(DeprecationTestObject::class, 'first_config');
}
public function testConfigGetSecond()
{
$message = implode(' ', [
'Config SilverStripe\Dev\Tests\DeprecationTest\DeprecationTestObject.second_config is deprecated.',
'My second config message.'
]);
$this->expectDeprecation();
$this->expectDeprecationMessage($message);
Deprecation::enable();
Config::inst()->get(DeprecationTestObject::class, 'second_config');
}
public function testConfigGetThird()
{
$message = 'Config SilverStripe\Dev\Tests\DeprecationTest\DeprecationTestObject.third_config is deprecated.';
$this->expectDeprecation();
$this->expectDeprecationMessage($message);
Deprecation::enable();
Config::inst()->get(DeprecationTestObject::class, 'third_config');
}
public function testConfigSet()
{
$message = implode(' ', [
'Config SilverStripe\Dev\Tests\DeprecationTest\DeprecationTestObject.first_config is deprecated.',
'My first config message.'
]);
$this->expectDeprecation();
$this->expectDeprecationMessage($message);
Deprecation::enable();
Config::modify()->set(DeprecationTestObject::class, 'first_config', 'abc');
}
public function testConfigMerge()
{
$message = implode(' ', [
'Config SilverStripe\Dev\Tests\DeprecationTest\DeprecationTestObject.array_config is deprecated.',
'My array config message.'
]);
$this->expectDeprecation();
$this->expectDeprecationMessage($message);
Deprecation::enable();
Config::modify()->merge(DeprecationTestObject::class, 'array_config', ['abc']);
}
}

35
tests/php/Dev/DeprecationTest/DeprecationTestObject.php Normal file
View File

@ -0,0 +1,35 @@
<?php
namespace SilverStripe\Dev\Tests\DeprecationTest;
use SilverStripe\Dev\TestOnly;
use SilverStripe\ORM\DataObject;
class DeprecationTestObject extends DataObject implements TestOnly
{
private static $db = [
"Name" => "Varchar"
];
private static $table_name = 'DeprecatedTestObject';
/**
* @deprecated 1.2.3 My first config message
*/
private static $first_config = 'ABC';
/**
* @deprecated My second config message
*/
private static $second_config = 'DEF';
/**
* @deprecated
*/
private static $third_config = 'XYZ';
/**
* @deprecated 1.2.3 My array config message
*/
private static $array_config = ['lorem', 'ipsum'];
}

9
tests/php/Security/SecurityDefaultAdminTest.php
View File

@ -77,7 +77,7 @@ class SecurityDefaultAdminTest extends SapphireTest
$this->assertTrue(Permission::checkMember($admin, 'ADMIN'));
$this->assertEquals($admin->Email, DefaultAdminService::getDefaultAdminUsername());
$this->assertTrue(DefaultAdminService::isDefaultAdmin($admin->Email));
$this->assertNull($admin->Password);
$this->assertStringStartsWith('$2y$10$', $admin->Password);
$this->assertArrayHasKey($admin->PasswordEncryption, PasswordEncryptor::get_encryptors());
}
@ -92,7 +92,7 @@ class SecurityDefaultAdminTest extends SapphireTest
$this->assertTrue(Permission::checkMember($admin, 'ADMIN'));
$this->assertEquals('newadmin@example.com', $admin->Email);
$this->assertEquals('Admin Name', $admin->FirstName);
$this->assertNull($admin->Password);
$this->assertStringStartsWith('$2y$10$', $admin->Password);
}
public function testFindAnAdministratorWithoutDefaultAdmin()
@ -112,9 +112,8 @@ class SecurityDefaultAdminTest extends SapphireTest
$admin = $service->findOrCreateDefaultAdmin();
$this->assertTrue(Permission::checkMember($admin, 'ADMIN'));
// User should have Email but no Password
$this->assertEquals('admin', $admin->Email);
$this->assertEmpty($admin->Password);
$this->assertStringStartsWith('$2y$10$', $admin->Password);
}
public function testDefaultAdmin()
@ -127,6 +126,6 @@ class SecurityDefaultAdminTest extends SapphireTest
$this->assertTrue(Permission::checkMember($admin, 'ADMIN'));
$this->assertEquals($admin->Email, DefaultAdminService::getDefaultAdminUsername());
$this->assertTrue(DefaultAdminService::isDefaultAdmin($admin->Email));
$this->assertNull($admin->Password);
$this->assertStringStartsWith('$2y$10$', $admin->Password);
}
}