From f07258f3cfc6b833e8798bd4581e1b72a6618cee Mon Sep 17 00:00:00 2001 From: Simon Welsh Date: Thu, 12 Apr 2012 18:02:46 +1200 Subject: [PATCH] MINOR Update @package values to match renaming sapphire --- _config.php | 2 +- admin/code/LeftAndMainDecorator.php | 2 +- admin/css/screen.css | 4 ++-- admin/scss/_forms.scss | 2 +- admin/scss/_menu.scss | 2 +- api/DataFormatter.php | 2 +- api/FormEncodedDataFormatter.php | 2 +- api/JSONDataFormatter.php | 2 +- api/RSSFeed.php | 4 ++-- api/RestfulServer.php | 6 +++--- api/RestfulService.php | 4 ++-- api/SOAPModelAccess.php | 2 +- api/SapphireSoapServer.php | 2 +- api/VersionedRestfulServer.php | 2 +- api/XMLDataFormatter.php | 2 +- cache/Cache.php | 2 +- cli-script.php | 2 +- cli/CliController.php | 2 +- conf/ConfigureFromEnv.php | 2 +- control/ContentNegotiator.php | 2 +- control/Controller.php | 2 +- control/Cookie.php | 2 +- control/Director.php | 2 +- control/HTTP.php | 2 +- control/HTTPRequest.php | 2 +- control/HTTPResponse.php | 4 ++-- control/NullHTTPRequest.php | 2 +- control/RequestHandler.php | 2 +- control/Session.php | 2 +- core/ArrayLib.php | 2 +- core/ClassInfo.php | 2 +- core/Convert.php | 2 +- core/Core.php | 2 +- core/Diff.php | 18 +++++++++--------- core/Extension.php | 2 +- core/HTMLCleaner.php | 2 +- core/Object.php | 2 +- core/PaginatedList.php | 2 +- core/manifest/ClassLoader.php | 2 +- core/manifest/ClassManifest.php | 2 +- core/manifest/ConfigManifest.php | 2 +- core/manifest/ManifestFileFinder.php | 2 +- core/manifest/TemplateLoader.php | 2 +- core/manifest/TemplateManifest.php | 2 +- core/manifest/TokenisedRegularExpression.php | 2 +- css/GridField.css | 2 +- dev/Backtrace.php | 2 +- dev/BuildTask.php | 2 +- dev/BulkLoader.php | 4 ++-- dev/CSSContentParser.php | 2 +- dev/CSVParser.php | 2 +- dev/Cli.php | 2 +- dev/CliDebugView.php | 2 +- dev/CliTestReporter.php | 2 +- dev/CodeViewer.php | 2 +- dev/CsvBulkLoader.php | 2 +- dev/Debug.php | 2 +- dev/DebugView.php | 4 ++-- dev/Deprecation.php | 2 +- dev/DevelopmentAdmin.php | 2 +- dev/FunctionalTest.php | 2 +- dev/InstallerTest.php | 2 +- dev/JSTestRunner.php | 2 +- dev/Log.php | 2 +- dev/LogEmailWriter.php | 2 +- dev/LogErrorEmailFormatter.php | 2 +- dev/LogErrorFileFormatter.php | 2 +- dev/LogFileWriter.php | 2 +- dev/MigrationTask.php | 2 +- dev/ModelViewer.php | 10 +++++----- dev/Profiler.php | 2 +- dev/SapphireInfo.php | 2 +- dev/SapphireREPL.php | 2 +- dev/SapphireTest.php | 2 +- dev/SapphireTestReporter.php | 2 +- dev/SapphireTestSuite.php | 2 +- dev/SysLogWriter.php | 2 +- dev/TaskRunner.php | 2 +- dev/TestListener.php | 2 +- dev/TestMailer.php | 2 +- dev/TestOnly.php | 2 +- dev/TestRunner.php | 4 ++-- dev/TestSession.php | 4 ++-- dev/TestViewer.php | 2 +- dev/YamlFixture.php | 2 +- dev/ZendLog.php | 2 +- dev/install/DatabaseConfigurationHelper.php | 2 +- dev/phpunit/PhpUnitWrapper.php | 4 ++-- dev/phpunit/PhpUnitWrapper_3_4.php | 2 +- dev/phpunit/PhpUnitWrapper_3_5.php | 2 +- email/Email.php | 8 ++++---- email/Mailer.php | 2 +- filesystem/File.php | 2 +- filesystem/FileFinder.php | 2 +- filesystem/FileNameFilter.php | 2 +- filesystem/Filesystem.php | 2 +- filesystem/Folder.php | 2 +- filesystem/GD.php | 2 +- filesystem/Upload.php | 4 ++-- forms/DateField.php | 2 +- forms/DatetimeField.php | 2 +- forms/FormScaffolder.php | 2 +- forms/MemberDatetimeOptionsetField.php | 2 +- forms/MoneyField.php | 2 +- forms/NestedForm.php | 2 +- forms/UploadField.php | 4 ++-- forms/gridfield/GridField.php | 4 ++-- forms/gridfield/GridFieldAddNewButton.php | 2 +- forms/gridfield/GridFieldDataColumns.php | 2 +- forms/gridfield/GridFieldDeleteAction.php | 2 +- forms/gridfield/GridFieldExportButton.php | 2 +- forms/gridfield/GridFieldFilterHeader.php | 2 +- forms/gridfield/GridFieldFooter.php | 2 +- forms/gridfield/GridFieldPaginator.php | 2 +- forms/gridfield/GridFieldPrintButton.php | 2 +- forms/gridfield/GridFieldSortableHeader.php | 2 +- forms/gridfield/GridFieldToolbarHeader.php | 2 +- forms/gridfield/GridState.php | 2 +- i18n/i18n.php | 2 +- i18n/i18nEntityProvider.php | 2 +- i18n/i18nTextCollector.php | 2 +- lang/ar_SA.php | 2 +- lang/bg_BG.php | 2 +- lang/ca_AD.php | 2 +- lang/cs_CZ.php | 2 +- lang/da_DK.php | 2 +- lang/de_DE.php | 2 +- lang/en_GB.php | 2 +- lang/eo_XX.php | 2 +- lang/es_419.php | 2 +- lang/es_ES.php | 2 +- lang/es_MX.php | 2 +- lang/et_EE.php | 2 +- lang/fi_FI.php | 2 +- lang/fr_FR.php | 2 +- lang/he_IL.php | 2 +- lang/hr_HR.php | 2 +- lang/hu_HU.php | 2 +- lang/id_ID.php | 2 +- lang/it_IT.php | 2 +- lang/ja_JP.php | 2 +- lang/lc_XX.php | 2 +- lang/lt_LT.php | 2 +- lang/lv_LV.php | 2 +- lang/ms_MY.php | 2 +- lang/nb_NO.php | 2 +- lang/ne_NP.php | 2 +- lang/nl_NL.php | 2 +- lang/pl_PL.php | 2 +- lang/pt_BR.php | 2 +- lang/pt_PT.php | 2 +- lang/ru_RU.php | 2 +- lang/si_LK.php | 2 +- lang/sk_SK.php | 2 +- lang/sr_RS.php | 2 +- lang/sv_SE.php | 2 +- lang/tr_TR.php | 2 +- lang/zh_CN.php | 2 +- lang/zh_TW.php | 2 +- main.php | 4 ++-- main.php5 | 4 ++-- model/Aggregate.php | 4 ++-- model/ArrayList.php | 2 +- model/DB.php | 2 +- model/DataDifferencer.php | 2 +- model/DataExtension.php | 2 +- model/DataList.php | 2 +- model/DataObject.php | 2 +- model/DataObjectDecorator.php | 2 +- model/DataObjectInterface.php | 2 +- model/DataObjectSet.php | 2 +- model/Database.php | 4 ++-- model/DatabaseAdmin.php | 2 +- model/GroupedList.php | 2 +- model/HTMLValue.php | 2 +- model/HiddenClass.php | 2 +- model/Hierarchy.php | 2 +- model/Image.php | 4 ++-- model/List.php | 2 +- model/ListDecorator.php | 2 +- model/Map.php | 4 ++-- model/MySQLDatabase.php | 4 ++-- model/SQLMap.php | 2 +- model/SQLQuery.php | 2 +- model/Transliterator.php | 2 +- model/URLSegmentFilter.php | 2 +- model/ValidationException.php | 2 +- model/ValidationResult.php | 2 +- model/Versioned.php | 4 ++-- model/fieldtypes/Boolean.php | 2 +- model/fieldtypes/CompositeDBField.php | 2 +- model/fieldtypes/Currency.php | 2 +- model/fieldtypes/DBField.php | 2 +- model/fieldtypes/DBLocale.php | 2 +- model/fieldtypes/Date.php | 2 +- model/fieldtypes/Datetime.php | 2 +- model/fieldtypes/Decimal.php | 2 +- model/fieldtypes/Double.php | 2 +- model/fieldtypes/Enum.php | 2 +- model/fieldtypes/Float.php | 2 +- model/fieldtypes/ForeignKey.php | 2 +- model/fieldtypes/HTMLText.php | 2 +- model/fieldtypes/HTMLVarchar.php | 2 +- model/fieldtypes/Int.php | 2 +- model/fieldtypes/Money.php | 2 +- model/fieldtypes/MultiEnum.php | 4 ++-- model/fieldtypes/Percentage.php | 2 +- model/fieldtypes/PrimaryKey.php | 2 +- model/fieldtypes/StringField.php | 2 +- model/fieldtypes/Text.php | 2 +- model/fieldtypes/Time.php | 2 +- model/fieldtypes/Varchar.php | 2 +- model/fieldtypes/Year.php | 4 ++-- parsers/BBCodeParser.php | 2 +- parsers/HTML/BBCodeParser/Filter.php | 2 +- parsers/HTML/BBCodeParser/Filter/Basic.php | 4 ++-- .../HTML/BBCodeParser/Filter/EmailLinks.php | 4 ++-- parsers/HTML/BBCodeParser/Filter/Extended.php | 4 ++-- parsers/HTML/BBCodeParser/Filter/Images.php | 4 ++-- parsers/HTML/BBCodeParser/Filter/Links.php | 4 ++-- parsers/HTML/BBCodeParser/Filter/Lists.php | 4 ++-- parsers/HTML/HTMLBBCodeParser.php | 2 +- parsers/SQLFormatter.php | 2 +- parsers/ShortcodeParser.php | 2 +- parsers/TextParser.php | 2 +- scss/GridField.scss | 2 +- search/FulltextSearchable.php | 2 +- search/SearchContext.php | 2 +- search/filters/EndsWithFilter.php | 4 ++-- search/filters/ExactMatchFilter.php | 4 ++-- search/filters/ExactMatchMultiFilter.php | 4 ++-- search/filters/FulltextFilter.php | 4 ++-- search/filters/GreaterThanFilter.php | 2 +- search/filters/LessThanFilter.php | 2 +- search/filters/NegationFilter.php | 2 +- search/filters/PartialMatchFilter.php | 4 ++-- search/filters/SearchFilter.php | 2 +- search/filters/StartsWithFilter.php | 4 ++-- search/filters/StartsWithMultiFilter.php | 4 ++-- search/filters/SubstringFilter.php | 4 ++-- search/filters/WithinRangeFilter.php | 4 ++-- security/Authenticator.php | 2 +- security/BasicAuth.php | 2 +- security/ChangePasswordForm.php | 2 +- security/Group.php | 2 +- security/GroupCsvBulkLoader.php | 2 +- security/LoginAttempt.php | 2 +- security/LoginForm.php | 2 +- security/Member.php | 14 +++++++------- security/MemberAuthenticator.php | 2 +- security/MemberCsvBulkLoader.php | 2 +- security/MemberLoginForm.php | 2 +- security/MemberPassword.php | 2 +- security/PasswordEncryptor.php | 14 +++++++------- security/PasswordValidator.php | 2 +- security/Permission.php | 4 ++-- security/PermissionCheckboxSetField.php | 4 ++-- security/PermissionProvider.php | 2 +- security/PermissionRole.php | 2 +- security/PermissionRoleCode.php | 2 +- security/RandomGenerator.php | 2 +- security/Security.php | 2 +- security/SecurityToken.php | 2 +- tasks/DailyTask.php | 2 +- tasks/EncryptAllPasswordsTask.php | 2 +- tasks/FlushGeneratedImagesTask.php | 2 +- tasks/HourlyTask.php | 2 +- tasks/MonthlyTask.php | 2 +- tasks/QuarterHourlyTask.php | 2 +- tasks/ScheduledTask.php | 2 +- tasks/WeeklyTask.php | 2 +- tasks/YearlyTask.php | 2 +- tasks/i18nTextCollectorTask.php | 2 +- tests/FullTestSuite.php | 2 +- tests/MemoryLimitTest.php | 2 +- tests/PhpSyntaxTest.php | 2 +- tests/api/RSSFeedTest.php | 2 +- tests/api/RestfulServiceTest.php | 2 +- tests/api/SapphireSoapServerTest.php | 4 ++-- tests/api/SoapModelAccessTest.php | 2 +- tests/control/DirectorTest.php | 2 +- tests/control/HTTPResponseTest.php | 2 +- tests/control/HTTPTest.php | 2 +- tests/control/NullHTTPRequestTest.php | 2 +- tests/control/SessionTest.php | 2 +- tests/core/ArrayLibTest.php | 2 +- tests/core/ClassInfoTest.php | 2 +- tests/core/ConvertTest.php | 2 +- tests/core/CoreTest.php | 2 +- tests/core/HTMLCleanerTest.php | 2 +- tests/core/ObjectStaticTest.php | 2 +- tests/core/ObjectTest.php | 2 +- tests/core/manifest/ClassManifestTest.php | 2 +- tests/core/manifest/ManifestFileFinderTest.php | 2 +- .../manifest/NamespacedClassManifestTest.php | 2 +- tests/core/manifest/TemplateLoaderTest.php | 2 +- tests/core/manifest/TemplateManifestTest.php | 2 +- .../TokenisedRegularExpressionTest.php | 2 +- tests/dev/BacktraceTest.php | 2 +- tests/dev/LogTest.php | 2 +- tests/filesystem/FileFinderTest.php | 2 +- tests/filesystem/FileNameFilterTest.php | 2 +- tests/filesystem/FolderTest.php | 2 +- tests/filesystem/UploadTest.php | 2 +- tests/forms/CheckboxFieldTest.php | 2 +- tests/forms/CheckboxSetFieldTest.php | 2 +- tests/forms/ComplexTableFieldTest.php | 2 +- tests/forms/CompositeFieldTest.php | 2 +- tests/forms/ConfirmedPasswordFieldTest.php | 2 +- tests/forms/CurrencyFieldTest.php | 2 +- tests/forms/DateFieldTest.php | 2 +- tests/forms/DatefieldViewJQueryTest.php | 2 +- tests/forms/DatetimeFieldTest.php | 4 ++-- tests/forms/DropdownFieldTest.php | 2 +- tests/forms/FieldListTest.php | 2 +- tests/forms/FileFieldTest.php | 2 +- tests/forms/FormFieldTest.php | 2 +- tests/forms/FormScaffolderTest.php | 2 +- tests/forms/FormTest.php | 2 +- tests/forms/HtmlEditorConfigTest.php | 2 +- tests/forms/HtmlEditorFieldTest.php | 4 ++-- tests/forms/ListboxFieldTest.php | 2 +- tests/forms/LookupFieldTest.php | 2 +- .../forms/MemberDatetimeOptionsetFieldTest.php | 2 +- tests/forms/MoneyFieldTest.php | 2 +- tests/forms/NullableFieldTests.php | 2 +- tests/forms/OptionsetFieldTest.php | 2 +- tests/forms/RequirementsTest.php | 2 +- tests/forms/TimeFieldTest.php | 2 +- tests/forms/gridfield/GridFieldConfigTest.php | 2 +- tests/forms/uploadfield/UploadFieldTest.php | 2 +- tests/i18n/i18nTest.php | 2 +- tests/i18n/i18nTextCollectorTest.php | 2 +- tests/i18n/i18nTextCollectorTestMyObject.php | 2 +- .../i18n/i18nTextCollectorTestMySubObject.php | 2 +- tests/integration/HTMLValueTest.php | 2 +- tests/model/ArrayListTest.php | 2 +- tests/model/ComponentSetTest.php | 2 +- tests/model/CompositeDBFieldTest.php | 2 +- tests/model/CurrencyTest.php | 2 +- tests/model/DBFieldTest.php | 2 +- tests/model/DBLocaleTest.php | 2 +- tests/model/DataDifferencerTest.php | 2 +- tests/model/DataObjectTest.php | 2 +- tests/model/DatabaseTest.php | 2 +- tests/model/DateTest.php | 2 +- tests/model/DatetimeTest.php | 2 +- tests/model/DecimalTest.php | 4 ++-- tests/model/GroupedListTest.php | 2 +- tests/model/HTMLTextTest.php | 2 +- tests/model/ImageTest.php | 2 +- tests/model/LabelFieldTest.php | 2 +- tests/model/MoneyTest.php | 2 +- tests/model/MySQLDatabaseTest.php | 2 +- tests/model/PaginatedListTest.php | 2 +- tests/model/PercentageTest.php | 2 +- tests/model/StringFieldTest.php | 2 +- tests/model/TextTest.php | 2 +- tests/model/TransactionTest.php | 2 +- tests/model/URLSegmentFilterTest.php | 2 +- tests/parsers/SQLFormatterTest.php | 2 +- tests/parsers/ShortcodeParserTest.php | 2 +- tests/search/FulltextSearchableTest.php | 2 +- tests/search/SearchFilterApplyRelationTest.php | 2 +- tests/security/BasicAuthTest.php | 2 +- tests/security/GroupCsvBulkLoaderTest.php | 2 +- tests/security/GroupTest.php | 2 +- tests/security/MemberAuthenticatorTest.php | 2 +- tests/security/MemberCsvBulkLoaderTest.php | 2 +- tests/security/MemberTest.php | 2 +- tests/security/PasswordValidatorTest.php | 2 +- .../PermissionCheckboxSetFieldTest.php | 2 +- tests/security/PermissionRoleTest.php | 2 +- tests/security/RandomGeneratorTest.php | 2 +- tests/security/SecurityTest.php | 2 +- tests/security/SecurityTokenTest.php | 2 +- tests/tasks/EncryptAllPasswordsTaskTest.php | 2 +- tests/testing/CSSContentParserTest.php | 2 +- tests/view/ViewableDataTest.php | 2 +- view/ArrayData.php | 2 +- view/Requirements.php | 4 ++-- view/SSViewer.php | 4 ++-- view/TemplateGlobalProvider.php | 2 +- view/TemplateIteratorProvider.php | 2 +- view/ViewableData.php | 6 +++--- 385 files changed, 461 insertions(+), 461 deletions(-) diff --git a/_config.php b/_config.php index 992cbc707..3c8c49a66 100644 --- a/_config.php +++ b/_config.php @@ -13,7 +13,7 @@ * Authenticator::register_authenticator('OpenIDAuthenticator'); * * - * @package sapphire + * @package framework * @subpackage core */ diff --git a/admin/code/LeftAndMainDecorator.php b/admin/code/LeftAndMainDecorator.php index 60030549d..b9857dd08 100644 --- a/admin/code/LeftAndMainDecorator.php +++ b/admin/code/LeftAndMainDecorator.php @@ -1,6 +1,6 @@ a .jstree-pageicon { background-position: 0 -112px; } .cms-tree.multiple li > a > .jstree-icon { display: none; } .cms-tree.multiple li#record-0 > a .jstree-checkbox { display: none; } -/** Styles for the left hand side menu and header for the admin panels. Take into consideration CSS selector performance. @package sapphire @subpackage admin */ +/** Styles for the left hand side menu and header for the admin panels. Take into consideration CSS selector performance. @package framework @subpackage admin */ .cms-logo-header { background-color: #00111d; position: relative; padding: 9px 8px 0 4px; line-height: 24px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMTExZCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjMDAzMDUwIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAxMTFkIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00111d), color-stop(50%, #003050), color-stop(100%, #00111d)); background-image: -webkit-linear-gradient(#00111d, #003050, #00111d); background-image: -moz-linear-gradient(#00111d, #003050, #00111d); background-image: -o-linear-gradient(#00111d, #003050, #00111d); background-image: -ms-linear-gradient(#00111d, #003050, #00111d); background-image: linear-gradient(#00111d, #003050, #00111d); } .cms-logo-header span { color: white; white-space: nowrap; text-overflow: ellipsis; display: block; } .cms-logo-header span a { color: #3ebae0; display: inline; } diff --git a/admin/scss/_forms.scss b/admin/scss/_forms.scss index 680c77133..c41d72615 100644 --- a/admin/scss/_forms.scss +++ b/admin/scss/_forms.scss @@ -2,7 +2,7 @@ * This file defines common styles for form elements used throughout the CMS interface. * It is an addition to the base styles defined in framework/css/Form.css. * - * @package sapphire + * @package framework * @subpackage admin */ diff --git a/admin/scss/_menu.scss b/admin/scss/_menu.scss index c44891540..ca5ea07ad 100644 --- a/admin/scss/_menu.scss +++ b/admin/scss/_menu.scss @@ -3,7 +3,7 @@ * * Take into consideration CSS selector performance. * - * @package sapphire + * @package framework * @subpackage admin */ diff --git a/api/DataFormatter.php b/api/DataFormatter.php index b9cd14baa..1f7f88ae9 100644 --- a/api/DataFormatter.php +++ b/api/DataFormatter.php @@ -3,7 +3,7 @@ * A DataFormatter object handles transformation of data from SilverStripe model objects to a particular output format, and vice versa. * This is most commonly used in developing RESTful APIs. * - * @package sapphire + * @package framework * @subpackage formatters */ abstract class DataFormatter extends Object { diff --git a/api/FormEncodedDataFormatter.php b/api/FormEncodedDataFormatter.php index f9ddb847f..b9718cbe1 100644 --- a/api/FormEncodedDataFormatter.php +++ b/api/FormEncodedDataFormatter.php @@ -15,7 +15,7 @@ * * @author Cam Spiers * - * @package sapphire + * @package framework * @subpackage formatters */ class FormEncodedDataFormatter extends XMLDataFormatter { diff --git a/api/JSONDataFormatter.php b/api/JSONDataFormatter.php index d8bafe478..eb2eed9d3 100644 --- a/api/JSONDataFormatter.php +++ b/api/JSONDataFormatter.php @@ -1,6 +1,6 @@ * - * @package sapphire + * @package framework * @subpackage control */ class SS_HTTPResponse_Exception extends Exception { diff --git a/control/NullHTTPRequest.php b/control/NullHTTPRequest.php index c278ff6cc..0b9eead76 100644 --- a/control/NullHTTPRequest.php +++ b/control/NullHTTPRequest.php @@ -4,7 +4,7 @@ * Set on controllers on construction time, typically overwritten * by {@link Controller->handleRequest()} and {@link Controller->handleAction()} later on. * - * @package sapphire + * @package framework * @subpackage control */ class NullHTTPRequest extends SS_HTTPRequest { diff --git a/control/RequestHandler.php b/control/RequestHandler.php index 93d5f5dc9..f6cd39d15 100644 --- a/control/RequestHandler.php +++ b/control/RequestHandler.php @@ -25,7 +25,7 @@ * * {@link RequestHandler::handleRequest()} is where this behaviour is implemented. * - * @package sapphire + * @package framework * @subpackage control */ class RequestHandler extends ViewableData { diff --git a/control/Session.php b/control/Session.php index a67c57980..ab6b3432c 100644 --- a/control/Session.php +++ b/control/Session.php @@ -74,7 +74,7 @@ * @see Cookie * @todo This class is currently really basic and could do with a more well-thought-out implementation. * - * @package sapphire + * @package framework * @subpackage control */ diff --git a/core/ArrayLib.php b/core/ArrayLib.php index 3e348df95..8b82959ea 100644 --- a/core/ArrayLib.php +++ b/core/ArrayLib.php @@ -1,7 +1,7 @@ div { margin-bottom: 36px; } .cms .ss-gridfield[data-selectable] tr.ui-selected, .cms .ss-gridfield[data-selectable] tr.ui-selecting { background: #FFFAD6 !important; } .cms .ss-gridfield[data-selectable] td { cursor: pointer; } diff --git a/dev/Backtrace.php b/dev/Backtrace.php index e6f251136..04b7d169e 100644 --- a/dev/Backtrace.php +++ b/dev/Backtrace.php @@ -1,6 +1,6 @@ @silverstripe.com) */ @@ -252,7 +252,7 @@ abstract class BulkLoader extends ViewableData { * * @todo Refactor to support lazy-loaded DataObjectSets once they are implemented. * - * @package sapphire + * @package framework * @subpackage bulkloading * @author Ingo Schommer, Silverstripe Ltd. (@silverstripe.com) */ diff --git a/dev/CSSContentParser.php b/dev/CSSContentParser.php index 296423367..e068e61fa 100644 --- a/dev/CSSContentParser.php +++ b/dev/CSSContentParser.php @@ -13,7 +13,7 @@ * and falls back to the "tidy" CLI tool. If none of those exists, * the string is parsed directly without sanitization. * - * @package sapphire + * @package framework * @subpackage core */ class CSSContentParser extends Object { diff --git a/dev/CSVParser.php b/dev/CSVParser.php index c20ce4290..07df3f977 100644 --- a/dev/CSVParser.php +++ b/dev/CSVParser.php @@ -19,7 +19,7 @@ * } * * - * @package sapphire + * @package framework * @subpackage bulkloading */ class CSVParser extends Object implements Iterator { diff --git a/dev/Cli.php b/dev/Cli.php index 5219798ba..c5f3b4c2a 100644 --- a/dev/Cli.php +++ b/dev/Cli.php @@ -3,7 +3,7 @@ * Class to facilitate command-line output. * Support less-trivial output stuff such as colours (on xterm-color) * - * @package sapphire + * @package framework * @subpackage dev */ class SS_Cli extends Object { diff --git a/dev/CliDebugView.php b/dev/CliDebugView.php index d43f7def8..47b6d8a1a 100644 --- a/dev/CliDebugView.php +++ b/dev/CliDebugView.php @@ -3,7 +3,7 @@ * A basic HTML wrapper for stylish rendering of a developement info view. * Used to output error messages, and test results. * - * @package sapphire + * @package framework * @subpackage dev * * @todo Perhaps DebugView should be an interface / ABC, implemented by HTMLDebugView and CliDebugView? diff --git a/dev/CliTestReporter.php b/dev/CliTestReporter.php index 36fa70bbe..a633edb4a 100644 --- a/dev/CliTestReporter.php +++ b/dev/CliTestReporter.php @@ -2,7 +2,7 @@ /** * Test reporter optimised for CLI (ie, plain-text) output * - * @package sapphire + * @package framework * @subpackage testing */ class CliTestReporter extends SapphireTestReporter { diff --git a/dev/CodeViewer.php b/dev/CodeViewer.php index c54fe1822..797df709c 100644 --- a/dev/CodeViewer.php +++ b/dev/CodeViewer.php @@ -2,7 +2,7 @@ /** * Allows human reading of a test in a format suitable for agile documentation * - * @package sapphire + * @package framework * @subpackage tools */ class CodeViewer extends Controller { diff --git a/dev/CsvBulkLoader.php b/dev/CsvBulkLoader.php index 7812c30b7..4f17d62ee 100644 --- a/dev/CsvBulkLoader.php +++ b/dev/CsvBulkLoader.php @@ -4,7 +4,7 @@ * Uses the fgetcsv() function to process CSV input. Accepts a file-handler as input. * * @see http://rfc.net/rfc4180.html - * @package sapphire + * @package framework * @subpackage bulkloading * @author Ingo Schommer, Silverstripe Ltd. (@silverstripe.com) * diff --git a/dev/Debug.php b/dev/Debug.php index fbc90779a..e9a39ab38 100644 --- a/dev/Debug.php +++ b/dev/Debug.php @@ -19,7 +19,7 @@ * @todo add support for user defined config: Debug::die_on_notice(true | false) * @todo better way of figuring out the error context to display in highlighted source * - * @package sapphire + * @package framework * @subpackage dev */ class Debug { diff --git a/dev/DebugView.php b/dev/DebugView.php index 67d33cf20..404fb7e8e 100644 --- a/dev/DebugView.php +++ b/dev/DebugView.php @@ -1,6 +1,6 @@ * - * @package sapphire + * @package framework * @subpackage testing */ class FunctionalTest extends SapphireTest { diff --git a/dev/InstallerTest.php b/dev/InstallerTest.php index 13f280968..4b2c1b31c 100644 --- a/dev/InstallerTest.php +++ b/dev/InstallerTest.php @@ -1,7 +1,7 @@ * * - * @package sapphire + * @package framework * @subpackage testing */ class JSTestRunner extends Controller { diff --git a/dev/Log.php b/dev/Log.php index 806f34a64..61501a4cf 100644 --- a/dev/Log.php +++ b/dev/Log.php @@ -41,7 +41,7 @@ require_once 'Zend/Log.php'; * $logEmailWriter->setFormatter($myEmailFormatter); * * - * @package sapphire + * @package framework * @subpackage dev */ class SS_Log { diff --git a/dev/LogEmailWriter.php b/dev/LogEmailWriter.php index 3c14f95c5..32a0ce085 100644 --- a/dev/LogEmailWriter.php +++ b/dev/LogEmailWriter.php @@ -6,7 +6,7 @@ require_once 'Zend/Log/Writer/Abstract.php'; * * @see SS_Log for more information on using writers. * - * @package sapphire + * @package framework * @subpackage dev */ class SS_LogEmailWriter extends Zend_Log_Writer_Abstract { diff --git a/dev/LogErrorEmailFormatter.php b/dev/LogErrorEmailFormatter.php index 0b1df46c2..cf3c2930f 100644 --- a/dev/LogErrorEmailFormatter.php +++ b/dev/LogErrorEmailFormatter.php @@ -4,7 +4,7 @@ require_once 'Zend/Log/Formatter/Interface.php'; /** * Formats SS error emails with a basic layout. * - * @package sapphire + * @package framework * @subpackage dev */ class SS_LogErrorEmailFormatter implements Zend_Log_Formatter_Interface { diff --git a/dev/LogErrorFileFormatter.php b/dev/LogErrorFileFormatter.php index c4556a92b..30d1ad256 100644 --- a/dev/LogErrorFileFormatter.php +++ b/dev/LogErrorFileFormatter.php @@ -4,7 +4,7 @@ require_once 'Zend/Log/Formatter/Interface.php'; /** * Formats SS error entries in an error file log. * Format: [d-M-Y h:i:s] at line : - * @package sapphire + * @package framework * @subpackage dev */ class SS_LogErrorFileFormatter implements Zend_Log_Formatter_Interface { diff --git a/dev/LogFileWriter.php b/dev/LogFileWriter.php index 70410ff2d..8ef6c6c8a 100644 --- a/dev/LogFileWriter.php +++ b/dev/LogFileWriter.php @@ -11,7 +11,7 @@ require_once 'Zend/Log/Writer/Abstract.php'; * @uses error_log() built-in PHP function. * @see SS_Log for more information on using writers. * - * @package sapphire + * @package framework * @subpackage dev */ class SS_LogFileWriter extends Zend_Log_Writer_Abstract { diff --git a/dev/MigrationTask.php b/dev/MigrationTask.php index 0d5ab750b..9867ed469 100644 --- a/dev/MigrationTask.php +++ b/dev/MigrationTask.php @@ -44,7 +44,7 @@ * http://www.yoursite.com/dev/tasks/MyMigrationTask?isDev=1 * * - * @package sapphire + * @package framework * @subpackage dev */ class MigrationTask extends BuildTask { diff --git a/dev/ModelViewer.php b/dev/ModelViewer.php index d62ef85fc..c385adb53 100644 --- a/dev/ModelViewer.php +++ b/dev/ModelViewer.php @@ -5,7 +5,7 @@ * * Requirements: http://graphviz.org/ * - * @package sapphire + * @package framework * @subpackage tools */ class ModelViewer extends Controller { @@ -84,7 +84,7 @@ class ModelViewer extends Controller { } /** - * @package sapphire + * @package framework * @subpackage tools */ class ModelViewer_Module extends ModelViewer { @@ -116,7 +116,7 @@ class ModelViewer_Module extends ModelViewer { /** * Represents a single model in the model viewer * - * @package sapphire + * @package framework * @subpackage tools */ class ModelViewer_Model extends ViewableData { @@ -178,7 +178,7 @@ class ModelViewer_Model extends ViewableData { } /** - * @package sapphire + * @package framework * @subpackage tools */ class ModelViewer_Field extends ViewableData { @@ -194,7 +194,7 @@ class ModelViewer_Field extends ViewableData { } /** - * @package sapphire + * @package framework * @subpackage tools */ class ModelViewer_Relation extends ViewableData { diff --git a/dev/Profiler.php b/dev/Profiler.php index 47cfb8f38..5565b9655 100644 --- a/dev/Profiler.php +++ b/dev/Profiler.php @@ -10,7 +10,7 @@ /** * Execution time profiler. * - * @package sapphire + * @package framework * @subpackage misc */ class Profiler { diff --git a/dev/SapphireInfo.php b/dev/SapphireInfo.php index 05d5b867c..3cac2c486 100644 --- a/dev/SapphireInfo.php +++ b/dev/SapphireInfo.php @@ -1,7 +1,7 @@ * - * @package sapphire + * @package framework * @subpackage core * * @see http://code.google.com/p/spyc/ diff --git a/dev/ZendLog.php b/dev/ZendLog.php index 5c9cee289..7aec257a2 100644 --- a/dev/ZendLog.php +++ b/dev/ZendLog.php @@ -8,7 +8,7 @@ require_once 'Zend/Log.php'; * Please refer to {@link SS_Log} for information on * setting up logging for your projects. * - * @package sapphire + * @package framework * @subpackage dev */ class SS_ZendLog extends Zend_Log { diff --git a/dev/install/DatabaseConfigurationHelper.php b/dev/install/DatabaseConfigurationHelper.php index 12d4c294a..2a194c6b5 100644 --- a/dev/install/DatabaseConfigurationHelper.php +++ b/dev/install/DatabaseConfigurationHelper.php @@ -1,7 +1,7 @@ @silverstripe.com) * - * @package sapphire + * @package framework * @subpackage fields-formattedinput */ class MoneyField extends FormField { diff --git a/forms/NestedForm.php b/forms/NestedForm.php index 8fe059cac..7034afb24 100644 --- a/forms/NestedForm.php +++ b/forms/NestedForm.php @@ -3,7 +3,7 @@ * This is a form decorator that lets you place a form inside another form. * The actions will be appropriately rewritten so that the nested form gets called, rather than the parent form. * - * @package sapphire + * @package framework * @subpackage forms */ class NestedForm extends ViewableData { diff --git a/forms/UploadField.php b/forms/UploadField.php index 40eff2440..c387b7c80 100644 --- a/forms/UploadField.php +++ b/forms/UploadField.php @@ -20,7 +20,7 @@ * * * @author Zauberfisch - * @package sapphire + * @package framework * @subpackage forms */ class UploadField extends FileField { @@ -563,7 +563,7 @@ class UploadField extends FileField { * RequestHandler for actions (edit, remove, delete) on a single item (File) of the UploadField * * @author Zauberfisch - * @package sapphire + * @package framework * @subpackage forms */ class UploadField_ItemHandler extends RequestHandler { diff --git a/forms/gridfield/GridField.php b/forms/gridfield/GridField.php index 926a8ba62..299442fb3 100755 --- a/forms/gridfield/GridField.php +++ b/forms/gridfield/GridField.php @@ -15,7 +15,7 @@ * * @see SS_List * - * @package sapphire + * @package framework * @subpackage fields-relational */ class GridField extends FormField { @@ -732,7 +732,7 @@ class GridField extends FormField { * This class is the base class when you want to have an action that alters the state of the gridfield, * rendered as a button element. * - * @package sapphire + * @package framework * @subpackage forms * */ diff --git a/forms/gridfield/GridFieldAddNewButton.php b/forms/gridfield/GridFieldAddNewButton.php index 1e1aa1be5..fea43d6a4 100644 --- a/forms/gridfield/GridFieldAddNewButton.php +++ b/forms/gridfield/GridFieldAddNewButton.php @@ -2,7 +2,7 @@ /** * This component provides a button for opening the add new form provided by {@link GridFieldDetailForm}. * - * @package sapphire + * @package framework * @subpackage gridfield */ class GridFieldAddNewButton implements GridField_HTMLProvider { diff --git a/forms/gridfield/GridFieldDataColumns.php b/forms/gridfield/GridFieldDataColumns.php index 671555c6d..2b6594e55 100644 --- a/forms/gridfield/GridFieldDataColumns.php +++ b/forms/gridfield/GridFieldDataColumns.php @@ -3,7 +3,7 @@ * * @see GridField * - * @package sapphire + * @package framework * @subpackage fields-relational */ class GridFieldDataColumns implements GridField_ColumnProvider { diff --git a/forms/gridfield/GridFieldDeleteAction.php b/forms/gridfield/GridFieldDeleteAction.php index 3adc01338..62e32f007 100644 --- a/forms/gridfield/GridFieldDeleteAction.php +++ b/forms/gridfield/GridFieldDeleteAction.php @@ -10,7 +10,7 @@ * $action = new GridFieldDeleteAction(true); // removes the relation to object, instead of deleting * * - * @package sapphire + * @package framework * @subpackage gridfield */ class GridFieldDeleteAction implements GridField_ColumnProvider, GridField_ActionProvider { diff --git a/forms/gridfield/GridFieldExportButton.php b/forms/gridfield/GridFieldExportButton.php index db6e2b5c8..72074d8dd 100644 --- a/forms/gridfield/GridFieldExportButton.php +++ b/forms/gridfield/GridFieldExportButton.php @@ -1,6 +1,6 @@ - * @package sapphire + * @package framework * @subpackage misc */ class i18n extends Object implements TemplateGlobalProvider { diff --git a/i18n/i18nEntityProvider.php b/i18n/i18nEntityProvider.php index 1908b72fe..86ae9e9d0 100644 --- a/i18n/i18nEntityProvider.php +++ b/i18n/i18nEntityProvider.php @@ -10,7 +10,7 @@ * For any statics containing natural language, never use the static directly - * always wrap it in a getter. * - * @package sapphire + * @package framework * @subpackage i18n * @uses i18nTextCollector->collectFromEntityProviders() */ diff --git a/i18n/i18nTextCollector.php b/i18n/i18nTextCollector.php index 57702d4b5..dadb1d5e6 100644 --- a/i18n/i18nTextCollector.php +++ b/i18n/i18nTextCollector.php @@ -22,7 +22,7 @@ * * @author Bernat Foj Capell * @author Ingo Schommer - * @package sapphire + * @package framework * @subpackage i18n * @uses i18nEntityProvider * @uses i18n diff --git a/lang/ar_SA.php b/lang/ar_SA.php index d56701164..517bb8f0f 100644 --- a/lang/ar_SA.php +++ b/lang/ar_SA.php @@ -2,7 +2,7 @@ /** * Arabic (Saudi Arabia) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/bg_BG.php b/lang/bg_BG.php index c2a63d268..2ae2f9c37 100644 --- a/lang/bg_BG.php +++ b/lang/bg_BG.php @@ -2,7 +2,7 @@ /** * Bulgarian (Bulgaria) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/ca_AD.php b/lang/ca_AD.php index 10ed90975..93931fed6 100644 --- a/lang/ca_AD.php +++ b/lang/ca_AD.php @@ -2,7 +2,7 @@ /** * Catalan (Andorra) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/cs_CZ.php b/lang/cs_CZ.php index 06f752590..7247b59ca 100644 --- a/lang/cs_CZ.php +++ b/lang/cs_CZ.php @@ -2,7 +2,7 @@ /** * Czech (Czech Republic) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/da_DK.php b/lang/da_DK.php index 04259744e..ff0f61208 100644 --- a/lang/da_DK.php +++ b/lang/da_DK.php @@ -2,7 +2,7 @@ /** * Danish (Denmark) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/de_DE.php b/lang/de_DE.php index af78adff9..7ea075799 100644 --- a/lang/de_DE.php +++ b/lang/de_DE.php @@ -2,7 +2,7 @@ /** * German (Germany) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/en_GB.php b/lang/en_GB.php index 45969488d..16679a64b 100644 --- a/lang/en_GB.php +++ b/lang/en_GB.php @@ -2,7 +2,7 @@ /** * English (United Kingdom) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/eo_XX.php b/lang/eo_XX.php index fc7fce521..8c9818937 100644 --- a/lang/eo_XX.php +++ b/lang/eo_XX.php @@ -2,7 +2,7 @@ /** * Esperanto language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/es_419.php b/lang/es_419.php index 1b13d02bf..b9080f1c3 100644 --- a/lang/es_419.php +++ b/lang/es_419.php @@ -2,7 +2,7 @@ /** * language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/es_ES.php b/lang/es_ES.php index e4dd6ce39..490333bd7 100644 --- a/lang/es_ES.php +++ b/lang/es_ES.php @@ -2,7 +2,7 @@ /** * Spanish (Spain) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/es_MX.php b/lang/es_MX.php index 1659e4cc5..5081211d0 100644 --- a/lang/es_MX.php +++ b/lang/es_MX.php @@ -2,7 +2,7 @@ /** * Spanish (Mexico) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/et_EE.php b/lang/et_EE.php index c1ffde2bc..840512cd7 100644 --- a/lang/et_EE.php +++ b/lang/et_EE.php @@ -2,7 +2,7 @@ /** * Estonian (Estonia) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/fi_FI.php b/lang/fi_FI.php index 30de1d844..762bd3c3a 100644 --- a/lang/fi_FI.php +++ b/lang/fi_FI.php @@ -2,7 +2,7 @@ /** * Finnish (Finland) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/fr_FR.php b/lang/fr_FR.php index c924a53b2..07db1121a 100644 --- a/lang/fr_FR.php +++ b/lang/fr_FR.php @@ -2,7 +2,7 @@ /** * French (France) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/he_IL.php b/lang/he_IL.php index 3b9934493..e107b4df1 100644 --- a/lang/he_IL.php +++ b/lang/he_IL.php @@ -2,7 +2,7 @@ /** * Hebrew (Israel) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/hr_HR.php b/lang/hr_HR.php index 12b7bcf40..1f9c4525e 100644 --- a/lang/hr_HR.php +++ b/lang/hr_HR.php @@ -2,7 +2,7 @@ /** * Croatian (Croatia) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/hu_HU.php b/lang/hu_HU.php index 7e5ed18d2..a6c6b3556 100644 --- a/lang/hu_HU.php +++ b/lang/hu_HU.php @@ -2,7 +2,7 @@ /** * Hungarian (Hungary) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/id_ID.php b/lang/id_ID.php index f90939c0a..b241a97f5 100644 --- a/lang/id_ID.php +++ b/lang/id_ID.php @@ -2,7 +2,7 @@ /** * Indonesian (Indonesia) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/it_IT.php b/lang/it_IT.php index 53e0c5db5..d5f4b9c10 100644 --- a/lang/it_IT.php +++ b/lang/it_IT.php @@ -2,7 +2,7 @@ /** * Italian (Italy) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/ja_JP.php b/lang/ja_JP.php index af0000766..a3580b87c 100644 --- a/lang/ja_JP.php +++ b/lang/ja_JP.php @@ -2,7 +2,7 @@ /** * Japanese (Japan) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/lc_XX.php b/lang/lc_XX.php index e6d5d41a2..ac5ec868c 100644 --- a/lang/lc_XX.php +++ b/lang/lc_XX.php @@ -2,7 +2,7 @@ /** * LOLCAT language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/lt_LT.php b/lang/lt_LT.php index 0dbc19036..8a385078d 100644 --- a/lang/lt_LT.php +++ b/lang/lt_LT.php @@ -2,7 +2,7 @@ /** * Lithuanian (Lithuania) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/lv_LV.php b/lang/lv_LV.php index 3e3af5f9d..e1491ff01 100644 --- a/lang/lv_LV.php +++ b/lang/lv_LV.php @@ -2,7 +2,7 @@ /** * Latvian (Latvia) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/ms_MY.php b/lang/ms_MY.php index 008bbba1e..a9433a4de 100644 --- a/lang/ms_MY.php +++ b/lang/ms_MY.php @@ -2,7 +2,7 @@ /** * Malay (Malaysia) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/nb_NO.php b/lang/nb_NO.php index 8f7c7c305..d7edcdf47 100644 --- a/lang/nb_NO.php +++ b/lang/nb_NO.php @@ -2,7 +2,7 @@ /** * Norwegian Bokmal (Norway) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/ne_NP.php b/lang/ne_NP.php index 036e55f06..ac9b1f3b4 100644 --- a/lang/ne_NP.php +++ b/lang/ne_NP.php @@ -2,7 +2,7 @@ /** * Nepali (Nepal) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/nl_NL.php b/lang/nl_NL.php index a495d27bb..561ea779b 100644 --- a/lang/nl_NL.php +++ b/lang/nl_NL.php @@ -2,7 +2,7 @@ /** * Dutch (Netherlands) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/pl_PL.php b/lang/pl_PL.php index 08be35bad..3afbbe6d9 100644 --- a/lang/pl_PL.php +++ b/lang/pl_PL.php @@ -2,7 +2,7 @@ /** * Polish (Poland) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/pt_BR.php b/lang/pt_BR.php index d2f14dcb7..f965601cf 100644 --- a/lang/pt_BR.php +++ b/lang/pt_BR.php @@ -2,7 +2,7 @@ /** * Portuguese (Brazil) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/pt_PT.php b/lang/pt_PT.php index 3aa2d9c66..e6e393bbc 100644 --- a/lang/pt_PT.php +++ b/lang/pt_PT.php @@ -2,7 +2,7 @@ /** * Portuguese (Portugal) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/ru_RU.php b/lang/ru_RU.php index 32c580182..bb01acfa5 100644 --- a/lang/ru_RU.php +++ b/lang/ru_RU.php @@ -2,7 +2,7 @@ /** * Russian (Russia) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/si_LK.php b/lang/si_LK.php index 9152756e0..fd3049beb 100644 --- a/lang/si_LK.php +++ b/lang/si_LK.php @@ -2,7 +2,7 @@ /** * Sinhalese (Sri Lanka) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/sk_SK.php b/lang/sk_SK.php index df3e9b6bd..96f5e0ffd 100644 --- a/lang/sk_SK.php +++ b/lang/sk_SK.php @@ -2,7 +2,7 @@ /** * Slovak (Slovakia) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/sr_RS.php b/lang/sr_RS.php index ea3e8d326..db26b1719 100644 --- a/lang/sr_RS.php +++ b/lang/sr_RS.php @@ -2,7 +2,7 @@ /** * Serbian (Serbia) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/sv_SE.php b/lang/sv_SE.php index 6823feedc..09ed5123e 100644 --- a/lang/sv_SE.php +++ b/lang/sv_SE.php @@ -2,7 +2,7 @@ /** * Swedish (Sweden) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/tr_TR.php b/lang/tr_TR.php index 724ecc41d..77c46d92d 100644 --- a/lang/tr_TR.php +++ b/lang/tr_TR.php @@ -2,7 +2,7 @@ /** * Turkish (Turkey) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/zh_CN.php b/lang/zh_CN.php index 4bc3b1a03..313295ea6 100644 --- a/lang/zh_CN.php +++ b/lang/zh_CN.php @@ -2,7 +2,7 @@ /** * Chinese (China) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/lang/zh_TW.php b/lang/zh_TW.php index 2f23511c6..34ce7e70c 100644 --- a/lang/zh_TW.php +++ b/lang/zh_TW.php @@ -2,7 +2,7 @@ /** * Chinese (Taiwan) language pack - * @package sapphire + * @package framework * @subpackage i18n */ diff --git a/main.php b/main.php index cce10d1f6..c97f3c70c 100644 --- a/main.php +++ b/main.php @@ -10,7 +10,7 @@ ************************************************************************************/ /** - * @package sapphire + * @package framework * @subpackage core */ @@ -50,7 +50,7 @@ if (version_compare(phpversion(), '5.3.2', '<')) { * * On Apache, RewriteEngine can be used to do this. * - * @package sapphire + * @package framework * @subpackage core * @see Director::direct() */ diff --git a/main.php5 b/main.php5 index 8660f56f6..8e04d10cf 100644 --- a/main.php5 +++ b/main.php5 @@ -1,9 +1,9 @@ \ No newline at end of file +?> diff --git a/model/Aggregate.php b/model/Aggregate.php index e2fd134ff..a3fb965f7 100644 --- a/model/Aggregate.php +++ b/model/Aggregate.php @@ -30,7 +30,7 @@ * backend (and the two-level backend with the File backend as the slow store) meets this requirement * * @author hfried - * @package sapphire + * @package framework * @subpackage core */ class Aggregate extends ViewableData { @@ -129,7 +129,7 @@ class Aggregate extends ViewableData { * A subclass of Aggregate that calculates aggregates for the result of a has_many query. * * @author hfried - * @package sapphire + * @package framework * @subpackage core */ class Aggregate_Relationship extends Aggregate { diff --git a/model/ArrayList.php b/model/ArrayList.php index bfd18cf9a..d68192731 100644 --- a/model/ArrayList.php +++ b/model/ArrayList.php @@ -2,7 +2,7 @@ /** * A list object that wraps around an array of objects or arrays. * - * @package sapphire + * @package framework * @subpackage model */ class ArrayList extends ViewableData implements SS_List, SS_Filterable, SS_Sortable, SS_Limitable { diff --git a/model/DB.php b/model/DB.php index a71a6654e..ba4a0a4ba 100644 --- a/model/DB.php +++ b/model/DB.php @@ -3,7 +3,7 @@ * Global database interface, complete with static methods. * Use this class for interacting with the database. * - * @package sapphire + * @package framework * @subpackage model */ class DB { diff --git a/model/DataDifferencer.php b/model/DataDifferencer.php index 6e4bf13fa..5ca8cb4c3 100644 --- a/model/DataDifferencer.php +++ b/model/DataDifferencer.php @@ -30,7 +30,7 @@ * $diff->ignoreFields('AuthorID', 'Status'); * * - * @package sapphire + * @package framework * @subpackage misc */ class DataDifferencer extends ViewableData { diff --git a/model/DataExtension.php b/model/DataExtension.php index a45da057d..4216c148f 100644 --- a/model/DataExtension.php +++ b/model/DataExtension.php @@ -2,7 +2,7 @@ /** * An extension that adds additional functionality to a {@link DataObject}. * - * @package sapphire + * @package framework * @subpackage model */ abstract class DataExtension extends Extension { diff --git a/model/DataList.php b/model/DataList.php index c1bf57101..82dead0dc 100644 --- a/model/DataList.php +++ b/model/DataList.php @@ -3,7 +3,7 @@ * Implements a "lazy loading" DataObjectSet. * Uses {@link DataQuery} to do the actual query generation. * - * @package sapphire + * @package framework * @subpackage model */ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortable, SS_Limitable { diff --git a/model/DataObject.php b/model/DataObject.php index f796f31eb..a43ebf84b 100644 --- a/model/DataObject.php +++ b/model/DataObject.php @@ -63,7 +63,7 @@ * @todo Add instance specific removeExtension() which undos loadExtraStatics() * and defineMethods() * - * @package sapphire + * @package framework * @subpackage model */ class DataObject extends ViewableData implements DataObjectInterface, i18nEntityProvider { diff --git a/model/DataObjectDecorator.php b/model/DataObjectDecorator.php index f21cdd277..051f29059 100644 --- a/model/DataObjectDecorator.php +++ b/model/DataObjectDecorator.php @@ -1,6 +1,6 @@ value pairs generated from database queries. * The query isn't actually executed until you need it. * - * @package sapphire + * @package framework * @subpackage model */ class SQLMap extends Object implements IteratorAggregate { diff --git a/model/SQLQuery.php b/model/SQLQuery.php index 6d66e1cc9..968314b06 100644 --- a/model/SQLQuery.php +++ b/model/SQLQuery.php @@ -7,7 +7,7 @@ * * @todo Add support for INSERT and UPDATE queries * - * @package sapphire + * @package framework * @subpackage model */ class SQLQuery { diff --git a/model/Transliterator.php b/model/Transliterator.php index 23d28656c..f443c5e61 100644 --- a/model/Transliterator.php +++ b/model/Transliterator.php @@ -10,7 +10,7 @@ * $ascii = $tr->toASCII($unicode); * * - * @package sapphire + * @package framework * @subpackage model */ class Transliterator extends Object { diff --git a/model/URLSegmentFilter.php b/model/URLSegmentFilter.php index 3796b37ef..5d64ddd45 100644 --- a/model/URLSegmentFilter.php +++ b/model/URLSegmentFilter.php @@ -1,6 +1,6 @@ * - * @package sapphire + * @package framework * @subpackage model */ interface CompositeDBField { diff --git a/model/fieldtypes/Currency.php b/model/fieldtypes/Currency.php index 5d0d2b6ec..3864d4e4a 100644 --- a/model/fieldtypes/Currency.php +++ b/model/fieldtypes/Currency.php @@ -12,7 +12,7 @@ * ); * * - * @package sapphire + * @package framework * @subpackage model */ class Currency extends Decimal { diff --git a/model/fieldtypes/DBField.php b/model/fieldtypes/DBField.php index 12e9714c8..ec4ef5145 100644 --- a/model/fieldtypes/DBField.php +++ b/model/fieldtypes/DBField.php @@ -23,7 +23,7 @@ * } * * - * @package sapphire + * @package framework * @subpackage model */ abstract class DBField extends ViewableData { diff --git a/model/fieldtypes/DBLocale.php b/model/fieldtypes/DBLocale.php index 7ef22f68d..ae17c2c38 100644 --- a/model/fieldtypes/DBLocale.php +++ b/model/fieldtypes/DBLocale.php @@ -4,7 +4,7 @@ * * @todo Allowing showing locale values in different languages through Nice() * - * @package sapphire + * @package framework * @subpackage i18n */ class DBLocale extends Varchar { diff --git a/model/fieldtypes/Date.php b/model/fieldtypes/Date.php index 804fad3a1..f7630236f 100644 --- a/model/fieldtypes/Date.php +++ b/model/fieldtypes/Date.php @@ -15,7 +15,7 @@ * * @todo Add localization support, see http://open.silverstripe.com/ticket/2931 * - * @package sapphire + * @package framework * @subpackage model */ class Date extends DBField { diff --git a/model/fieldtypes/Datetime.php b/model/fieldtypes/Datetime.php index e36aba716..b29831bed 100644 --- a/model/fieldtypes/Datetime.php +++ b/model/fieldtypes/Datetime.php @@ -20,7 +20,7 @@ * * @todo Add localization support, see http://open.silverstripe.com/ticket/2931 * - * @package sapphire + * @package framework * @subpackage model */ class SS_Datetime extends Date { diff --git a/model/fieldtypes/Decimal.php b/model/fieldtypes/Decimal.php index 4ccd2bf7b..2c34b03f6 100644 --- a/model/fieldtypes/Decimal.php +++ b/model/fieldtypes/Decimal.php @@ -1,7 +1,7 @@ * - * @package sapphire + * @package framework * @subpackage model */ class Percentage extends Decimal { diff --git a/model/fieldtypes/PrimaryKey.php b/model/fieldtypes/PrimaryKey.php index 8e3a9d6df..897a7f31c 100644 --- a/model/fieldtypes/PrimaryKey.php +++ b/model/fieldtypes/PrimaryKey.php @@ -4,7 +4,7 @@ * * @todo Allow for custom limiting/filtering of scaffoldFormField dropdown * - * @package sapphire + * @package framework * @subpackage model */ class PrimaryKey extends Int { diff --git a/model/fieldtypes/StringField.php b/model/fieldtypes/StringField.php index 62683c12d..92a536ac3 100644 --- a/model/fieldtypes/StringField.php +++ b/model/fieldtypes/StringField.php @@ -1,7 +1,7 @@ */ @@ -32,7 +32,7 @@ require_once 'HTML/BBCodeParser/Filter.php'; /** - * @package sapphire + * @package framework * @subpackage misc */ class SSHTMLBBCodeParser_Filter_Basic extends SSHTMLBBCodeParser_Filter diff --git a/parsers/HTML/BBCodeParser/Filter/EmailLinks.php b/parsers/HTML/BBCodeParser/Filter/EmailLinks.php index fb7aaa471..342e880d2 100644 --- a/parsers/HTML/BBCodeParser/Filter/EmailLinks.php +++ b/parsers/HTML/BBCodeParser/Filter/EmailLinks.php @@ -20,7 +20,7 @@ // /** - * @package sapphire + * @package framework * @subpackage misc * @author Stijn de Reede */ @@ -34,7 +34,7 @@ require_once 'HTML/BBCodeParser/Filter.php'; /** - * @package sapphire + * @package framework * @subpackage misc */ class SSHTMLBBCodeParser_Filter_EmailLinks extends SSHTMLBBCodeParser_Filter diff --git a/parsers/HTML/BBCodeParser/Filter/Extended.php b/parsers/HTML/BBCodeParser/Filter/Extended.php index 8b2aa2fd4..8276b90a4 100644 --- a/parsers/HTML/BBCodeParser/Filter/Extended.php +++ b/parsers/HTML/BBCodeParser/Filter/Extended.php @@ -20,7 +20,7 @@ // /** - * @package sapphire + * @package framework * @subpackage misc * @author Stijn de Reede */ @@ -32,7 +32,7 @@ require_once 'HTML/BBCodeParser/Filter.php'; /** - * @package sapphire + * @package framework * @subpackage misc */ class SSHTMLBBCodeParser_Filter_Extended extends SSHTMLBBCodeParser_Filter diff --git a/parsers/HTML/BBCodeParser/Filter/Images.php b/parsers/HTML/BBCodeParser/Filter/Images.php index 2104396ab..976632de1 100644 --- a/parsers/HTML/BBCodeParser/Filter/Images.php +++ b/parsers/HTML/BBCodeParser/Filter/Images.php @@ -20,7 +20,7 @@ // /** - * @package sapphire + * @package framework * @subpackage misc * @author Stijn de Reede */ @@ -30,7 +30,7 @@ require_once 'HTML/BBCodeParser/Filter.php'; /** - * @package sapphire + * @package framework * @subpackage misc */ class SSHTMLBBCodeParser_Filter_Images extends SSHTMLBBCodeParser_Filter diff --git a/parsers/HTML/BBCodeParser/Filter/Links.php b/parsers/HTML/BBCodeParser/Filter/Links.php index 3a9d7632e..eaec427b7 100644 --- a/parsers/HTML/BBCodeParser/Filter/Links.php +++ b/parsers/HTML/BBCodeParser/Filter/Links.php @@ -20,7 +20,7 @@ // /** - * @package sapphire + * @package framework * @subpackage misc * @author Stijn de Reede */ @@ -30,7 +30,7 @@ require_once 'HTML/BBCodeParser/Filter.php'; /** - * @package sapphire + * @package framework * @subpackage misc */ class SSHTMLBBCodeParser_Filter_Links extends SSHTMLBBCodeParser_Filter diff --git a/parsers/HTML/BBCodeParser/Filter/Lists.php b/parsers/HTML/BBCodeParser/Filter/Lists.php index ed05498d0..93d7eb6eb 100644 --- a/parsers/HTML/BBCodeParser/Filter/Lists.php +++ b/parsers/HTML/BBCodeParser/Filter/Lists.php @@ -21,7 +21,7 @@ /** - * @package sapphire + * @package framework * @subpackage misc * @author Stijn de Reede */ @@ -31,7 +31,7 @@ require_once 'HTML/BBCodeParser/Filter.php'; /** - * @package sapphire + * @package framework * @subpackage misc */ class SSHTMLBBCodeParser_Filter_Lists extends SSHTMLBBCodeParser_Filter diff --git a/parsers/HTML/HTMLBBCodeParser.php b/parsers/HTML/HTMLBBCodeParser.php index 137cb5036..f1ee1af2b 100644 --- a/parsers/HTML/HTMLBBCodeParser.php +++ b/parsers/HTML/HTMLBBCodeParser.php @@ -21,7 +21,7 @@ // Modified by SilverStripe silverstripe.com /** - * @package sapphire + * @package framework * @subpackage misc * @author Stijn de Reede , SilverStripe * diff --git a/parsers/SQLFormatter.php b/parsers/SQLFormatter.php index 539f0addd..29f8b3a59 100644 --- a/parsers/SQLFormatter.php +++ b/parsers/SQLFormatter.php @@ -5,7 +5,7 @@ * is not aware of the SQL syntax. This means we have to be conservative * with modifying the SQL string. * - * @package sapphire + * @package framework * @subpackage parsers * @author Ingo Schommer, Silverstripe Ltd. (@silverstripe.com) */ diff --git a/parsers/ShortcodeParser.php b/parsers/ShortcodeParser.php index 1ade0864d..dc31b10b1 100644 --- a/parsers/ShortcodeParser.php +++ b/parsers/ShortcodeParser.php @@ -49,7 +49,7 @@ * [/shortcode] * * - * @package sapphire + * @package framework * @subpackage misc */ class ShortcodeParser { diff --git a/parsers/TextParser.php b/parsers/TextParser.php index 9f8f89afb..1c9075b3e 100644 --- a/parsers/TextParser.php +++ b/parsers/TextParser.php @@ -22,7 +22,7 @@ * Again, @see BBCodeParser for an example of the syntax * * @todo Define a proper syntax for (or refactor) usable_tags that can be extended as needed. - * @package sapphire + * @package framework * @subpackage misc */ abstract class TextParser extends Object { diff --git a/scss/GridField.scss b/scss/GridField.scss index c795dab47..adfa1f50f 100644 --- a/scss/GridField.scss +++ b/scss/GridField.scss @@ -1,7 +1,7 @@ /** * Core styles for the basic GridField form field without any specific style. * - * @package sapphire + * @package framework * @subpackage scss * @todo Add radial gradient to default delete button state * @todo Create SASS mixin-function to simply swap the from/to, to to/from colours in grsdient mixins? diff --git a/search/FulltextSearchable.php b/search/FulltextSearchable.php index d3449c444..0cd900e0f 100644 --- a/search/FulltextSearchable.php +++ b/search/FulltextSearchable.php @@ -11,7 +11,7 @@ * * @see http://doc.silverstripe.org/tutorial:4-site-search * - * @package sapphire + * @package framework * @subpackage search */ class FulltextSearchable extends DataExtension { diff --git a/search/SearchContext.php b/search/SearchContext.php index b9306aa98..5b9a05c08 100644 --- a/search/SearchContext.php +++ b/search/SearchContext.php @@ -20,7 +20,7 @@ * * @see http://doc.silverstripe.com/doku.php?id=searchcontext * -* @package sapphire +* @package framework * @subpackage search */ class SearchContext extends Object { diff --git a/search/filters/EndsWithFilter.php b/search/filters/EndsWithFilter.php index 79d4375e2..6dbfb3736 100644 --- a/search/filters/EndsWithFilter.php +++ b/search/filters/EndsWithFilter.php @@ -1,6 +1,6 @@ "abcd" # false * * - * @package sapphire + * @package framework * @subpackage search */ class EndsWithFilter extends SearchFilter { diff --git a/search/filters/ExactMatchFilter.php b/search/filters/ExactMatchFilter.php index a614a6c04..d6fbdc32a 100644 --- a/search/filters/ExactMatchFilter.php +++ b/search/filters/ExactMatchFilter.php @@ -1,6 +1,6 @@ * - * @package sapphire + * @package framework * @subpackage search */ class FulltextFilter extends SearchFilter { diff --git a/search/filters/GreaterThanFilter.php b/search/filters/GreaterThanFilter.php index 756f74779..5d9b753cc 100644 --- a/search/filters/GreaterThanFilter.php +++ b/search/filters/GreaterThanFilter.php @@ -4,7 +4,7 @@ * * @todo documentation * - * @package sapphire + * @package framework * @subpackage search */ class GreaterThanFilter extends SearchFilter { diff --git a/search/filters/LessThanFilter.php b/search/filters/LessThanFilter.php index ac38d0349..b327d1555 100644 --- a/search/filters/LessThanFilter.php +++ b/search/filters/LessThanFilter.php @@ -4,7 +4,7 @@ * * @todo documentation * - * @package sapphire + * @package framework * @subpackage search */ class LessThanFilter extends SearchFilter { diff --git a/search/filters/NegationFilter.php b/search/filters/NegationFilter.php index 9a1f776d1..2cec7c41f 100755 --- a/search/filters/NegationFilter.php +++ b/search/filters/NegationFilter.php @@ -2,7 +2,7 @@ /** * Matches on rows where the field is not equal to the given value. * - * @package sapphire + * @package framework * @subpackage search */ class NegationFilter extends SearchFilter { diff --git a/search/filters/PartialMatchFilter.php b/search/filters/PartialMatchFilter.php index 1237cefe0..a37775cce 100644 --- a/search/filters/PartialMatchFilter.php +++ b/search/filters/PartialMatchFilter.php @@ -1,13 +1,13 @@ "abcd" # true * * - * @package sapphire + * @package framework * @subpackage search */ class StartsWithFilter extends SearchFilter { diff --git a/search/filters/StartsWithMultiFilter.php b/search/filters/StartsWithMultiFilter.php index 7d6909292..4e36b078d 100644 --- a/search/filters/StartsWithMultiFilter.php +++ b/search/filters/StartsWithMultiFilter.php @@ -1,6 +1,6 @@ - * @package sapphire + * @package framework * @subpackage security */ abstract class Authenticator extends Object { diff --git a/security/BasicAuth.php b/security/BasicAuth.php index 2bad329f0..368f6e66a 100644 --- a/security/BasicAuth.php +++ b/security/BasicAuth.php @@ -8,7 +8,7 @@ * It also has a function to protect your entire site. See {@link BasicAuth::protect_entire_site()} * for more information. You can control this setting on controller-level by using {@link Controller->basicAuthEnabled}. * - * @package sapphire + * @package framework * @subpackage security */ class BasicAuth { diff --git a/security/ChangePasswordForm.php b/security/ChangePasswordForm.php index 77872cc7b..cb218e6f0 100644 --- a/security/ChangePasswordForm.php +++ b/security/ChangePasswordForm.php @@ -1,7 +1,7 @@ Arg and Permission->Type values * - * @package sapphire + * @package framework * @subpackage security */ class GroupCsvBulkLoader extends CsvBulkLoader { diff --git a/security/LoginAttempt.php b/security/LoginAttempt.php index 4a9e47a41..b86767def 100644 --- a/security/LoginAttempt.php +++ b/security/LoginAttempt.php @@ -12,7 +12,7 @@ * complies with your privacy standards. We're logging * username and IP. * - * @package sapphire + * @package framework * @subpackage security */ class LoginAttempt extends DataObject { diff --git a/security/LoginForm.php b/security/LoginForm.php index 63c1be4e4..e3bc0274f 100644 --- a/security/LoginForm.php +++ b/security/LoginForm.php @@ -6,7 +6,7 @@ * {@link MemberLoginForm} or {@link OpenIDLoginForm}. * * @author Markus Lanthaler - * @package sapphire + * @package framework * @subpackage security */ abstract class LoginForm extends Form { diff --git a/security/Member.php b/security/Member.php index 0633ae4cd..c589cf840 100644 --- a/security/Member.php +++ b/security/Member.php @@ -2,7 +2,7 @@ /** * The member class which represents the users of the system * - * @package sapphire + * @package framework * @subpackage security */ class Member extends DataObject implements TemplateGlobalProvider { @@ -1385,7 +1385,7 @@ class Member extends DataObject implements TemplateGlobalProvider { /** * Represents a set of Groups attached to a member. * Handles the hierarchy logic. - * @package sapphire + * @package framework * @subpackage security */ class Member_GroupSet extends ManyManyList { @@ -1427,7 +1427,7 @@ class Member_GroupSet extends ManyManyList { /** * Form for editing a member profile. - * @package sapphire + * @package framework * @subpackage security */ class Member_ProfileForm extends Form { @@ -1482,7 +1482,7 @@ class Member_ProfileForm extends Form { /** * Class used as template to send an email to new members - * @package sapphire + * @package framework * @subpackage security */ class Member_SignupEmail extends Email { @@ -1532,7 +1532,7 @@ class Member_SignupEmail extends Email { /** * Class used as template to send an email saying that the password has been * changed - * @package sapphire + * @package framework * @subpackage security */ class Member_ChangePasswordEmail extends Email { @@ -1550,7 +1550,7 @@ class Member_ChangePasswordEmail extends Email { /** * Class used as template to send the forgot password email - * @package sapphire + * @package framework * @subpackage security */ class Member_ForgotPasswordEmail extends Email { @@ -1566,7 +1566,7 @@ class Member_ForgotPasswordEmail extends Email { /** * Member Validator - * @package sapphire + * @package framework * @subpackage security */ class Member_Validator extends RequiredFields { diff --git a/security/MemberAuthenticator.php b/security/MemberAuthenticator.php index 40dd9de05..feade8caa 100644 --- a/security/MemberAuthenticator.php +++ b/security/MemberAuthenticator.php @@ -3,7 +3,7 @@ * Authenticator for the default "member" method * * @author Markus Lanthaler - * @package sapphire + * @package framework * @subpackage security */ class MemberAuthenticator extends Authenticator { diff --git a/security/MemberCsvBulkLoader.php b/security/MemberCsvBulkLoader.php index 4bce9f77a..67940d9b9 100644 --- a/security/MemberCsvBulkLoader.php +++ b/security/MemberCsvBulkLoader.php @@ -3,7 +3,7 @@ * Imports member records, and checks/updates duplicates based on their * 'Email' property. * - * @package sapphire + * @package framework * @subpackage security */ class MemberCsvBulkLoader extends CsvBulkLoader { diff --git a/security/MemberLoginForm.php b/security/MemberLoginForm.php index f85263992..0299e181f 100644 --- a/security/MemberLoginForm.php +++ b/security/MemberLoginForm.php @@ -1,7 +1,7 @@ * - * @package sapphire + * @package framework * @subpackage security */ class PasswordValidator extends Object { diff --git a/security/Permission.php b/security/Permission.php index a1157e682..74dabc372 100644 --- a/security/Permission.php +++ b/security/Permission.php @@ -1,7 +1,7 @@ * * @todo Improve documentation - * @package sapphire + * @package framework * @subpackage cron */ abstract class ScheduledTask extends CliController { diff --git a/tasks/WeeklyTask.php b/tasks/WeeklyTask.php index b8735234c..2d99d2ac2 100644 --- a/tasks/WeeklyTask.php +++ b/tasks/WeeklyTask.php @@ -6,7 +6,7 @@ * they need to be triggered by an external automation tool like unix cron. * See {@link ScheduledTask} for details. * - * @package sapphire + * @package framework * @subpackage cron */ class WeeklyTask extends ScheduledTask { diff --git a/tasks/YearlyTask.php b/tasks/YearlyTask.php index c5da364f5..392de1a5f 100644 --- a/tasks/YearlyTask.php +++ b/tasks/YearlyTask.php @@ -6,7 +6,7 @@ * they need to be triggered by an external automation tool like unix cron. * See {@link ScheduledTask} for details. * - * @package sapphire + * @package framework * @subpackage cron */ class YearlyTask extends ScheduledTask { diff --git a/tasks/i18nTextCollectorTask.php b/tasks/i18nTextCollectorTask.php index d423d3314..c04c3de0f 100644 --- a/tasks/i18nTextCollectorTask.php +++ b/tasks/i18nTextCollectorTask.php @@ -1,6 +1,6 @@ setValues()}. Need to check diff --git a/tests/forms/FileFieldTest.php b/tests/forms/FileFieldTest.php index a4ee34920..83bf22d57 100644 --- a/tests/forms/FileFieldTest.php +++ b/tests/forms/FileFieldTest.php @@ -1,6 +1,6 @@ testCastingHelpers()} for more tests related to casting and ViewableData behaviour, * from a template-parsing perspective. * - * @package sapphire + * @package framework * @subpackage tests */ class ViewableDataTest extends SapphireTest { diff --git a/view/ArrayData.php b/view/ArrayData.php index 3cf28609d..549a953b5 100644 --- a/view/ArrayData.php +++ b/view/ArrayData.php @@ -9,7 +9,7 @@ * )); * * - * @package sapphire + * @package framework * @subpackage view */ class ArrayData extends ViewableData { diff --git a/view/Requirements.php b/view/Requirements.php index b3b908edb..00d439af7 100644 --- a/view/Requirements.php +++ b/view/Requirements.php @@ -4,7 +4,7 @@ * Requirements tracker, for javascript and css. * @todo Document the requirements tracker, and discuss it with the others. * - * @package sapphire + * @package framework * @subpackage view */ class Requirements { @@ -313,7 +313,7 @@ class Requirements { } /** - * @package sapphire + * @package framework * @subpackage view */ class Requirements_Backend { diff --git a/view/SSViewer.php b/view/SSViewer.php index 4a5dffbb5..d0207431b 100644 --- a/view/SSViewer.php +++ b/view/SSViewer.php @@ -470,7 +470,7 @@ class SSViewer_DataPresenter extends SSViewer_Scope { * @see http://doc.silverstripe.org/themes * @see http://doc.silverstripe.org/themes:developing * - * @package sapphire + * @package framework * @subpackage view */ class SSViewer { @@ -897,7 +897,7 @@ class SSViewer { /** * Special SSViewer that will process a template passed as a string, rather than a filename. - * @package sapphire + * @package framework * @subpackage view */ class SSViewer_FromString extends SSViewer { diff --git a/view/TemplateGlobalProvider.php b/view/TemplateGlobalProvider.php index 8a522c66b..c3e5bf464 100644 --- a/view/TemplateGlobalProvider.php +++ b/view/TemplateGlobalProvider.php @@ -4,7 +4,7 @@ * * Director::AbsoluteBaseURL is an example of this. * - * @package sapphire + * @package framework * @subpackage core */ interface TemplateGlobalProvider { diff --git a/view/TemplateIteratorProvider.php b/view/TemplateIteratorProvider.php index 8f01639ee..4bbb47b88 100644 --- a/view/TemplateIteratorProvider.php +++ b/view/TemplateIteratorProvider.php @@ -5,7 +5,7 @@ * * SSViewer_BasicIteratorSupport is an example of this. See also @TemplateGlobalProvider * - * @package sapphire + * @package framework * @subpackage core */ interface TemplateIteratorProvider { diff --git a/view/ViewableData.php b/view/ViewableData.php index dfeaccce9..913bfd835 100644 --- a/view/ViewableData.php +++ b/view/ViewableData.php @@ -6,7 +6,7 @@ * is provided and automatically escaped by ViewableData. Any class that needs to be available to a view (controllers, * {@link DataObject}s, page controls) should inherit from this class. * - * @package sapphire + * @package framework * @subpackage view */ class ViewableData extends Object implements IteratorAggregate { @@ -576,7 +576,7 @@ class ViewableData extends Object implements IteratorAggregate { } /** - * @package sapphire + * @package framework * @subpackage view */ class ViewableData_Customised extends ViewableData { @@ -648,7 +648,7 @@ class ViewableData_Customised extends ViewableData { /** * Allows you to render debug information about a {@link ViewableData} object into a template. * - * @package sapphire + * @package framework * @subpackage view */ class ViewableData_Debugger extends ViewableData {