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 remote-tracking branch 'origin/4.0' into 4.1

Browse Source
This commit is contained in:
Damian Mooyman 2018-03-13 14:26:18 +13:00
commit 625f7b4eee
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
10 changed files with 156 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
.upgrade.yml
View File

@ -974,10 +974,10 @@ warnings:
message: 'Now needs a $segment property to run it'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#buildtask-segment'
'RestfulService':
message: 'Removed from core, please use Guzzle'
message: 'Removed from core. Please use Guzzle'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#restfulservice'
'Oembed':
message: 'Removed from core, please use third party lib'
message: 'Removed from core. Please use third party lib'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#oembed'
'SS_Cache':
message: 'Using symfony/cache now'
@ -1015,15 +1015,6 @@ warnings:
'EncryptAllPasswordsTask':
message: 'Removed'
methods:
'setFilename()':
message: 'Filenames should not be set directly any more'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#write-file-dataobject'
'SilverStripe\Assets\File::handle_shortcode()':
message: 'Has been removed'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#file-shortcode'
'database_fields()':
message: 'Does not have a second parameter any more'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#dataobject-db-database-fields'
'SilverStripe\Security\Authenticator::register()':
message: 'Custom authenticators work differently now'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#custom-authenticators'
@ -1032,89 +1023,114 @@ warnings:
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#custom-authenticators'
'SilverStripe\Control\Director::setUrlParams()':
message: 'Method removed'
'manyManyComponent()':
message: 'DataObject->manyManyComponent() moved to DataObjectSchema, access through getSchema()'
'belongsToComponent()':
message: 'DataObject->belongsToComponent() moved to DataObjectSchema, access through getSchema()'
'hasOneComponent()':
message: 'DataObject->hasOneComponent() moved to DataObjectSchema, access through getSchema()'
'hasManyComponent()':
message: 'DataObject->hasManyComponent() moved to DataObjectSchema, access through getSchema()'
'getRemoteJoinField()':
message: 'DataObject->getRemoteJoinField() moved to DataObjectSchema, access through getSchema()'
'has_own_table()':
message: 'DataObject::has_own_table() moved to DataObjectSchema->classHasTable(), access through getSchema()'
'database_fields()':
message: 'DataObject::database_fields() moved to DataObjectSchema->databaseFields(), access through getSchema()'
'database_fields()':
message: 'DataObject::database_fields() moved to DataObjectSchema->databaseFields(), access through getSchema()'
'manyManyExtraFieldsForComponent()':
message: 'DataObject::manyManyExtraFieldsForComponent() moved to DataObjectSchema, access through getSchema()'
'validateModelDefinitions()':
'SilverStripe\ORM\DataObject->manyManyComponent()':
message: 'DataObject->manyManyComponent() moved to DataObjectSchema. Access through getSchema(). You must manually add static::class as the first argument to manyManyComponent()'
replacement: 'getSchema()->manyManyComponent'
'SilverStripe\ORM\DataObject->belongsToComponent()':
message: 'DataObject->belongsToComponent() moved to DataObjectSchema. Access through getSchema(). You must manually add static::class as the first argument to belongsToComponent()'
replacement: 'getSchema()->belongsToComponent'
'SilverStripe\ORM\DataObject->hasOneComponent()':
message: 'DataObject->hasOneComponent() moved to DataObjectSchema. Access through getSchema(). You must manually add static::class as the first argument to hasOneComponent()'
replacement: 'getSchema()->hasOneComponent'
'SilverStripe\ORM\DataObject->hasManyComponent()':
message: 'DataObject->hasManyComponent() moved to DataObjectSchema. Access through getSchema(). You must manually add static::class as the first argument to getRemoteJoinField()'
replacement: 'getSchema()->hasManyComponent'
'SilverStripe\ORM\DataObject->getRemoteJoinField()':
message: 'DataObject->getRemoteJoinField() moved to DataObjectSchema. Access through getSchema(). You must manually add static::class as the first argument to getRemoteJoinField()'
replacement: 'getSchema()->getRemoteJoinField'
'SilverStripe\ORM\DataObject::has_own_table()':
message: 'DataObject::has_own_table() moved to DataObjectSchema->classHasTable(). Access through getSchema().'
replacement: 'getSchema()->classHasTable'
'SilverStripe\ORM\DataObject::database_fields()':
message: 'DataObject::database_fields() moved to DataObjectSchema->databaseFields(). Access through getSchema()'
replacement: 'getSchema()->databaseFields'
'SilverStripe\ORM\DataObject->manyManyExtraFieldsForComponent()':
message: 'DataObject::manyManyExtraFieldsForComponent() moved to DataObjectSchema. Access through getSchema(). You must manually add static::class as the first argument to manyManyExtraFieldsForComponent()'
replacement: 'getSchema()->manyManyExtraFieldsForComponent'
'SilverStripe\ORM\DataObject->validateModelDefinitions()':
message: 'Removed DataObject->validateModelDefinitions()'
'hasOwnTableDatabaseField()':
message: 'DataObject->hasOwnTableDatabaseField() has been replaced with DataObjectSchema::fieldSpec(), access through getSchema()'
'SilverStripe\ORM\DataObject->hasOwnTableDatabaseField()':
message: 'DataObject->hasOwnTableDatabaseField() has been replaced with DataObjectSchema::fieldSpec(). Access through getSchema()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#dataobject-has-own'
'has_own_table_database_field()':
message: 'DataObject::has_own_table_database_field() has been replaced with DataObjectSchema::fieldSpec(), access through getSchema()'
'SilverStripe\ORM\DataObject::has_own_table_database_field()':
message: 'DataObject::has_own_table_database_field() has been replaced with DataObjectSchema::fieldSpec(). Access through getSchema()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#dataobject-has-own'
'hasDatabaseFields()':
message: 'DataObject->hasDatabaseFields() has been replaced with DataObjectSchema::fieldSpec(), access through getSchema()'
'SilverStripe\ORM\DataObject->hasDatabaseField()':
message: 'DataObject->hasDatabaseField() has been replaced with DataObjectSchema::fieldSpec(). Access through getSchema()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#dataobject-has-own'
'is_composite_field()':
'SilverStripe\ORM\DataObject::is_composite_field()':
message: 'Removed DataObject::is_composite_field. Use DataObjectSchema::compositeField instead.'
'custom_database_fields()':
replacement: 'getSchema()->compositeField'
'SilverStripe\ORM\DataObject::custom_database_fields()':
message: 'Removed DataObject::custom_database_fields. Use DataObjectSchema::databaseFields'
replacement: 'getSchema()->databaseFields'
'SilverStripe\Dev\SapphireTest->setUpOnce()':
message: 'Renamed to setUpBeforeClass()'
replacement: setUpBeforeClass
'SilverStripe\Dev\SapphireTest->tearDownOnce()':
message: 'Renamed to tearDownAfterClass()'
replacement: tearDownAfterClass
'SilverStripe\Dev\SapphireTest::is_running_tests()':
message: 'is_running_tests() is no longer public and user code should not rely on this. Test-specific behaviour should be implemented in setUp() and tearDown()'
'SilverStripe\Dev\SapphireTest::using_temp_db()':
message: 'Moved to SilverStripe\ORM\Connect\TempDatabase->isUsed()'
replacement: '$tempDB->isUsed'
'SilverStripe\Dev\SapphireTest::kill_temp_db()':
message: 'Moved to SilverStripe\ORM\Connect\TempDatabase->kill()'
replacement: '$tempDB->kill'
'SilverStripe\Dev\SapphireTest::empty_temp_db()':
message: 'Moved to SilverStripe\ORM\Connect\TempDatabase->clearAllData()'
replacement: '$tempDB->clearAllData'
'SilverStripe\Dev\SapphireTest::create_temp_db()':
message: 'Moved to SilverStripe\ORM\Connect\TempDatabase->build()'
replacement: '$tempDB->build'
'SilverStripe\Dev\SapphireTest::delete_all_temp_dbs()':
message: 'Moved to SilverStripe\ORM\Connect\TempDatabase->deleteAll()'
replacement: '$tempDB->deleteAll'
'SilverStripe\Dev\SapphireTest::resetDBSchema()':
message: 'Moved to SilverStripe\ORM\Connect\TempDatabase->resetSchema()'
'populateTemplate()':
replacement: '$tempDB->resetSchema'
'SilverStripe\Control\Email\Email->populateTemplate()':
message: 'Email->populateTemplate() has been replaced with Email->setData()'
replacement: 'setData'
'SilverStripe\Control\Email\Email->setTemplate()':
message: 'Renamed to setHTMLTemplate()'
replacement: 'setHTMLTemplate'
'SilverStripe\i18n\i18n::get_language_name()':
message: 'moved to SilverStripe\i18n\Data\Locales::localeName()'
'SilverStripe\i18n\i18n::get_locale_name()':
message: 'moved to SilverStripe\i18n\Data\Locales::languageName()'
replacement: 'getData()->languageName'
'SilverStripe\i18n\i18n::get_locale_name()':
message: 'moved to SilverStripe\i18n\Data\Locales::localeName()'
replacement: 'getData()->localeName'
'SilverStripe\i18n\i18n::get_language_code()':
message: 'Removed'
'SilverStripe\i18n\i18n::get_common_languages()':
message: 'moved to SilverStripe\i18n\Data\Locales::getLanguages()'
replacement: 'getData()->getLanguages'
'SilverStripe\i18n\i18n::get_common_locales()':
message: 'Removed'
message: 'Removed, but you can use SilverStripe\i18n\Data\Locales::getLocales() instead'
replacement: 'getData()->getLocales'
'SilverStripe\i18n\i18n::get_existing_translations()':
message: 'moved to SilverStripe\i18n\Data\Sources::getKnownLocales()'
'SilverStripe\i18n\i18n::get_owner_module()':
message: 'moved to SilverStripe\Core\Manifest\ClassManifest::getOwnerModule()'
replacement: 'getSources()->getKnownLocales'
'SilverStripe\i18n\i18n::get_owner_module()':
message: 'moved to SilverStripe\Core\Manifest\ClassManifest::getOwnerModule()'
'SilverStripe\i18n\i18n::validate_locale()':
message: 'moved to SilverStripe\i18n\Data\Locales::validate()'
replacement: 'getData()->validate'
'SilverStripe\i18n\i18n::get_lang_from_locale()':
message: 'moved to SilverStripe\i18n\Data\Locales::langFromLocale()'
replacement: 'getData()->langFromLocale'
'SilverStripe\i18n\i18n::get_locale_from_lang()':
message: 'moved to SilverStripe\i18n\Data\Locales::localeFromLang()'
replacement: 'getData()->localeFromLang'
'SilverStripe\i18n\i18n::get_tinymce_lang()':
message: 'moved to SilverStripe\Forms\HTMLEditor\TinyMCEConfig::get_tinymce_lang()'
'SilverStripe\ORM\Hierarchy->getChildrenAsUL()':
message: 'Replaced with renderChildren()'
message: 'Replaced with MarkedSet::renderChildren()'
'SilverStripe\Security\Permission::flush_permission_cache()':
message: 'Renamed to reset()'
replacement: 'reset'
'SilverStripe\View\SSViewer::set_source_file_comments()':
message: 'Removed'
'SilverStripe\View\SSViewer::get_source_file_comments()':
@ -1144,14 +1160,13 @@ warnings:
'SilverStripe\Forms\Validator->validate()':
message: 'now returns a `ValidationResult` instance'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#form-validation'
'Requirements::delete_combined_files()':
'SilverStripe\View\Requirements::delete_combined_files()':
message: 'Removed'
'SilverStripe\Security\PermissionCheckboxSetField::getAssignedPermissionCodes()':
message: 'Removed'
'dontEscape()':
message: 'FormField::dontEscape() has been removed. Escaping is now managed on a class by class basis.'
'SilverStripe\Forms\CompositeField::setID()':
message: 'ID is generated from name indirectly; Use SilverStripe\Form\FormField::setName() instead'
replacement: 'setName'
'SilverStripe\Forms\FormField::createTag()':
message: 'moved to SilverStripe\View\HTML->createTag()'
'SilverStripe\Forms\Form->transformTo()':
@ -1178,104 +1193,76 @@ warnings:
message: 'Use setMessage() or sessionMessage() instead'
'SilverStripe\Forms\Form->buttonClicked()':
message: 'Moved to FormRequestHandler'
replacement: 'getRequestHandler()->buttonClicked'
'SilverStripe\Forms\Form->checkAccessAction()':
message: 'Moved to FormRequestHandler'
replacement: 'getRequestHandler()->checkAccessAction'
'SilverStripe\Forms\Form->handleField()':
message: 'Moved to FormRequestHandler'
replacement: 'getRequestHandler()->handleField'
'SilverStripe\Forms\Form->httpSubmission()':
message: 'Moved to FormRequestHandler'
replacement: 'getRequestHandler()->httpSubmission'
'SilverStripe\Forms\Form->Link()':
message: 'Moved to FormRequestHandler'
'requireField()':
message: 'Validator::requireField() has been removed, use RequiredFields instead'
replacement: 'getRequestHandler()->Link'
'SilverStripe\Forms\Validator::requireField()':
message: 'Validator::requireField() has been removed. Use RequiredFields instead'
'provideI18nEntities()':
message: 'Return type has changed (needs to be associative)'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#i18n'
'SilverStripe\View\Requirements_Backend::get_combined_files_enabled()':
message: 'Renamed to getCombinedFilesEnabledO()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'getCombinedFilesEnabled'
'SilverStripe\View\Requirements_Backend::set_combined_files_enabled()':
message: 'Renamed to setCombinedFilesEnabledO()'
message: 'Renamed to setCombinedFilesEnabled()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'setCombinedFilesEnabled'
'SilverStripe\View\Requirements_Backend::get_suffix_requirements()':
message: 'Renamed to getSuffixRequirements()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'getSuffixRequirements'
'SilverStripe\View\Requirements_Backend::set_suffix_requirements()':
message: 'Renamed to setSuffixRequirements()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'setSuffixRequirements'
'SilverStripe\View\Requirements_Backend::get_custom_scripts()':
message: 'Renamed to getCustomScripts()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'getCustomScripts'
'SilverStripe\View\Requirements_Backend::unblock_all()':
message: 'Renamed to unblockAll()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'unblockAll'
'SilverStripe\View\Requirements_Backend::include_in_response()':
message: 'Renamed to includeInResponse()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'includeInResponse'
'SilverStripe\View\Requirements_Backend::combine_files()':
message: 'Renamed to getCombinedFiles()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'getCombinedFiles'
'SilverStripe\View\Requirements_Backend::get_combine_files()':
message: 'Renamed to unblockAll()'
message: 'Renamed to getCombinedFiles()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'getCombinedFiles'
'SilverStripe\View\Requirements_Backend::clear_combined_files()':
message: 'Renamed to clearCombinedFiles()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'clearCombinedFiles'
'SilverStripe\View\Requirements_Backend::process_combined_files()':
message: 'Renamed to processCombinedFiles()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'processCombinedFiles'
'SilverStripe\View\Requirements_Backend::set_write_js_to_body()':
message: 'Renamed to setWriteJavascriptToBody()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'setWriteJavascriptToBody'
'SilverStripe\View\Requirements_Backend::set_force_js_to_bottom()':
message: 'Renamed to setForceJSToBottom()'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
'SilverStripe\Assets\Filesystem::sync()':
message: 'Removed'
'SilverStripe\Assets\Folder::syncChildren()':
message: 'Removed'
'SilverStripe\Assets\Folder::constructChild()':
message: 'Removed'
'SilverStripe\Assets\Folder::addUploadToFolder()':
message: 'Removed'
'SilverStripe\Assets\File::deletedatabaseOnly()':
message: 'Removed'
'SilverStripe\Assets\File::link_shortcode_handler()':
message: 'Removed'
'SilverStripe\Assets\File::getRelativePath()':
message: 'Removed'
'SilverStripe\Assets\File::getFullPath()':
message: 'Removed'
'SilverStripe\Assets\File::setParentID()':
message: 'Removed'
'SilverStripe\Assets\Image::regenerateFormattedImages()':
message: 'Removed'
'SilverStripe\Assets\Image::getGeneratedImages()':
message: 'Removed'
'SilverStripe\Assets\Image::deleteFormattedImages()':
message: 'Removed'
'SilverStripe\Assets\Image::handle_shortcode()':
message: 'moved to SilverStripe\Assets\Shortcodes\ImageShortcodeProvider::handle_shortcode()'
'SilverStripe\Assets\Image::deleteFormattedImages()':
message: 'Removed'
'SilverStripe\Assets\Image::SetRatioSize()':
message: 'Renamed to Fit()'
'SilverStripe\Assets\Image::SetWidth()':
message: 'Renamed to ScaleWidth()'
'SilverStripe\Assets\Image::SetHeight()':
message: 'Renamed to ScaleHeight'
'SilverStripe\Assets\Image::SetSize()':
message: 'Renamed to Pad()'
'SilverStripe\Assets\Image::PaddedImage()':
message: 'Renamed to Pad()'
'SilverStripe\Assets\Image::CroppedImage()':
message: 'Renamed to Fill()'
'SilverStripe\Assets\Image::AssetLibraryPreview()':
message: 'Renamed to PreviewThumbnail()'
'SilverStripe\Assets\Image::AssetLibraryThumbnail()':
message: 'Renamed to CMSThumbnail()'
'SilverStripe\Assets\Image::deleteFormattedImages()':
message: 'Removed'
replacement: 'setForceJSToBottom'
'SilverStripe\AssetAdmin\Controller\AssetAdmin::deleteunusedthumbnails()':
message: 'Removed'
'SilverStripe\AssetAdmin\Controller\AssetAdmin::getUnusedThumbnails()':
@ -1284,6 +1271,7 @@ warnings:
message: 'Apply validation to MoneyField instead'
'SilverStripe\ORM\Hierarchy\Hierarchy->doAllChildrenIncludingDeleted':
message: 'Use AllChildrenIncludingDeleted() instead'
replacement: 'AllChildrenIncludingDeleted'
'past_date()':
message: 'Removed SilverStripe\ORM\FieldType\DBDate->past_date()'
'prior_monday()':
@ -1302,22 +1290,31 @@ warnings:
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#object-replace'
'SilverStripe\Dev\SapphireTest->requiredExtensions':
message: 'Renamed to required_extensions'
replacement: 'required_extensions'
'SilverStripe\Dev\SapphireTest->extraDataobjects':
message: 'Renamed to extra_dataobjects'
replacement: 'extra_dataobjects'
'SilverStripe\Dev\SapphireTest->extraControllers':
message: 'Renamed to extra_controllers'
replacement: 'extra_controllers'
'SilverStripe\View\Requirements_Backend->combine_files':
message: 'Renamed to combineFiles'
replacement: 'combineFiles'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
'SilverStripe\View\Requirements_Backend->combine_js_with_min':
message: 'Renamed to $minifyCombinedFiles'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'minifyCombinedFiles'
'SilverStripe\View\Requirements_Backend->write_header_comments':
message: 'Renamed to writeHeaderComment'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'writeHeaderComment'
'SilverStripe\View\Requirements_Backend->write_js_to_body':
message: 'Renamed to writeJavascriptToBody'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#requirements'
replacement: 'writeJavascriptToBody'
'SilverStripe\Forms\Formfield->dontEscape':
message: 'FormField::$dontEscape has been removed. Escaping is now managed on a class by class basis.'
functions:
'file_get_contents()':
message: 'Use new asset abstraction'
@ -1335,41 +1332,41 @@ warnings:
'SS_TRUSTED_PROXY_HOST_HEADER':
message: 'See TrustedProxyMiddleware'
'MODULES_PATH':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'MODULES_DIR':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'FRAMEWORK_PATH':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'FRAMEWORK_DIR':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'CMS_PATH':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'CMS_DIR':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'FRAMEWORK_ADMIN_PATH':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'FRAMEWORK_ADMIN_DIR':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'FRAMEWORK_ADMIN_THIRDPARTY_DIR':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'THEMES_PATH':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'THEMES_DIR':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'THIRDPARTY_PATH':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
'THIRDPARTY_DIR':
message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
message: 'Path constants have been deprecated. Use the Requirements and ModuleResourceLoader APIs'
url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'

11
docs/en/02_Developer_Guides/09_Security/05_Rate_Limiting.md
View File

@ -44,6 +44,15 @@ Director:
'MyController//$Action/$ID/$OtherID': '%$MyRateLimitedController'
```
Or if you want to apply your middleware to a specific route:
```yml
SilverStripe\Control\Director:
rules:
special/section:
Controller: %$MyRateLimitedController
```
## Applying rate limiting across an entire application
If you'd like to add rate limiting to an entire application (ie: across all routes) then you'll need to define your rate
@ -69,4 +78,4 @@ Add the following to your config.yml:
SilverStripe\Control\Director:
rules:
'Security//$Action/$ID/$OtherID': SilverStripe\Security\Security
```
```

6
docs/en/02_Developer_Guides/10_Email/index.md
View File

@ -154,12 +154,12 @@ Configuration of those properties looks like the following:
**mysite/_config.php**
```php
use SilverStripe\Control\Director;
use SilverStripe\Control\Email\Email;
use SilverStripe\Core\Config\Config;
if(Director::isLive()) {
Config::inst()->update('Email', 'bcc_all_emails_to', "client@example.com");
Config::modify()->set(Email::class, 'bcc_all_emails_to', "client@example.com");
} else {
Config::inst()->update('Email', 'send_all_emails_to', "developer@example.com");
Config::modify()->set(Email::class, 'send_all_emails_to', "developer@example.com");
}
```

3
src/Forms/FileUploadReceiver.php
View File

@ -188,8 +188,9 @@ trait FileUploadReceiver
// Filter items by what's allowed to be viewed
$filteredItems = new ArrayList();
$fileIDs = array();
/** @var File $file */
foreach ($items as $file) {
if ($file->exists() && $file->canView()) {
if ($file->isInDB() && $file->canView()) {
$filteredItems->push($file);
$fileIDs[] = $file->ID;
}

1
src/Forms/FormField.php
View File

@ -7,7 +7,6 @@ use SilverStripe\Control\Controller;
use SilverStripe\Control\RequestHandler;
use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Convert;
use SilverStripe\Dev\Deprecation;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DataObjectInterface;
use SilverStripe\ORM\FieldType\DBField;

20
src/Logging/DetailedErrorFormatter.php
View File

@ -31,16 +31,18 @@ class DetailedErrorFormatter implements FormatterInterface
}
}
$trace = debug_backtrace();
if (!isset($context['trace'])) {
$trace = debug_backtrace();
// Filter out monolog plumbing from the trace
// If the context file & line isn't found in the trace, then the trace is most likely
// call to the fatal error handler and is not useful, so exclude it entirely
$i = $this->findInTrace($trace, $context['file'], $context['line']);
if ($i !== null) {
$context['trace'] = array_slice($trace, $i);
} else {
$context['trace'] = null;
// Filter out monolog plumbing from the trace
// If the context file & line isn't found in the trace, then the trace is most likely
// call to the fatal error handler and is not useful, so exclude it entirely
$i = $this->findInTrace($trace, $context['file'], $context['line']);
if ($i !== null) {
$context['trace'] = array_slice($trace, $i);
} else {
$context['trace'] = null;
}
}
}

2
src/ORM/FieldType/DBText.php
View File

@ -198,7 +198,7 @@ class DBText extends DBString
$keywords = Convert::raw2xml($keywords);
// Find the search string
$position = (int) mb_stripos($text, $keywords);
$position = empty($keywords) ? 0 : (int) mb_stripos($text, $keywords);
// We want to search string to be in the middle of our block to give it some context
$position = max(0, $position - ($characters / 2));

3
src/Security/Member.php
View File

@ -946,8 +946,9 @@ class Member extends DataObject
{
parent::onAfterDelete();
//prevent orphaned records remaining in the DB
// prevent orphaned records remaining in the DB
$this->deletePasswordLogs();
$this->Groups()->removeAll();
}
/**

26
src/Security/MemberAuthenticator/ChangePasswordHandler.php
View File

@ -115,21 +115,19 @@ class ChangePasswordHandler extends RequestHandler
}
// Show a friendly message saying the login token has expired
if ($token !== null && $member && !$member->validateAutoLoginToken($token)) {
$message = [
'Content' => DBField::create_field(
'HTMLFragment',
_t(
'SilverStripe\\Security\\Security.NOTERESETLINKINVALID',
'<p>The password reset link is invalid or expired.</p>'
. '<p>You can request a new one <a href="{link1}">here</a> or change your password after'
. ' you <a href="{link2}">logged in</a>.</p>',
[
'link1' => $this->link('lostpassword'),
'link2' => $this->link('login')
]
)
$message = DBField::create_field(
'HTMLFragment',
_t(
'SilverStripe\\Security\\Security.NOTERESETLINKINVALID',
'<p>The password reset link is invalid or expired.</p>'
. '<p>You can request a new one <a href="{link1}">here</a> or change your password after'
. ' you <a href="{link2}">logged in</a>.</p>',
[
'link1' => $this->link('lostpassword'),
'link2' => $this->link('login')
]
)
];
);
return [
'Content' => $message,

7
tests/php/ORM/DBTextTest.php
View File

@ -263,6 +263,13 @@ class DBTextTest extends SapphireTest
'schön',
// check UTF8 support
'both <mark>schön</mark> and können...',
],
[
'both schön and können have umlauts',
21,
'',
// check non existant search term
'both schön and können...',
]