On "live" environments, the `?isDev=1` solution is preferred, as it means that your other visitors don't see ugly
diff --git a/docs/en/reference/cms-architecture.md b/docs/en/reference/cms-architecture.md
index 9caeca734..525f420a8 100644
--- a/docs/en/reference/cms-architecture.md
+++ b/docs/en/reference/cms-architecture.md
@@ -231,7 +231,7 @@ in a single Ajax request.
:::php
// mysite/code/MyAdmin.php
class MyAdmin extends LeftAndMain {
- static $url_segment = 'myadmin';
+ private static $url_segment = 'myadmin';
public function getResponseNegotiator() {
$negotiator = parent::getResponseNegotiator();
$controller = $this;
diff --git a/docs/en/reference/dataextension.md b/docs/en/reference/dataextension.md
index d16b55b0e..c3fb1b3a6 100644
--- a/docs/en/reference/dataextension.md
+++ b/docs/en/reference/dataextension.md
@@ -52,10 +52,10 @@ The function should return a map where the keys are the names of the static vari
:::php
class CustomMember extends DataExtension {
- static $db = array(
+ private static $db = array(
'AvatarURL' => 'Varchar',
);
- static $has_one = array(
+ private static $has_one = array(
'RelatedMember' => 'Member',
);
}
@@ -127,9 +127,9 @@ extended by.
:::php
class Customer extends DataObject {
- static $has_one = array('Account'=>'Account');
+ private static $has_one = array('Account'=>'Account');
- static $extensions = array(
+ private static $extensions = array(
'CustomerWorkflow'
);
@@ -137,11 +137,11 @@ extended by.
class Account extends DataObject {
- static $db = array(
+ private static $db = array(
'IsMarkedForDeletion'=>'Boolean'
);
- static $has_many = array('Customers'=>'Customer');
+ private static $has_many = array('Customers'=>'Customer');
}
diff --git a/docs/en/reference/dataobject.md b/docs/en/reference/dataobject.md
index b9602d308..3b26d4b6c 100644
--- a/docs/en/reference/dataobject.md
+++ b/docs/en/reference/dataobject.md
@@ -79,7 +79,7 @@ Example: Simple Definition
:::php
class MyDataObject extends DataObject {
- static $searchable_fields = array(
+ private static $searchable_fields = array(
'Name',
'ProductCode'
);
@@ -92,7 +92,7 @@ on `$searchable_fields`:
:::php
class MyDataObject extends DataObject {
- static $searchable_fields = array(
+ private static $searchable_fields = array(
'Name' => 'PartialMatchFilter',
'ProductCode' => 'NumericField'
);
@@ -104,7 +104,7 @@ assign an array:
:::php
class MyDataObject extends DataObject {
- static $searchable_fields = array(
+ private static $searchable_fields = array(
'Name' => array(
'field' => 'TextField',
'filter' => 'PartialMatchFilter',
@@ -122,23 +122,23 @@ To include relations (''$has_one'', `$has_many` and `$many_many`) in your search
:::php
class Team extends DataObject {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar'
);
- static $many_many = array(
+ private static $many_many = array(
'Players' => 'Player'
);
- static $searchable_fields = array(
+ private static $searchable_fields = array(
'Title',
'Players.Name',
);
}
class Player extends DataObject {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
'Birthday' => 'Date'
);
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
'Teams' => 'Team'
);
}
@@ -159,12 +159,12 @@ Example: Simple Definition
:::php
class MyDataObject extends DataObject {
- static $db = array(
+ private static $db = array(
'Name' => 'Text',
'OtherProperty' => 'Text',
'ProductCode' => 'Int',
);
- static $summary_fields = array(
+ private static $summary_fields = array(
'Name',
'ProductCode'
);
@@ -175,18 +175,18 @@ To include relations in your summaries, you can use a dot-notation.
:::php
class OtherObject extends DataObject {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar'
);
}
class MyDataObject extends DataObject {
- static $db = array(
+ private static $db = array(
'Name' => 'Text'
);
- static $has_one = array(
+ private static $has_one = array(
'OtherObject' => 'OtherObject'
);
- static $summary_fields = array(
+ private static $summary_fields = array(
'Name',
'OtherObject.Title'
);
diff --git a/docs/en/reference/datefield.md b/docs/en/reference/datefield.md
index 703244261..e314e209b 100644
--- a/docs/en/reference/datefield.md
+++ b/docs/en/reference/datefield.md
@@ -13,7 +13,7 @@ enter a date manually.
:::php
class Page extends SiteTree {
- static $db = array(
+ private static $db = array(
'MyDate' => 'Date',
);
diff --git a/docs/en/reference/execution-pipeline.md b/docs/en/reference/execution-pipeline.md
index 42f676d12..f7c508a6c 100644
--- a/docs/en/reference/execution-pipeline.md
+++ b/docs/en/reference/execution-pipeline.md
@@ -80,7 +80,7 @@ You can access the following controller-method with /team/signup
class Team_Controller extends Controller {
- static $allowed_actions = array('signup');
+ private static $allowed_actions = array('signup');
public function signup($id, $otherId) {
return $this->renderWith('MyTemplate');
diff --git a/docs/en/reference/grid-field.md b/docs/en/reference/grid-field.md
index 262b58071..56438e642 100644
--- a/docs/en/reference/grid-field.md
+++ b/docs/en/reference/grid-field.md
@@ -42,7 +42,7 @@ Here is an example where we display a basic gridfield with the default settings:
:::php
class GridController extends Page_Controller {
- static $allowed_actions = array('index');
+ private static $allowed_actions = array('index');
public function index(SS_HTTPRequest $request) {
$this->Content = $this->AllPages();
@@ -171,7 +171,7 @@ Example:
:::php
class Player extends DataObject {
- public static $db = array('Name' => 'Text');
+ private static $db = array('Name' => 'Text');
public static $many_many = array('Teams' => 'Team');
public static $many_many_extraFields = array(
'Teams' => array('Position' => 'Text')
@@ -197,7 +197,7 @@ Example:
}
class Team extends DataObject {
- public static $db = array('Name' => 'Text');
+ private static $db = array('Name' => 'Text');
public static $many_many = array('Players' => 'Player');
}
diff --git a/docs/en/reference/member.md b/docs/en/reference/member.md
index 87b2bf77b..cddf7ef59 100644
--- a/docs/en/reference/member.md
+++ b/docs/en/reference/member.md
@@ -45,7 +45,7 @@ You can defined subclasses of `[api:Member]` to add extra fields or functionalit
:::php
class MyMember extends Member {
- static $db = array(
+ private static $db = array(
"Age" => "Int",
"Address" => "Text",
);
@@ -113,11 +113,11 @@ things, you should add appropriate `[api:Permission::checkMember()]` calls to th
}
// define additional properties
- static $db = array();
- static $has_one = array();
- static $has_many = array();
- static $many_many = array();
- static $belongs_many_many = array();
+ private static $db = array();
+ private static $has_one = array();
+ private static $has_many = array();
+ private static $many_many = array();
+ private static $belongs_many_many = array();
public function somethingElse() {
// You can add any other methods you like, which you can call directly on the member object.
diff --git a/docs/en/reference/modeladmin.md b/docs/en/reference/modeladmin.md
index 5e122b854..aa7665167 100644
--- a/docs/en/reference/modeladmin.md
+++ b/docs/en/reference/modeladmin.md
@@ -20,12 +20,12 @@ A product can have a name, price, and a category.
:::php
class Product extends DataObject {
- static $db = array('Name' => 'Varchar', 'ProductCode' => 'Varchar', 'Price' => 'Currency');
- static $has_one = array('Category' => 'Category');
+ private static $db = array('Name' => 'Varchar', 'ProductCode' => 'Varchar', 'Price' => 'Currency');
+ private static $has_one = array('Category' => 'Category');
}
class Category extends DataObject {
- static $db = array('Title' => 'Text');
- static $has_many = array('Products' => 'Product');
+ private static $db = array('Title' => 'Text');
+ private static $has_many = array('Products' => 'Product');
}
To create your own `ModelAdmin`, simply extend the base class,
@@ -36,9 +36,9 @@ We'll name it `MyAdmin`, but the class name can be anything you want.
:::php
class MyAdmin extends ModelAdmin {
- public static $managed_models = array('Product','Category'); // Can manage multiple models
- static $url_segment = 'products'; // Linked as /admin/products/
- static $menu_title = 'My Product Admin';
+ private static $managed_models = array('Product','Category'); // Can manage multiple models
+ private static $url_segment = 'products'; // Linked as /admin/products/
+ private $menu_title = 'My Product Admin';
}
This will automatically add a new menu entry to the CMS, and you're ready to go!
@@ -85,7 +85,7 @@ static on your model class (see `[SearchContext](/reference/searchcontext)` docs
:::php
class Product extends DataObject {
// ...
- static $searchable_fields = array(
+ private static $searchable_fields = array(
'Name',
'ProductCode'
// leaves out the 'Price' field, removing it from the search
@@ -105,10 +105,10 @@ where you can add or remove columns. To change the title, use `[api:DataObject::
:::php
class Product extends DataObject {
// ...
- static $field_labels = array(
+ private static $field_labels = array(
'Price' => 'Cost' // renames the column to "Cost"
);
- static $summary_fields = array(
+ private static $summary_fields = array(
'Name',
'Price',
// leaves out the 'ProductCode' field, removing the column
diff --git a/docs/en/reference/preview.md b/docs/en/reference/preview.md
index 94a3287b1..eed5ae0f3 100644
--- a/docs/en/reference/preview.md
+++ b/docs/en/reference/preview.md
@@ -63,10 +63,13 @@ Note how the configuration happens in different entwine namespaces
});
}(jQuery));
-Load the file in the CMS via an addition to `mysite/_config.php`:
+Load the file in the CMS via setting adding 'mysite/javascript/MyLeftAndMain.Preview.js'
+to the `LeftAndMain.extra_requirements_javascript` [configuration value](/topics/configuration)
- :::php
- LeftAndMain::require_javascript('mysite/javascript/MyLeftAndMain.Preview.js');
+ :::yml
+ LeftAndMain
+ extra_requirements_javascript:
+ - 'mysite/javascript/MyLeftAndMain.Preview.js'
In order to find out which configuration values are available, the source code
is your best reference at the moment - have a look in `framework/admin/javascript/LeftAndMain.Preview.js`.
diff --git a/docs/en/reference/requirements.md b/docs/en/reference/requirements.md
index 22a178cd0..98d5a405e 100644
--- a/docs/en/reference/requirements.md
+++ b/docs/en/reference/requirements.md
@@ -45,13 +45,10 @@ reducing HTTP requests. Note that for debugging purposes combined files is disab
);
-By default it stores the generated file in the assets/ folder but you can configure this by setting
+By default it stores the generated file in the assets/ folder but you can configure this by pointing
+the `Requirements.combined_files_folder` configuration setting to a specific folder.
- :::php
- // relative from the base folder
- Requirements::set_combined_files_folder('folder');
-
If SilverStripe doesn't have permissions on your server to write these files it will default back to including them
individually .
@@ -127,13 +124,8 @@ inheritance and overlays - please be careful when messing with the order of Requ
NOTE:
By default, SilverStripe includes all Javascript files at the bottom of the page body. If this causes problems for you,
for example if you're using animation that ends up showing everything until the bottom of the page loads, or shows
-buttons before pushing them will actually work, you can change this behaviour:
-
-In your controller's init() function, add:
-
- :::php
- Requirements::set_write_js_to_body(false);
-
+buttons before pushing them will actually work, you can change this behaviour through
+the `Requirements.write_js_to_body` configuration setting.
## CMS Requirements
diff --git a/docs/en/reference/searchcontext.md b/docs/en/reference/searchcontext.md
index 22e3d4a33..49e7132a7 100644
--- a/docs/en/reference/searchcontext.md
+++ b/docs/en/reference/searchcontext.md
@@ -36,7 +36,7 @@ method, we're building our own `getCustomSearchContext()` variant.
:::php
class MyDataObject extends DataObject {
- static $db = array(
+ private static $db = array(
'PublicProperty' => 'Text'
'HiddenProperty' => 'Text',
'MyDate' => 'Date'
diff --git a/docs/en/reference/siteconfig.md b/docs/en/reference/siteconfig.md
index 6cc1513d2..b63ca59a2 100644
--- a/docs/en/reference/siteconfig.md
+++ b/docs/en/reference/siteconfig.md
@@ -39,7 +39,7 @@ Create a mysite/code/CustomSiteConfig.php file.
class CustomSiteConfig extends DataExtension {
- static $db = array(
+ private static $db = array(
'FooterContent' => 'HTMLText'
);
diff --git a/docs/en/reference/sitetree.md b/docs/en/reference/sitetree.md
index 060822d53..d6e4a9922 100644
--- a/docs/en/reference/sitetree.md
+++ b/docs/en/reference/sitetree.md
@@ -85,21 +85,21 @@ Example: Restrict blog entry pages to nesting underneath their blog holder
:::php
class BlogHolder extends Page {
// Blog holders can only contain blog entries
- static $allowed_children = array("BlogEntry");
- static $default_child = "BlogEntry";
+ private static $allowed_children = array("BlogEntry");
+ private static $default_child = "BlogEntry";
// ...
}
class BlogEntry extends Page {
// Blog entries can't contain children
- static $allowed_children = "none";
- static $can_be_root = false;
+ private static $allowed_children = "none";
+ private static $can_be_root = false;
// ...
}
class Page extends SiteTree {
// Don't let BlogEntry pages be underneath Pages. Only underneath Blog holders.
- static $allowed_children = array("*Page,", "BlogHolder");
+ private static $allowed_children = array("*Page,", "BlogHolder");
}
@@ -130,10 +130,10 @@ when navigating the tree or adding a new page:
:::php
class StaggPage extends Page {
- static $singular_name = 'Staff Directory';
- static $plural_name = 'Staff Directories';
- static $description = 'Two-column layout with a list of staff members';
- static $icon = 'mysite/images/staff-icon.png';
+ private static $singular_name = 'Staff Directory';
+ private static $plural_name = 'Staff Directories';
+ private static $description = 'Two-column layout with a list of staff members';
+ private static $icon = 'mysite/images/staff-icon.png';
// ...
}
diff --git a/docs/en/reference/sqlquery.md b/docs/en/reference/sqlquery.md
index e02ecf39c..c1a30fa96 100644
--- a/docs/en/reference/sqlquery.md
+++ b/docs/en/reference/sqlquery.md
@@ -125,7 +125,7 @@ An alternative approach would be a custom getter in the object definition.
:::php
class Player extends DataObject {
- static $db = array(
+ private static $db = array(
'Name' =>
'Birthdate' => 'Date'
);
diff --git a/docs/en/reference/templates.md b/docs/en/reference/templates.md
index 81b3ca064..fc5d64f9e 100644
--- a/docs/en/reference/templates.md
+++ b/docs/en/reference/templates.md
@@ -569,7 +569,7 @@ default if it exists and there is no action in the url parameters.
:::php
class MyPage_Controller extends Page_Controller {
- static $allowed_actions = array('index');
+ private static $allowed_actions = array('index');
public function init(){
parent::init();
@@ -614,10 +614,8 @@ would be created:
There are cases where this can be unhelpful. HTML fragments created from Ajax responses are the most common. In these
-situations, you can disable fragment link rewriting like so:
-
- :::php
- SSViewer::setOption('rewriteHashlinks', false);
+situations, you can disable fragment link rewriting by setting the
+`SSViewer.rewrite_hash_links` configuration value to `false`.
### More Advanced Controls
diff --git a/docs/en/reference/uploadfield.md b/docs/en/reference/uploadfield.md
index 842deedd0..6894bfb63 100644
--- a/docs/en/reference/uploadfield.md
+++ b/docs/en/reference/uploadfield.md
@@ -21,7 +21,7 @@ based on a has_one relation:
:::php
class GalleryPage extends Page {
- static $has_one = array(
+ private static $has_one = array(
'SingleImage' => 'Image'
);
@@ -53,7 +53,7 @@ UploadField will detect the relation based on its $name property value:
:::php
class GalleryPage extends Page {
- static $many_many = array(
+ private static $many_many = array(
'GalleryImages' => 'Image'
);
@@ -110,7 +110,8 @@ the folder doesn't exist, it will be created.
## Limit the allowed filetypes
-`AllowedExtensions` is by default `File::$allowed_extensions` but can be overwritten for each UploadField:
+`AllowedExtensions` defaults to the `File.allowed_extensions` configuration setting,
+but can be overwritten for each UploadField:
:::php
$uploadField->getValidator()->setAllowedExtensions(array('jpg', 'jpeg', 'png', 'gif'));
@@ -157,7 +158,7 @@ like this:
:::php
class GalleryImage extends DataExtension {
- static $db = array(
+ private static $db = array(
'Description' => 'Text'
);
@@ -169,7 +170,7 @@ like this:
Now register the DataExtension for the Image class in your _config.php:
:::php
- Object::add_extension('Image', 'GalleryImage');
+ Image::add_extension('GalleryImage');
NOTE: although you can subclass the Image class instead of using a DataExtension, this is not advisable. For instance: when using a subclass, the 'From files' button will only return files that were uploaded for that subclass, it won't recognize any other images!
### Edit uploaded images
diff --git a/docs/en/topics/configuration.md b/docs/en/topics/configuration.md
index 1cf0d21da..fe1d90b78 100644
--- a/docs/en/topics/configuration.md
+++ b/docs/en/topics/configuration.md
@@ -272,9 +272,8 @@ Notice that we can leave out the header in this case because there is only a sin
## Setting configuration via statics
The final location that a property can get it's value from is a static set on the associated class.
-
-Statics should be considered immutable. Although in 3.0 the configuration system will include modified
-statics during the merge, this is not guaranteed to always be the case.
+Statics should be considered immutable, and therefore the majority of statics in SilverStripe
+are marked `private`.
They should primarily be used to set the initial or default value for any given configuration property. It's also
a handy place to hand a docblock to indicate what a property is for. However, it's worth noting that you
@@ -306,11 +305,6 @@ classes (see [common-problems](/installation/common-problems)).
Some constants are user-defineable within *_ss_environment.php*.
- | Name | | Description |
- | ---- | | ----------- |
- | *TEMP_FOLDER* | | Absolute file path to store temporary files such as cached templates or the class manifest. Needs to be writeable by the webserver user. Defaults to *sys_get_temp_dir()*, and falls back to *silverstripe-cache* in the webroot. See *getTempFolder()* in *framework/core/Core.php* |
-
-
## No GUI configuration
SilverStripe framework does not provide a method to set configuration via a web panel
@@ -324,7 +318,7 @@ In addition to these principle, some settings are
* Group-related configuration like `[api:HTMLEditorField]` settings can be found in the "Security" section (`admin/security`).
* Site-wide settings like page titles can be set (and extended) on the root tree element in the CMS "Content" section (through the [siteconfig](/reference/siteconfig) API).
-## _ss_environment.php
+## Constants and the _ss_environment.php File
See [environment-management](/topics/environment-management).
diff --git a/docs/en/topics/controller.md b/docs/en/topics/controller.md
index 12c856abc..540b14ae5 100644
--- a/docs/en/topics/controller.md
+++ b/docs/en/topics/controller.md
@@ -157,7 +157,7 @@ through `/fastfood/drivethrough/` to use the same order function.
:::php
class FastFood_Controller extends Controller {
- static $allowed_actions = array('drivethrough');
+ private static $allowed_actions = array('drivethrough');
public static $url_handlers = array(
'drivethrough/$Action/$ID/$Name' => 'order'
);
@@ -230,7 +230,7 @@ either `301` for permanent redirects, or `302` for temporary redirects (default)
You can also limit access to actions on a controller using the static `$allowed_actions` array. This allows you to always allow an action, or restrict it to a specific permission or to call a method that checks if the action is allowed.
For example, the default `Controller::$allowed_actions` is
- static $allowed_actions = array(
+ private static $allowed_actions = array(
'handleAction',
'handleIndex',
);
@@ -241,14 +241,14 @@ To allow any action on your controller to be called you can either leave your `$
The recommended approach is to explicitly state the actions that can be called via a URL. Any action not in the `$allowed_actions` array, excluding the default `index` method, is then unable to be called.
To always allow an action to be called, you can either add the name of the action to the array or add a value of `true` to the array, using the name of the method as its index. For example
- static $allowed_actions = array(
+ private static $allowed_actions = array(
'MyAwesomeAction',
'MyOtherAction' => true
);
To require that the current user has a certain permission before being allowed to call an action you add the action to the array as an index with the value being the permission code that user must have. For example
- static $allowed_actions = array(
+ private static $allowed_actions = array(
'MyAwesomeAction',
'MyOtherAction' => true,
'MyLimitedAction' => 'CMS_ACCESS_CMSMain',
@@ -256,7 +256,7 @@ To require that the current user has a certain permission before being allowed t
);
If neither of these are enough to decide if an action should be called, you can have the check use a method. The method must be on the controller class and return true if the action is allowed or false if it isn't. To do this add the action to the array as an index with the value being the name of the method to called preceded by '->'. You are able to pass static arguments to the method in much the same way as you can with extensions. Strings are enclosed in quotes, numeric values are written as numbers and true and false are written as true and false. For example
- static $allowed_actions = array(
+ private static $allowed_actions = array(
'MyAwesomeAction',
'MyOtherAction' => true,
'MyLimitedAction' => 'CMS_ACCESS_CMSMain',
diff --git a/docs/en/topics/datamodel.md b/docs/en/topics/datamodel.md
index e9279763a..5a905a9b7 100755
--- a/docs/en/topics/datamodel.md
+++ b/docs/en/topics/datamodel.md
@@ -327,7 +327,7 @@ Data is defined in the static variable $db on each class, in the format:
:::php
class Player extends DataObject {
- public static $db = array(
+ private static $db = array(
"FirstName" => "Varchar",
"Surname" => "Varchar",
"Description" => "Text",
@@ -346,7 +346,7 @@ default behaviour by making a function called "get``" or "set` "Enum('Active, Injured, Retired')"
);
@@ -616,7 +616,7 @@ Example: Validate postcodes based on the selected country
:::php
class MyObject extends DataObject {
- public static $db = array(
+ private static $db = array(
'Country' => 'Varchar',
'Postcode' => 'Varchar'
);
diff --git a/docs/en/topics/debugging.md b/docs/en/topics/debugging.md
index b5367b06f..51aa1c9b8 100644
--- a/docs/en/topics/debugging.md
+++ b/docs/en/topics/debugging.md
@@ -6,20 +6,22 @@ Silverstripe knows three different environment-types (or "debug-levels"). Each o
and functionality. "dev", "test" and "live". You can either configure the environment of the site in the
mysite/_config.php file or in your [environment configuration file](/topics/environment-management).
-The definition of setting an environment in your mysite/_config.php looks like
+The definition of setting an environment in your `mysite/_config/config.yml` looks like
- :::php
- Director::set_environment_type("dev");
+ :::yml
+ Director:
+ environment_type: 'dev'
### Dev Mode
When developing your websites, adding page types or installing modules you should run your site in devmode. In this mode
you will be able to view full error backtraces and view the development tools without logging in as admin.
-To set your site to dev mode set this in your mysite/_config.php file
+To set your site to dev mode set this in your `mysite/_config/config.yml` file
- :::php
- Director::set_environment_type("dev");
+ :::yml
+ Director:
+ environment_type: 'dev'
Please note **devmode should not be enabled long term on live sites for security reasons**. In devmode by outputting
@@ -35,18 +37,23 @@ not need to use test mode if you do not have a staging environment or a place fo
In this mode error messages are hidden from the user and it includes `[api:BasicAuth]` integration if you want to password
protect the site.
-To set your site to test mode set this in your `mysite/_config.php` file
+To set your site to test mode set this in your `mysite/_config/config.yml` file
- :::php
- Director::set_environment_type("test");
+ :::yml
+ Director:
+ environment_type: 'test'
-A common situation is to enable password protected site viewing on your test site only. You can enable that but adding
-this to your `mysite/_config` file
-
- :::php
- if(Director::isTest()) BasicAuth::protect_entire_site();
+A common situation is to enable password protected site viewing on your test site only.
+You can enable that but adding this to your `mysite/_config/config.yml` file:
+ :::yml
+ ---
+ Only:
+ environment: 'test'
+ ---
+ BasicAuth:
+ entire_site_protected: true
### Live Mode
@@ -54,40 +61,37 @@ Live sites should always run in live mode. Error messages are suppressed from th
to email the developers. This enables near real time reporting of any fatal errors or warnings on the site and can help
find any bugs users run into.
-To set your site to live mode set this in your `mysite/_config.php` file
-
- :::php
- Director::set_environment_type("live");
-
+To set your site to live mode set this in your `mysite/_config/config.yml` file
+ :::yml
+ Director:
+ environment_type: 'live'
### Checking Environment Types
-Use the following methods:
+You can check for the current environment type in [config files](/topics/configuration) through the "environment" variant.
+This is useful for example when you have various API keys on your site and separate ones for dev / live or for configuring
+environment settings based on type .
+
+ ---
+ Only:
+ environment: 'test'
+ ---
+ MyClass:
+ myvar: myval
+
+In addition, you can use the following methods in PHP code:
:::php
Director::isDev();
Director::isTest();
Director::isLive();
-
-This is useful when you have various API keys on your site and separate ones for dev / live or for configuring
-environment settings based on type
-
- :::php
- if(Director::isDev()) {
- // this is for dev only
- }
- else {
- // this is for the live site
- }
-
-
## Email Errors
- :::php
- if(Director::isLive()) Debug::send_errors_to("your@email.com");
-
+ :::yml
+ Debug:
+ send_errors_to: 'your@email.com'
## Customizing Error-Output
@@ -106,14 +110,13 @@ The Debug class contains a number of static methods
* *Debug::show($myVariable)*: performs a kind of *print_r($myVariable)*, but shows it in a more useful format.
* *Debug::message("Wow, that's great")*: prints a short debugging message.
* *SS_Backtrace::backtrace()*: prints a calls-stack
-* *Debug::send_errors_to("sam@silverstripe.com")*: All errors will get sent to this address.
### Error handling
On development sites, we deal harshly with any warnings or errors: a full call-stack is shown and execution stops. This
is basically so that we deal with them promptly, since most warnings are indication that **something** is broken.
-On live sites, all errors are emailed to the address specified in Debug::sendLiveErrorsTo($email)
+On live sites, all errors are emailed to the address specified in the `Debug.send_errors_to` config setting.
### Debugging techniques
diff --git a/docs/en/topics/email.md b/docs/en/topics/email.md
index d1f685631..51f1dd581 100644
--- a/docs/en/topics/email.md
+++ b/docs/en/topics/email.md
@@ -82,19 +82,21 @@ Usage:
### Administrator Emails
-The static function `Email::setAdminEmail()` can be called from a `_config.php` file to set the address that these
-emails should originate from. This address is used if the `from` field is empty.
+You can influence the default sender address of emails through the `Email.admin_email`
+[configuration setting](/topics/configuration). This address is used if the `from` field is empty.
### Redirecting Emails
-* `Email::send_all_emails_to($address)` will redirect all emails sent to the given address. Handy for testing!
-* `Email::cc_all_emails_to()` and `Email::bcc_all_emails_to()` will keep the email going to its original recipients, but
+Further [configuration settings](/topics/configuration) relating to email rewriting:
+
+* `Email.send_all_emails_to` will redirect all emails sent to the given address. Handy for testing!
+* `Email.cc_all_emails_to` and `Email.bcc_all_emails_to` will keep the email going to its original recipients, but
add an additional recipient in the BCC/CC header. Good for monitoring system-generated correspondence on the live
systems.
:::php
- if(Director::isLive()) Email::bcc_all_emails_to("client@example.com");
- else Email::send_all_emails_to("developer@example.com");
+ if(Director::isLive()) Config::inst()->update('Email', 'bcc_all_emails_to', "client@example.com");
+ else Config::inst()->update('Email', 'send_all_emails_to', "developer@example.com");
### Setting Custom Headers
diff --git a/docs/en/topics/environment-management.md b/docs/en/topics/environment-management.md
index 578b6b0c1..431255cf3 100644
--- a/docs/en/topics/environment-management.md
+++ b/docs/en/topics/environment-management.md
@@ -100,3 +100,32 @@ This is my `_ss_environment.php` file. I have it placed in `/var`, as each of th
// This is used by sake to know which directory points to which URL
global $_FILE_TO_URL_MAPPING;
$_FILE_TO_URL_MAPPING['/var/www'] = 'http://simon.geek.nz';
+
+## Available Constants
+
+| Name | Description |
+| ---- | ----------- |
+| `TEMP_FOLDER` | Absolute file path to store temporary files such as cached templates or the class manifest. Needs to be writeable by the webserver user. Defaults to *sys_get_temp_dir()*, and falls back to *silverstripe-cache* in the webroot. See *getTempFolder()* in *framework/core/Core.php* |
+SS_DATABASE_CLASS: The database class to use, MySQLDatabase, MSSQLDatabase, etc. defaults to MySQLDatabase
+| `SS_DATABASE_SERVER`| The database server to use, defaulting to localhost|
+| `SS_DATABASE_USERNAME`| The database username (mandatory)|
+| `SS_DATABASE_PASSWORD`| The database password (mandatory)|
+| `SS_DATABASE_PORT`| The database port|
+| `SS_DATABASE_SUFFIX`| A suffix to add to the database name.|
+| `SS_DATABASE_PREFIX`| A prefix to add to the database name.|
+| `SS_DATABASE_TIMEZONE`| Set the database timezone to something other than the system timezone.
+| `SS_DATABASE_CHOOSE_NAME`| Boolean/Int. If set, then the system will choose a default database name for you if
+ one isn't give in the $database variable. The database name will be "SS_" followed by the name of the folder
+ into which you have installed SilverStripe. If this is enabled, it means that the phpinstaller will work out of
+ the box without the installer needing to alter any files. This helps prevent accidental changes to the
+ environment. If SS_DATABASE_CHOOSE_NAME is an integer greater than one, then an ancestor folder will be used for the
+ database name. This is handy for a site that's hosted from /sites/examplesite/www or /buildbot/allmodules-2.3/build.
+ If it's 2, the parent folder will be chosen; if it's 3 the grandparent, and so on.|
+| `SS_ENVIRONMENT_TYPE`| The environment type: dev, test or live.|
+| `SS_DEFAULT_ADMIN_USERNAME`| The username of the default admin - this is a non-database user with
+administrative privileges.|
+| `SS_DEFAULT_ADMIN_PASSWORD`| The password of the default admin.|
+| `SS_USE_BASIC_AUTH`| Protect the site with basic auth (good for test sites)|
+| `SS_SEND_ALL_EMAILS_TO`| If you set this define, all emails will be redirected to this address.|
+| `SS_SEND_ALL_EMAILS_FROM`| If you set this define, all emails will be send from this address.|
+| `SS_ERROR_LOG` | |
\ No newline at end of file
diff --git a/docs/en/topics/form-validation.md b/docs/en/topics/form-validation.md
index a99a3b421..ef84c3e0a 100644
--- a/docs/en/topics/form-validation.md
+++ b/docs/en/topics/form-validation.md
@@ -49,7 +49,7 @@ Example: Validate postcodes based on the selected country (on the controller).
:::php
class MyController extends Controller {
- static $allowed_actions = array('Form');
+ private static $allowed_actions = array('Form');
public function Form() {
return Form::create($this, 'Form',
new FieldList(
diff --git a/docs/en/topics/i18n.md b/docs/en/topics/i18n.md
index 6b0dd9604..e94f2b45b 100644
--- a/docs/en/topics/i18n.md
+++ b/docs/en/topics/i18n.md
@@ -85,7 +85,8 @@ while keeping characters recognizeable. For example, vowels with french accents
are replaced with their base characters, `pâté` becomes `pate`.
In order to allow for so called "multibyte" characters outside of the ASCII subset,
-limit the character filtering in the underlying class: `URLSegmentFilter::$default_use_transliterator = false`
+limit the character filtering in the underlying configuration setting,
+by setting `URLSegmentFilter.default_use_transliterator` to `false` in your YAML configuration.
Please refer to [W3C: Introduction to IDN and IRI](http://www.w3.org/International/articles/idn-and-iri/) for more details.
@@ -99,9 +100,9 @@ Date- and time related form fields support i18n ([api:DateField], [api:TimeField
$field->setLocale('de_DE'); // will not update the date formats
$field->setConfig('dateformat', 'dd. MMMM YYYY'); // sets typical 'de_DE' date format, shows as "23. Juni 1982"
-Defaults can be applied globally for all field instances through [api:DateField::set_default_config()]
-and [api:TimeField::set_default_config()]. If no 'locale' default is set on the field, [api:i18n::get_locale()]
-will be used.
+Defaults can be applied globally for all field instances through the `DateField.default_config`
+and `TimeField.default_config` [configuration arrays](/topics/configuration).
+If no 'locale' default is set on the field, [api:i18n::get_locale()] will be used.
**Important:** Form fields in the CMS are automatically configured according to the profile settings for the logged-in user (`Member->Locale`, `Member->DateFormat` and `Member->TimeFormat`). This means that in most cases,
fields created through [api:DataObject::getCMSFields()] will get their i18n settings from a specific member
diff --git a/docs/en/topics/page-types.md b/docs/en/topics/page-types.md
index 7123671bf..93595e9a1 100644
--- a/docs/en/topics/page-types.md
+++ b/docs/en/topics/page-types.md
@@ -52,7 +52,7 @@ especially useful if you know how long your source data needs to be.
:::php
class StaffPage extends Page {
- static $db = array(
+ private static $db = array(
'Author' => 'Varchar(50)'
);
}
diff --git a/docs/en/topics/rich-text-editing.md b/docs/en/topics/rich-text-editing.md
index 8e2de0444..6adb4c8b0 100644
--- a/docs/en/topics/rich-text-editing.md
+++ b/docs/en/topics/rich-text-editing.md
@@ -14,7 +14,7 @@ functionality. It is usually added through the `[api:DataObject->getCMSFields()]
:::php
class MyObject extends DataObject {
- static $db = array('Content' => 'HTMLText');
+ private static $db = array('Content' => 'HTMLText');
public function getCMSFields() {
return new FieldList(new HTMLEditorField('Content'));
diff --git a/docs/en/topics/search.md b/docs/en/topics/search.md
index d828189f0..5094c1060 100644
--- a/docs/en/topics/search.md
+++ b/docs/en/topics/search.md
@@ -21,7 +21,7 @@ engine.
You can do so by adding this static variable to your class definition:
:::php
- static $create_table_options = array(
+ private static $create_table_options = array(
'MySQLDatabase' => 'ENGINE=MyISAM'
);
diff --git a/docs/en/topics/security.md b/docs/en/topics/security.md
index 71436dc96..0f449256d 100644
--- a/docs/en/topics/security.md
+++ b/docs/en/topics/security.md
@@ -79,7 +79,7 @@ Example:
:::php
class MyController extends Controller {
- static $allowed_actions = array('myurlaction');
+ private static $allowed_actions = array('myurlaction');
public function myurlaction($RAW_urlParams) {
$SQL_urlParams = Convert::raw2sql($RAW_urlParams); // works recursively on an array
$objs = Player::get()->where("Name = '{$SQL_data[OtherID]}'");
@@ -136,7 +136,7 @@ PHP:
:::php
class MyObject extends DataObject {
- public static $db = array(
+ private static $db = array(
'MyEscapedValue' => 'Text', // Example value: not bold
'MyUnescapedValue' => 'HTMLText' // Example value: bold
);
@@ -220,7 +220,7 @@ PHP:
:::php
class MyController extends Controller {
- static $allowed_actions = array('search');
+ private static $allowed_actions = array('search');
public function search($request) {
$htmlTitle = '![]({$thumbnail}?r="
@@ -399,7 +409,7 @@ class File extends DataObject {
*/
public static function get_app_category($ext) {
$ext = strtolower($ext);
- foreach(self::$app_categories as $category => $exts) {
+ foreach(Config::inst()->get()
$exts) {
if(in_array($ext, $exts)) return $category;
}
return false;
@@ -488,7 +498,7 @@ class File extends DataObject {
* (it might have been influenced by {@link setName()} or {@link setParentID()} before).
*/
public function updateFilesystem() {
- if(!self::$update_filesystem) return false;
+ if(!$this->config()->update_filesystem) return false;
// Regenerate "Filename", just to be sure
$this->setField('Filename', $this->getRelativePath());
@@ -860,11 +870,11 @@ class File extends DataObject {
}
public function validate() {
- if(File::$apply_restrictions_to_admin || !Permission::check('ADMIN')) {
+ if($this->config()->apply_restrictions_to_admin || !Permission::check('ADMIN')) {
// Extension validation
// TODO Merge this with Upload_Validator
$extension = $this->getExtension();
- $allowed = array_map('strtolower', self::$allowed_extensions);
+ $allowed = array_map('strtolower', $this->config()->allowed_extensions);
if($extension && !in_array(strtolower($extension), $allowed)) {
$exts = $allowed;
sort($exts);
@@ -888,9 +898,10 @@ class File extends DataObject {
}
/**
+ * @config
* @var Array Only use lowercase extensions in here.
*/
- static $class_for_file_extension = array(
+ private static $class_for_file_extension = array(
'*' => 'File',
'jpg' => 'Image',
'jpeg' => 'Image',
@@ -914,7 +925,7 @@ class File extends DataObject {
* @return String Classname for a subclass of {@link File}
*/
public static function get_class_for_file_extension($ext) {
- $map = array_change_key_case(self::$class_for_file_extension, CASE_LOWER);
+ $map = array_change_key_case(self::config()->class_for_file_extension, CASE_LOWER);
return (array_key_exists(strtolower($ext), $map)) ? $map[strtolower($ext)] : $map['*'];
}
@@ -933,7 +944,7 @@ class File extends DataObject {
sprintf('Class "%s" (for extension "%s") is not a valid subclass of File', $class, $ext)
);
}
- self::$class_for_file_extension[$ext] = $class;
+ self::config()->class_for_file_extension = array($ext => $class);
}
}
diff --git a/filesystem/FileFinder.php b/filesystem/FileFinder.php
index 1b5de539b..e50553ba1 100644
--- a/filesystem/FileFinder.php
+++ b/filesystem/FileFinder.php
@@ -32,7 +32,7 @@ class SS_FileFinder {
/**
* @var array
*/
- public static $vcs_dirs = array(
+ protected static $vcs_dirs = array(
'.git', '.svn', '.hg', '.bzr'
);
@@ -45,7 +45,7 @@ class SS_FileFinder {
*
* @var array
*/
- public static $default_options = array(
+ protected static $default_options = array(
'name_regex' => null,
'accept_callback' => null,
'accept_dir_callback' => null,
diff --git a/filesystem/FileNameFilter.php b/filesystem/FileNameFilter.php
index ef2357abc..61e40d20f 100644
--- a/filesystem/FileNameFilter.php
+++ b/filesystem/FileNameFilter.php
@@ -18,10 +18,11 @@
* via overriding {@link FileNameFilter_DefaultFilter::$default_replacements}.
*
* To leave uploaded filenames as they are (being aware of filesystem restrictions),
- * add the following code to your _config.php:
+ * add the following code to your YAML config:
* _versions columns
- foreach(self::$db_for_versions_table as $name => $type) {
+ foreach(Config::inst()->get('Versioned', 'db_for_versions_table') as $name => $type) {
$query->selectField(sprintf('"%s_versions"."%s"', $baseTable, $name), $name);
}
$query->selectField(sprintf('"%s_versions"."%s"', $baseTable, 'RecordID'), "ID");
@@ -230,7 +230,7 @@ class Versioned extends DataExtension {
}
// Add all _versions columns
- foreach(self::$db_for_versions_table as $name => $type) {
+ foreach(Config::inst()->get('Versioned', 'db_for_versions_table') as $name => $type) {
$query->selectField(sprintf('"%s_versions"."%s"', $baseTable, $name), $name);
}
@@ -406,12 +406,12 @@ class Versioned extends DataExtension {
if($isRootClass) {
// Create table for all versions
$versionFields = array_merge(
- self::$db_for_versions_table,
+ Config::inst()->get('Versioned', 'db_for_versions_table'),
(array)$fields
);
$versionIndexes = array_merge(
- self::$indexes_for_versions_table,
+ Config::inst()->get('Versioned', 'indexes_for_versions_table'),
(array)$indexes
);
} else {
@@ -809,7 +809,7 @@ class Versioned extends DataExtension {
}
// Add all _versions columns
- foreach(self::$db_for_versions_table as $name => $type) {
+ foreach(Config::inst()->get('Versioned', 'db_for_versions_table') as $name => $type) {
$query->selectField(sprintf('"%s_versions"."%s"', $baseTable, $name), $name);
}
diff --git a/model/fieldtypes/Currency.php b/model/fieldtypes/Currency.php
index c83e074d9..8517a33a3 100644
--- a/model/fieldtypes/Currency.php
+++ b/model/fieldtypes/Currency.php
@@ -16,7 +16,12 @@
* @subpackage model
*/
class Currency extends Decimal {
- protected static $currencySymbol = '$';
+
+ /**
+ * @config
+ * @var string
+ */
+ private static $currency_symbol = '$';
public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0) {
parent::__construct($name, $wholeSize, $decimalSize, $defaultValue);
@@ -27,7 +32,7 @@ class Currency extends Decimal {
*/
public function Nice() {
// return "value\">$" . number_format($this->value, 2) . '';
- $val = self::$currencySymbol . number_format(abs($this->value), 2);
+ $val = $this->config()->currency_symbol . number_format(abs($this->value), 2);
if($this->value < 0) return "($val)";
else return $val;
}
@@ -36,7 +41,7 @@ class Currency extends Decimal {
* Returns the number as a whole-number currency, eg “$1,000”.
*/
public function Whole() {
- $val = self::$currencySymbol . number_format(abs($this->value), 0);
+ $val = $this->config()->currency_symbol . number_format(abs($this->value), 0);
if($this->value < 0) return "($val)";
else return $val;
}
@@ -47,15 +52,21 @@ class Currency extends Decimal {
$this->value = $value;
} else if(preg_match('/-?\$?[0-9,]+(.[0-9]+)?([Ee][0-9]+)?/', $value, $matches)) {
- $this->value = str_replace(array('$',',',self::$currencySymbol),'',$matches[0]);
+ $this->value = str_replace(array('$',',',$this->config()->currency_symbol),'',$matches[0]);
} else {
$this->value = 0;
}
}
+ /**
+ * @deprecated 3.2 Use the "Currency.currency_symbol" config setting instead
+ * @param [type] $value [description]
+ */
+
public static function setCurrencySymbol($value) {
- self::$currencySymbol = $value;
+ Deprecation::notice('3.2', 'Use the "Currency.currency_symbol" config setting instead');
+ $this->config()->currency_symbol = $value;
}
}
diff --git a/model/fieldtypes/DBField.php b/model/fieldtypes/DBField.php
index d883cb16e..036745960 100644
--- a/model/fieldtypes/DBField.php
+++ b/model/fieldtypes/DBField.php
@@ -41,15 +41,17 @@ abstract class DBField extends ViewableData {
* The escape type for this field when inserted into a template - either "xml" or "raw".
*
* @var string
+ * @config
*/
- public static $escape_type = 'raw';
+ private static $escape_type = 'raw';
/**
* Subclass of {@link SearchFilter} for usage in {@link defaultSearchFilter()}.
*
* @var string
+ * @config
*/
- public static $default_search_filter_class = 'PartialMatchFilter';
+ private static $default_search_filter_class = 'PartialMatchFilter';
/**
* @var $default mixed Default-value in the database.
diff --git a/model/fieldtypes/Enum.php b/model/fieldtypes/Enum.php
index 88e38906d..a4367fa91 100644
--- a/model/fieldtypes/Enum.php
+++ b/model/fieldtypes/Enum.php
@@ -11,7 +11,7 @@ class Enum extends StringField {
protected $enum, $default;
- public static $default_search_filter_class = 'ExactMatchFilter';
+ private static $default_search_filter_class = 'ExactMatchFilter';
/**
* Create a new Enum field.
diff --git a/model/fieldtypes/ForeignKey.php b/model/fieldtypes/ForeignKey.php
index fa4a2145f..3fe7b07f3 100644
--- a/model/fieldtypes/ForeignKey.php
+++ b/model/fieldtypes/ForeignKey.php
@@ -19,7 +19,7 @@ class ForeignKey extends Int {
*/
protected $object;
- public static $default_search_filter_class = 'ExactMatchFilter';
+ private static $default_search_filter_class = 'ExactMatchFilter';
public function __construct($name, $object = null) {
$this->object = $object;
diff --git a/model/fieldtypes/HTMLText.php b/model/fieldtypes/HTMLText.php
index a4c93e67a..ec041dfc0 100644
--- a/model/fieldtypes/HTMLText.php
+++ b/model/fieldtypes/HTMLText.php
@@ -11,9 +11,9 @@
* @subpackage model
*/
class HTMLText extends Text {
- public static $escape_type = 'xml';
+ private static $escape_type = 'xml';
- static $casting = array(
+ private static $casting = array(
"AbsoluteLinks" => "HTMLText",
"BigSummary" => "HTMLText",
"ContextSummary" => "HTMLText",
diff --git a/model/fieldtypes/HTMLVarchar.php b/model/fieldtypes/HTMLVarchar.php
index 46fe63129..269ef14fc 100644
--- a/model/fieldtypes/HTMLVarchar.php
+++ b/model/fieldtypes/HTMLVarchar.php
@@ -8,7 +8,7 @@
*/
class HTMLVarchar extends Varchar {
- public static $escape_type = 'xml';
+ private static $escape_type = 'xml';
protected $processShortcodes = true;
diff --git a/model/fieldtypes/Money.php b/model/fieldtypes/Money.php
index 30aeb5a44..16ffa67a8 100644
--- a/model/fieldtypes/Money.php
+++ b/model/fieldtypes/Money.php
@@ -58,7 +58,7 @@ class Money extends DBField implements CompositeDBField {
/**
* @param array
*/
- static $composite_db = array(
+ private static $composite_db = array(
"Currency" => "Varchar(3)",
"Amount" => 'Decimal(19,4)'
);
@@ -112,7 +112,7 @@ class Money extends DBField implements CompositeDBField {
if($record[$this->name . 'Amount']) {
if(!empty($record[$this->name . 'Currency'])) {
$this->setCurrency($record[$this->name . 'Currency'], $markChanged);
- } else if($currency = (string)$this->config()->get('default_currency')) {
+ } else if($currency = (string)$this->config()->default_currency) {
$this->setCurrency($currency, $markChanged);
}
diff --git a/model/fieldtypes/PrimaryKey.php b/model/fieldtypes/PrimaryKey.php
index c7bae8c53..774e2f82e 100644
--- a/model/fieldtypes/PrimaryKey.php
+++ b/model/fieldtypes/PrimaryKey.php
@@ -13,7 +13,7 @@ class PrimaryKey extends Int {
*/
protected $object;
- public static $default_search_filter_class = 'ExactMatchFilter';
+ private static $default_search_filter_class = 'ExactMatchFilter';
/**
* @param string $name
diff --git a/model/fieldtypes/StringField.php b/model/fieldtypes/StringField.php
index a580a0531..a86f60ed2 100644
--- a/model/fieldtypes/StringField.php
+++ b/model/fieldtypes/StringField.php
@@ -9,7 +9,7 @@
abstract class StringField extends DBField {
protected $nullifyEmpty = true;
- static $casting = array(
+ private static $casting = array(
"LimitCharacters" => "Text",
"LowerCase" => "Text",
"UpperCase" => "Text",
diff --git a/model/fieldtypes/Text.php b/model/fieldtypes/Text.php
index f9e778513..a6f23f3a4 100644
--- a/model/fieldtypes/Text.php
+++ b/model/fieldtypes/Text.php
@@ -18,7 +18,7 @@
*/
class Text extends StringField {
- static $casting = array(
+ private static $casting = array(
"AbsoluteLinks" => "Text",
"BigSummary" => "Text",
"ContextSummary" => "Text",
diff --git a/model/fieldtypes/Varchar.php b/model/fieldtypes/Varchar.php
index 0540c332f..e6dc6c983 100644
--- a/model/fieldtypes/Varchar.php
+++ b/model/fieldtypes/Varchar.php
@@ -11,7 +11,7 @@
*/
class Varchar extends StringField {
- static $casting = array(
+ private static $casting = array(
"Initial" => "Text",
"URL" => "Text",
);
diff --git a/oembed/Oembed.php b/oembed/Oembed.php
index d25aed36e..d8f9cb655 100644
--- a/oembed/Oembed.php
+++ b/oembed/Oembed.php
@@ -205,7 +205,7 @@ class Oembed_Result extends ViewableData {
*/
protected $extraClass;
- public static $casting = array(
+ private static $casting = array(
'html' => 'HTMLText',
);
diff --git a/parsers/BBCodeParser.php b/parsers/BBCodeParser.php
index 72fce426c..de260f1ca 100644
--- a/parsers/BBCodeParser.php
+++ b/parsers/BBCodeParser.php
@@ -17,48 +17,73 @@ unset($options);
class BBCodeParser extends TextParser {
/**
- * Set whether phrases starting with http:// or www. are automatically linked
- * @var Boolean
+ * @config
+ * @var Boolean Set whether phrases starting with http:// or www. are automatically linked
*/
- protected static $autolinkUrls = true;
+ private static $autolink_urls = true;
/**
- * Set whether similies :), :(, :P are converted to images
- * @var Boolean
+ * @config
+ * @var Boolean Set whether similies :), :(, :P are converted to images
*/
- protected static $allowSimilies = false;
+ private static $allow_similies = false;
/**
- * Set the location of the smiles folder. By default use the ones in framework
+ * @config
+ * @var string Set the location of the smiles folder. By default use the ones in framework
* but this can be overridden by setting BBCodeParser::set_icon_folder('themes/yourtheme/images/');
- * @var string
*/
- protected static $smilies_location = null;
+ private static $smilies_location = null;
+ /**
+ * @deprecated 3.2 Use the "BBCodeParser.smilies_location" config setting instead
+ */
public static function smilies_location() {
+ Deprecation::notice('3.2', 'Use the "BBCodeParser.smilies_location" config setting instead');
if(!BBCodeParser::$smilies_location) {
return FRAMEWORK_DIR . '/images/smilies';
}
- return BBCodeParser::$smilies_location;
+ return $this->config()->smilies_location;
}
+
+ /**
+ * @deprecated 3.2 Use the "BBCodeParser.smilies_location" config setting instead
+ */
public static function set_icon_folder($path) {
- BBCodeParser::$smilies_location = $path;
+ Deprecation::notice('3.2', 'Use the "BBCodeParser.smilies_location" config setting instead');
+ $this->config()->smilies_location = $path;
}
+ /**
+ * @deprecated 3.2 Use the "BBCodeParser.autolink_urls" config setting instead
+ */
public static function autolinkUrls() {
- return (self::$autolinkUrls != null) ? true : false;
+ Deprecation::notice('3.2', 'Use the "BBCodeParser.autolink_urls" config setting instead');
+ return $this->config()->autolink_urls;
}
+ /**
+ * @deprecated 3.2 Use the "BBCodeParser.autolink_urls" config setting instead
+ */
public static function disable_autolink_urls($autolink = false) {
- BBCodeParser::$autolinkUrls = $autolink;
+ Deprecation::notice('3.2', 'Use the "BBCodeParser.autolink_urls" config setting instead');
+ $this->config()->autolink_urls = $autolink;
}
+ /**
+ * @deprecated 3.2 Use the "BBCodeParser.allow_smilies" config setting instead
+ */
public static function smiliesAllowed() {
- return (self::$allowSimilies != null) ? true : false;
+ Deprecation::notice('3.2', 'Use the "BBCodeParser.allow_smilies" config setting instead');
+ return $this->config()->allow_smilies;
}
+ /**
+ * @deprecated 3.2 Use the "BBCodeParser.allow_smilies" config setting instead
+ */
public static function enable_smilies() {
- BBCodeParser::$allowSimilies = true;
+ Deprecation::notice('3.2', 'Use the "BBCodeParser.allow_smilies" config setting instead');
+ $this->config()->allow_similies = true;
}
diff --git a/security/BasicAuth.php b/security/BasicAuth.php
index b2ed158d9..4ad895ea1 100644
--- a/security/BasicAuth.php
+++ b/security/BasicAuth.php
@@ -13,11 +13,13 @@
*/
class BasicAuth {
/**
+ * @config
* @var Boolean Flag set by {@link self::protect_entire_site()}
*/
private static $entire_site_protected = false;
/**
+ * @config
* @var String|array Holds a {@link Permission} code that is required
* when calling {@link protect_site_if_necessary()}. Set this value through
* {@link protect_entire_site()}.
@@ -25,6 +27,7 @@ class BasicAuth {
private static $entire_site_protected_code = 'ADMIN';
/**
+ * @config
* @var String Message that shows in the authentication box.
* Set this value through {@link protect_entire_site()}.
*/
@@ -109,9 +112,9 @@ class BasicAuth {
* of the permission codes a user has.
*/
public static function protect_entire_site($protect = true, $code = 'ADMIN', $message = null) {
- self::$entire_site_protected = $protect;
- self::$entire_site_protected_code = $code;
- if($message) self::$entire_site_protected_message = $message;
+ Config::inst()->update('BasicAuth', 'entire_site_protected', $protect);
+ Config::inst()->update('BasicAuth', 'entire_site_protected_code', $code);
+ Config::inst()->update('BasicAuth', 'entire_site_protected_message', $message);
}
/**
@@ -122,8 +125,9 @@ class BasicAuth {
* please use {@link protect_entire_site()}.
*/
public static function protect_site_if_necessary() {
- if(self::$entire_site_protected) {
- self::requireLogin(self::$entire_site_protected_message, self::$entire_site_protected_code, false);
+ $config = Config::inst()->forClass('BasicAuth');
+ if($config->entire_site_protected) {
+ self::requireLogin($config->entire_site_protected_message, $config->entire_site_protected_code, false);
}
}
diff --git a/security/Group.php b/security/Group.php
index be63b9c55..be68cfec7 100755
--- a/security/Group.php
+++ b/security/Group.php
@@ -7,7 +7,7 @@
*/
class Group extends DataObject {
- static $db = array(
+ private static $db = array(
"Title" => "Varchar",
"Description" => "Text",
"Code" => "Varchar",
@@ -16,21 +16,21 @@ class Group extends DataObject {
"HtmlEditorConfig" => "Varchar"
);
- static $has_one = array(
+ private static $has_one = array(
"Parent" => "Group",
);
- static $has_many = array(
+ private static $has_many = array(
"Permissions" => "Permission",
"Groups" => "Group"
);
- static $many_many = array(
+ private static $many_many = array(
"Members" => "Member",
"Roles" => "PermissionRole",
);
- static $extensions = array(
+ private static $extensions = array(
"Hierarchy",
);
@@ -90,7 +90,7 @@ class Group extends DataObject {
// Filter permissions
// TODO SecurityAdmin coupling, not easy to get to the form fields through GridFieldDetailForm
- $permissionsField->setHiddenPermissions(SecurityAdmin::$hidden_permissions);
+ $permissionsField->setHiddenPermissions((array)Config::inst()->get('SecurityAdmin', 'hidden_permissions'));
if($this->ID) {
$group = $this;
diff --git a/security/LoginAttempt.php b/security/LoginAttempt.php
index 25fc58760..5d39350fe 100644
--- a/security/LoginAttempt.php
+++ b/security/LoginAttempt.php
@@ -3,10 +3,7 @@
* Record all login attempts through the {@link LoginForm} object.
* This behaviour is disabled by default.
*
- * Enable through a setting in your _config.php:
- * ', $filtered[1]['args']['password'], 'Filters class functions');
$this->assertEquals('myval', $filtered[2]['args']['myarg'], 'Doesnt filter other functions');
- SS_Backtrace::$ignore_function_args = $orig;
+ Config::inst()->remove('SS_Backtrace', 'ignore_function_args');
+ Config::inst()->update('SS_Backtrace', 'ignore_function_args', $orig);
}
}
diff --git a/tests/dev/CsvBulkLoaderTest.php b/tests/dev/CsvBulkLoaderTest.php
index 435972547..6ed542165 100644
--- a/tests/dev/CsvBulkLoaderTest.php
+++ b/tests/dev/CsvBulkLoaderTest.php
@@ -5,7 +5,7 @@
* @todo Test with columnn headers and custom mappings
*/
class CsvBulkLoaderTest extends SapphireTest {
- static $fixture_file = 'CsvBulkLoaderTest.yml';
+ protected static $fixture_file = 'CsvBulkLoaderTest.yml';
protected $extraDataObjects = array(
'CsvBulkLoaderTest_Team',
@@ -206,12 +206,12 @@ class CsvBulkLoaderTest_CustomLoader extends CsvBulkLoader implements TestOnly {
class CsvBulkLoaderTest_Team extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar(255)',
'TeamSize' => 'Int',
);
- static $has_many = array(
+ private static $has_many = array(
'Players' => 'CsvBulkLoaderTest_Player',
);
@@ -219,7 +219,7 @@ class CsvBulkLoaderTest_Team extends DataObject implements TestOnly {
class CsvBulkLoaderTest_Player extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'FirstName' => 'Varchar(255)',
'Biography' => 'HTMLText',
'Birthday' => 'Date',
@@ -227,7 +227,7 @@ class CsvBulkLoaderTest_Player extends DataObject implements TestOnly {
'IsRegistered' => 'Boolean'
);
- static $has_one = array(
+ private static $has_one = array(
'Team' => 'CsvBulkLoaderTest_Team',
'Contract' => 'CsvBulkLoaderTest_PlayerContract'
);
@@ -250,7 +250,7 @@ class CsvBulkLoaderTest_Player extends DataObject implements TestOnly {
}
class CsvBulkLoaderTest_PlayerContract extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Amount' => 'Currency',
);
}
diff --git a/tests/dev/FixtureFactoryTest.php b/tests/dev/FixtureFactoryTest.php
index 5e3a9fc41..2dd7685e2 100644
--- a/tests/dev/FixtureFactoryTest.php
+++ b/tests/dev/FixtureFactoryTest.php
@@ -152,19 +152,19 @@ class FixtureFactoryTest extends SapphireTest {
}
class FixtureFactoryTest_DataObject extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Name" => "Varchar"
);
- static $many_many = array(
+ private static $many_many = array(
"ManyMany" => "FixtureFactoryTest_DataObjectRelation"
);
}
class FixtureFactoryTest_DataObjectRelation extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Name" => "Varchar"
);
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
"TestParent" => "FixtureFactoryTest_DataObject"
);
}
diff --git a/tests/filesystem/FileTest.php b/tests/filesystem/FileTest.php
index 64c4d8cb9..db2d8c8b1 100644
--- a/tests/filesystem/FileTest.php
+++ b/tests/filesystem/FileTest.php
@@ -5,7 +5,7 @@
*/
class FileTest extends SapphireTest {
- static $fixture_file = 'FileTest.yml';
+ protected static $fixture_file = 'FileTest.yml';
protected $extraDataObjects = array('FileTest_MyCustomFile');
@@ -95,8 +95,9 @@ class FileTest extends SapphireTest {
public function testValidateExtension() {
Session::set('loggedInAs', null);
- $origExts = File::$allowed_extensions;
- File::$allowed_extensions = array('txt');
+ $orig = Config::inst()->get('File', 'allowed_extensions');
+ Config::inst()->remove('File', 'allowed_extensions');
+ Config::inst()->update('File', 'allowed_extensions', array('txt'));
$file = $this->objFromFixture('File', 'asdf');
@@ -115,8 +116,9 @@ class FileTest extends SapphireTest {
$file->Name = 'asdf.TXT';
$v = $file->validate();
$this->assertTrue($v->valid());
-
- File::$allowed_extensions = $origExts;
+
+ Config::inst()->remove('File', 'allowed_extensions');
+ Config::inst()->update('File', 'allowed_extensions', $orig);
}
public function testSetNameChangesFilesystemOnWrite() {
@@ -168,8 +170,9 @@ class FileTest extends SapphireTest {
* @expectedException ValidationException
*/
public function testSetNameWithInvalidExtensionDoesntChangeFilesystem() {
- $origExts = File::$allowed_extensions;
- File::$allowed_extensions = array('txt');
+ $orig = Config::inst()->get('File', 'allowed_extensions');
+ Config::inst()->remove('File', 'allowed_extensions');
+ Config::inst()->update('File', 'allowed_extensions', array('txt'));
$file = $this->objFromFixture('File', 'asdf');
$oldPath = $file->getFullPath();
@@ -178,7 +181,8 @@ class FileTest extends SapphireTest {
try {
$file->write();
} catch(ValidationException $e) {
- File::$allowed_extensions = $origExts;
+ Config::inst()->remove('File', 'allowed_extensions');
+ Config::inst()->update('File', 'allowed_extensions', $orig);
throw $e;
}
}
@@ -321,9 +325,9 @@ class FileTest extends SapphireTest {
public function testGetClassForFileExtension() {
- $orig = File::$class_for_file_extension;
- File::$class_for_file_extension['*'] = 'MyGenericFileClass';
- File::$class_for_file_extension['foo'] = 'MyFooFileClass';
+ $orig = File::config()->class_for_file_extension;
+ File::config()->class_for_file_extension = array('*' => 'MyGenericFileClass');
+ File::config()->class_for_file_extension = array('foo' => 'MyFooFileClass');
$this->assertEquals(
'MyFooFileClass',
@@ -341,19 +345,19 @@ class FileTest extends SapphireTest {
'Falls back to generic class for unknown extensions'
);
- File::$class_for_file_extension = $orig;
+ File::config()->class_for_file_extension = $orig;
}
public function testFolderConstructChild() {
- $orig = File::$class_for_file_extension;
- File::$class_for_file_extension['gif'] = 'FileTest_MyCustomFile';
+ $orig = File::config()->class_for_file_extension;
+ File::config()->class_for_file_extension = array('gif' => 'FileTest_MyCustomFile');
$folder1 = $this->objFromFixture('Folder', 'folder1');
$fileID = $folder1->constructChild('myfile.gif');
$file = DataObject::get_by_id('File', $fileID);
$this->assertEquals('FileTest_MyCustomFile', get_class($file));
- File::$class_for_file_extension = $orig;
+ File::config()->class_for_file_extension = $orig;
}
public function testSetsOwnerOnFirstWrite() {
diff --git a/tests/filesystem/FolderTest.php b/tests/filesystem/FolderTest.php
index 4c9c5acbd..0f9b9ceef 100644
--- a/tests/filesystem/FolderTest.php
+++ b/tests/filesystem/FolderTest.php
@@ -8,7 +8,7 @@
*/
class FolderTest extends SapphireTest {
- static $fixture_file = 'FileTest.yml';
+ protected static $fixture_file = 'FileTest.yml';
public function testCreateFromNameAndParentIDSetsFilename() {
$folder1 = $this->objFromFixture('Folder', 'folder1');
diff --git a/tests/filesystem/UploadTest.php b/tests/filesystem/UploadTest.php
index 118886db8..d5b255d35 100644
--- a/tests/filesystem/UploadTest.php
+++ b/tests/filesystem/UploadTest.php
@@ -4,7 +4,7 @@
* @subpackage tests
*/
class UploadTest extends SapphireTest {
- static $fixture_file = 'UploadTest.yml';
+ protected static $fixture_file = 'UploadTest.yml';
public function testUpload() {
// create tmp file
@@ -36,7 +36,13 @@ class UploadTest extends SapphireTest {
'File upload to standard directory in /assets'
);
$this->assertTrue(
- (strpos($file1->getFullPath(), Director::baseFolder() . '/assets/' . Upload::$uploads_folder) !== false),
+ (
+ strpos(
+ $file1->getFullPath(),
+ Director::baseFolder() . '/assets/' . Config::inst()->get('Upload', 'uploads_folder')
+ )
+ !== false
+ ),
'File upload to standard directory in /assets'
);
$file1->delete();
@@ -214,7 +220,7 @@ class UploadTest extends SapphireTest {
// @param String $namePattern A regular expression applied to files in the directory. If the name matches
// the pattern, it is deleted. Directories, . and .. are excluded.
public function deleteTestUploadFiles($namePattern) {
- $tmpFolder = ASSETS_PATH . "/" . Upload::$uploads_folder;
+ $tmpFolder = ASSETS_PATH . "/" . Config::inst()->get('Upload', 'uploads_folder');
$files = scandir($tmpFolder);
foreach ($files as $f) {
if ($f == "." || $f == ".." || is_dir("$tmpFolder/$f")) continue;
diff --git a/tests/forms/CheckboxFieldTest.php b/tests/forms/CheckboxFieldTest.php
index 13e007683..d30392e99 100644
--- a/tests/forms/CheckboxFieldTest.php
+++ b/tests/forms/CheckboxFieldTest.php
@@ -142,7 +142,7 @@ class CheckboxFieldTest extends SapphireTest {
}
class CheckboxFieldTest_Article extends DataObject implements TestOnly {
- public static $db = array(
+ private static $db = array(
'IsChecked' => 'Boolean'
);
diff --git a/tests/forms/CheckboxSetFieldTest.php b/tests/forms/CheckboxSetFieldTest.php
index 459728172..0e9e52f83 100644
--- a/tests/forms/CheckboxSetFieldTest.php
+++ b/tests/forms/CheckboxSetFieldTest.php
@@ -4,7 +4,7 @@
* @subpackage tests
*/
class CheckboxSetFieldTest extends SapphireTest {
- static $fixture_file = 'CheckboxSetFieldTest.yml';
+ protected static $fixture_file = 'CheckboxSetFieldTest.yml';
protected $extraDataObjects = array(
'CheckboxSetFieldTest_Article',
@@ -125,18 +125,18 @@ class CheckboxSetFieldTest extends SapphireTest {
}
class CheckboxSetFieldTest_Article extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Content" => "Text",
);
- static $many_many = array(
+ private static $many_many = array(
"Tags" => "CheckboxSetFieldTest_Tag",
);
}
class CheckboxSetFieldTest_Tag extends DataObject implements TestOnly {
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
'Articles' => 'CheckboxSetFieldTest_Article'
);
}
diff --git a/tests/forms/DateFieldTest.php b/tests/forms/DateFieldTest.php
index dfec0deb0..51a4a1c45 100644
--- a/tests/forms/DateFieldTest.php
+++ b/tests/forms/DateFieldTest.php
@@ -10,15 +10,16 @@ class DateFieldTest extends SapphireTest {
$this->originalLocale = i18n::get_locale();
i18n::set_locale('en_NZ');
- $this->origDateFormat = DateField::$default_config['dateformat'];
- DateField::$default_config['dateformat'] = 'dd/MM/yyyy';
+ $this->origConfig = Config::inst()->get('DateField', 'default_config');
+ Config::inst()->update('DateField', 'default_config', array('dateformat' => 'dd/MM/yyyy'));
}
public function tearDown() {
parent::tearDown();
i18n::set_locale($this->originalLocale);
- DateField::$default_config['dateformat'] = $this->origDateFormat;
+ Config::inst()->remove('DateField', 'default_config');
+ Config::inst()->update('DateField', 'default_config', $this->origConfig);
}
public function testValidateMinDate() {
diff --git a/tests/forms/DatetimeFieldTest.php b/tests/forms/DatetimeFieldTest.php
index dc899d0b6..7802bf444 100644
--- a/tests/forms/DatetimeFieldTest.php
+++ b/tests/forms/DatetimeFieldTest.php
@@ -10,18 +10,20 @@ class DatetimeFieldTest extends SapphireTest {
$this->originalLocale = i18n::get_locale();
i18n::set_locale('en_NZ');
- $this->origDateFormat = DateField::$default_config['dateformat'];
- DateField::$default_config['dateformat'] = 'dd/MM/yyyy';
- $this->origTimeFormat = TimeField::$default_config['timeformat'];
- TimeField::$default_config['timeformat'] = 'HH:mm:ss';
+ $this->origDateConfig = Config::inst()->get('DateField', 'default_config');
+ $this->origTimeConfig = Config::inst()->get('TimeField', 'default_config');
+ Config::inst()->update('DateField', 'default_config', array('dateformat' => 'dd/MM/yyyy'));
+ Config::inst()->update('TimeField', 'default_config', array('timeformat' => 'HH:mm:ss'));
}
public function tearDown() {
parent::tearDown();
i18n::set_locale($this->originalLocale);
- DateField::$default_config['dateformat'] = $this->origDateFormat;
- TimeField::$default_config['timeformat'] = $this->origTimeFormat;
+ Config::inst()->remove('DateField', 'default_config');
+ Config::inst()->update('DateField', 'default_config', $this->origDateConfig);
+ Config::inst()->remove('TimeField', 'default_config');
+ Config::inst()->update('TimeField', 'default_config', $this->origTimeConfig);
}
public function testFormSaveInto() {
@@ -230,7 +232,7 @@ class DatetimeFieldTest extends SapphireTest {
*/
class DatetimeFieldTest_Model extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'MyDatetime' => 'SS_Datetime'
);
diff --git a/tests/forms/EmailFieldTest.php b/tests/forms/EmailFieldTest.php
index ea909f959..d60676211 100644
--- a/tests/forms/EmailFieldTest.php
+++ b/tests/forms/EmailFieldTest.php
@@ -73,7 +73,7 @@ class EmailFieldTest_Validator extends Validator {
class EmailFieldTest_Controller extends Controller implements TestOnly {
- static $url_handlers = array(
+ private static $url_handlers = array(
'$Action//$ID/$OtherID' => "handleAction",
);
diff --git a/tests/forms/FormScaffolderTest.php b/tests/forms/FormScaffolderTest.php
index a6220c8c7..74bd1ac1c 100644
--- a/tests/forms/FormScaffolderTest.php
+++ b/tests/forms/FormScaffolderTest.php
@@ -9,7 +9,7 @@
*/
class FormScaffolderTest extends SapphireTest {
- static $fixture_file = 'FormScaffolderTest.yml';
+ protected static $fixture_file = 'FormScaffolderTest.yml';
protected $extraDataObjects = array(
'FormScaffolderTest_Article',
@@ -106,36 +106,36 @@ class FormScaffolderTest extends SapphireTest {
}
class FormScaffolderTest_Article extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar',
'Content' => 'HTMLText'
);
- static $has_one = array(
+ private static $has_one = array(
'Author' => 'FormScaffolderTest_Author'
);
- static $many_many = array(
+ private static $many_many = array(
'Tags' => 'FormScaffolderTest_Tag',
);
}
class FormScaffolderTest_Author extends Member implements TestOnly {
- static $has_one = array(
+ private static $has_one = array(
'ProfileImage' => 'Image'
);
- static $has_many = array(
+ private static $has_many = array(
'Articles' => 'FormScaffolderTest_Article'
);
}
class FormScaffolderTest_Tag extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar',
);
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
'Articles' => 'FormScaffolderTest_Article'
);
}
class FormScaffolderTest_ArticleExtension extends DataExtension implements TestOnly {
- static $db = array(
+ private static $db = array(
'ExtendedField' => 'Varchar'
);
diff --git a/tests/forms/FormTest.php b/tests/forms/FormTest.php
index c4e31142c..e1fa43048 100644
--- a/tests/forms/FormTest.php
+++ b/tests/forms/FormTest.php
@@ -5,7 +5,7 @@
*/
class FormTest extends FunctionalTest {
- static $fixture_file = 'FormTest.yml';
+ protected static $fixture_file = 'FormTest.yml';
protected $extraDataObjects = array(
'FormTest_Player',
@@ -408,17 +408,17 @@ class FormTest extends FunctionalTest {
}
class FormTest_Player extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
'Biography' => 'Text',
'Birthday' => 'Date'
);
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
'Teams' => 'FormTest_Team'
);
- static $has_one = array(
+ private static $has_one = array(
'FavouriteTeam' => 'FormTest_Team',
);
@@ -429,18 +429,18 @@ class FormTest_Player extends DataObject implements TestOnly {
}
class FormTest_Team extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
'Region' => 'Varchar',
);
- static $many_many = array(
+ private static $many_many = array(
'Players' => 'FormTest_Player'
);
}
class FormTest_Controller extends Controller implements TestOnly {
- static $url_handlers = array(
+ private static $url_handlers = array(
'$Action//$ID/$OtherID' => "handleAction",
);
@@ -502,7 +502,7 @@ class FormTest_Controller extends Controller implements TestOnly {
}
class FormTest_ControllerWithSecurityToken extends Controller implements TestOnly {
- static $url_handlers = array(
+ private static $url_handlers = array(
'$Action//$ID/$OtherID' => "handleAction",
);
diff --git a/tests/forms/GridFieldTest.php b/tests/forms/GridFieldTest.php
index 8047a3491..7f60210d5 100644
--- a/tests/forms/GridFieldTest.php
+++ b/tests/forms/GridFieldTest.php
@@ -466,16 +466,16 @@ class GridFieldTest_Component2 implements GridField_DataManipulator, TestOnly {
}
class GridFieldTest_Team extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
'City' => 'Varchar'
);
- static $many_many = array('Players' => 'GridFieldTest_Player');
+ private static $many_many = array('Players' => 'GridFieldTest_Player');
- static $has_many = array('Cheerleaders' => 'GridFieldTest_Cheerleader');
+ private static $has_many = array('Cheerleaders' => 'GridFieldTest_Cheerleader');
- static $searchable_fields = array(
+ private static $searchable_fields = array(
'Name',
'City',
'Cheerleaders.Name'
@@ -483,20 +483,20 @@ class GridFieldTest_Team extends DataObject implements TestOnly {
}
class GridFieldTest_Player extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
'Email' => 'Varchar',
);
- static $belongs_many_many = array('Teams' => 'GridFieldTest_Team');
+ private static $belongs_many_many = array('Teams' => 'GridFieldTest_Team');
}
class GridFieldTest_Cheerleader extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar'
);
- static $has_one = array('Team' => 'GridFieldTest_Team');
+ private static $has_one = array('Team' => 'GridFieldTest_Team');
}
class GridFieldTest_HTMLFragments implements GridField_HTMLProvider, TestOnly{
@@ -510,12 +510,12 @@ class GridFieldTest_HTMLFragments implements GridField_HTMLProvider, TestOnly{
}
class GridFieldTest_Permissions extends DataObject implements TestOnly {
- public static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
'Email' => 'Varchar',
);
- public static $summary_fields = array(
+ private static $summary_fields = array(
'Name',
'Email'
);
diff --git a/tests/forms/HtmlEditorFieldTest.php b/tests/forms/HtmlEditorFieldTest.php
index 9d55226d3..dccda3861 100644
--- a/tests/forms/HtmlEditorFieldTest.php
+++ b/tests/forms/HtmlEditorFieldTest.php
@@ -5,9 +5,9 @@
*/
class HtmlEditorFieldTest extends FunctionalTest {
- public static $fixture_file = 'HtmlEditorFieldTest.yml';
+ protected static $fixture_file = 'HtmlEditorFieldTest.yml';
- public static $use_draft_site = true;
+ protected static $use_draft_site = true;
protected $requiredExtensions = array(
'HtmlEditorField_Toolbar' => array('HtmlEditorFieldTest_DummyMediaFormFieldExtension')
@@ -110,7 +110,7 @@ class HtmlEditorFieldTest_DummyMediaFormFieldExtension extends Extension impleme
}
class HtmlEditorFieldTest_Object extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar',
'Content' => 'HTMLText'
);
diff --git a/tests/forms/ListboxFieldTest.php b/tests/forms/ListboxFieldTest.php
index 8abbc6d4b..14cc86b20 100644
--- a/tests/forms/ListboxFieldTest.php
+++ b/tests/forms/ListboxFieldTest.php
@@ -6,7 +6,7 @@
class ListboxFieldTest extends SapphireTest {
- static $fixture_file = 'ListboxFieldTest.yml';
+ protected static $fixture_file = 'ListboxFieldTest.yml';
protected $extraDataObjects = array('ListboxFieldTest_DataObject', 'ListboxFieldTest_Article',
'ListboxFieldTest_Tag');
@@ -197,24 +197,24 @@ class ListboxFieldTest extends SapphireTest {
}
class ListboxFieldTest_DataObject extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Choices' => 'Text'
);
}
class ListboxFieldTest_Article extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Content" => "Text",
);
- static $many_many = array(
+ private static $many_many = array(
"Tags" => "ListboxFieldTest_Tag",
);
}
class ListboxFieldTest_Tag extends DataObject implements TestOnly {
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
'Articles' => 'ListboxFieldTest_Article'
);
}
diff --git a/tests/forms/LookupFieldTest.php b/tests/forms/LookupFieldTest.php
index 2f49f7146..2e81ad8e1 100644
--- a/tests/forms/LookupFieldTest.php
+++ b/tests/forms/LookupFieldTest.php
@@ -6,7 +6,7 @@
class LookupFieldTest extends SapphireTest {
- static $fixture_file = 'LookupFieldTest.yml';
+ protected static $fixture_file = 'LookupFieldTest.yml';
public function testNullValueWithNumericArraySource() {
$source = array(1 => 'one', 2 => 'two', 3 => 'three');
diff --git a/tests/forms/MemberDatetimeOptionsetFieldTest.php b/tests/forms/MemberDatetimeOptionsetFieldTest.php
index 2488122a3..ba6366836 100644
--- a/tests/forms/MemberDatetimeOptionsetFieldTest.php
+++ b/tests/forms/MemberDatetimeOptionsetFieldTest.php
@@ -5,7 +5,7 @@
*/
class MemberDatetimeOptionsetFieldTest extends SapphireTest {
- public static $fixture_file = 'MemberDatetimeOptionsetFieldTest.yml';
+ protected static $fixture_file = 'MemberDatetimeOptionsetFieldTest.yml';
protected function createDateFormatFieldForMember($member) {
require_once 'Zend/Date.php';
diff --git a/tests/forms/MoneyFieldTest.php b/tests/forms/MoneyFieldTest.php
index 8d9ccceb9..91ceedd0e 100644
--- a/tests/forms/MoneyFieldTest.php
+++ b/tests/forms/MoneyFieldTest.php
@@ -68,7 +68,7 @@ class MoneyFieldTest extends SapphireTest {
}
class MoneyFieldTest_Object extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'MyMoney' => 'Money',
);
}
@@ -78,7 +78,7 @@ class MoneyFieldTest_Object extends DataObject implements TestOnly {
* MyMoney.
*/
class MoneyFieldTest_CustomSetter_Object extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'MyMoney' => 'Money',
);
diff --git a/tests/forms/TimeFieldTest.php b/tests/forms/TimeFieldTest.php
index 811125c8e..b8050a6d7 100644
--- a/tests/forms/TimeFieldTest.php
+++ b/tests/forms/TimeFieldTest.php
@@ -10,15 +10,16 @@ class TimeFieldTest extends SapphireTest {
$this->originalLocale = i18n::get_locale();
i18n::set_locale('en_NZ');
- $this->origTimeFormat = TimeField::$default_config['timeformat'];
- TimeField::$default_config['timeformat'] = 'HH:mm:ss';
+ $this->origTimeConfig = Config::inst()->get('TimeField', 'default_config');
+ Config::inst()->update('TimeField', 'default_config', array('timeformat' => 'HH:mm:ss'));
}
public function tearDown() {
parent::tearDown();
i18n::set_locale($this->originalLocale);
- TimeField::$default_config['timeformat'] = $this->origTimeFormat;
+ Config::inst()->remove('TimeField', 'default_config');
+ Config::inst()->update('TimeField', 'default_config', $this->origTimeConfig);
}
public function testConstructorWithoutArgs() {
diff --git a/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php b/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
index ae2d59ae8..2141a7fcb 100644
--- a/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
+++ b/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
@@ -1,7 +1,7 @@
'Varchar',
'City' => 'Varchar'
);
diff --git a/tests/forms/gridfield/GridFieldDetailFormTest.php b/tests/forms/gridfield/GridFieldDetailFormTest.php
index 6c50b2e5c..ca3e87dbc 100644
--- a/tests/forms/gridfield/GridFieldDetailFormTest.php
+++ b/tests/forms/gridfield/GridFieldDetailFormTest.php
@@ -1,7 +1,7 @@
'Varchar',
'Surname' => 'Varchar'
);
- static $has_one = array(
+ private static $has_one = array(
'Group' => 'GridFieldDetailFormTest_PeopleGroup'
);
- static $many_many = array(
+ private static $many_many = array(
'Categories' => 'GridFieldDetailFormTest_Category'
);
- static $many_many_extraFields = array(
+ private static $many_many_extraFields = array(
'Categories' => array(
'IsPublished' => 'Boolean'
)
);
- static $default_sort = 'FirstName';
+ private static $default_sort = 'FirstName';
public function getCMSFields() {
$fields = parent::getCMSFields();
@@ -258,15 +258,15 @@ class GridFieldDetailFormTest_Person extends DataObject implements TestOnly {
}
class GridFieldDetailFormTest_PeopleGroup extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar'
);
- static $has_many = array(
+ private static $has_many = array(
'People' => 'GridFieldDetailFormTest_Person'
);
- static $default_sort = 'Name';
+ private static $default_sort = 'Name';
public function getCMSFields() {
$fields = parent::getCMSFields();
@@ -282,15 +282,15 @@ class GridFieldDetailFormTest_PeopleGroup extends DataObject implements TestOnly
}
class GridFieldDetailFormTest_Category extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar'
);
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
'People' => 'GridFieldDetailFormTest_Person'
);
- static $default_sort = 'Name';
+ private static $default_sort = 'Name';
public function getCMSFields() {
$fields = parent::getCMSFields();
diff --git a/tests/forms/gridfield/GridFieldEditButtonTest.php b/tests/forms/gridfield/GridFieldEditButtonTest.php
index 69235eee0..5ec22c6e5 100644
--- a/tests/forms/gridfield/GridFieldEditButtonTest.php
+++ b/tests/forms/gridfield/GridFieldEditButtonTest.php
@@ -12,7 +12,7 @@ class GridFieldEditButtonTest extends SapphireTest {
protected $form;
/** @var string */
- public static $fixture_file = 'GridFieldActionTest.yml';
+ protected static $fixture_file = 'GridFieldActionTest.yml';
/** @var array */
protected $extraDataObjects = array('GridFieldAction_Delete_Team', 'GridFieldAction_Edit_Team');
@@ -46,7 +46,7 @@ class GridFieldEditButtonTest extends SapphireTest {
}
class GridFieldAction_Edit_Team extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
'City' => 'Varchar'
);
diff --git a/tests/forms/gridfield/GridFieldExportButtonTest.php b/tests/forms/gridfield/GridFieldExportButtonTest.php
index 476d53f80..59d2c0848 100644
--- a/tests/forms/gridfield/GridFieldExportButtonTest.php
+++ b/tests/forms/gridfield/GridFieldExportButtonTest.php
@@ -7,7 +7,7 @@ class GridFieldExportButtonTest extends SapphireTest {
protected $form;
- public static $fixture_file = 'GridFieldExportButtonTest.yml';
+ protected static $fixture_file = 'GridFieldExportButtonTest.yml';
protected $extraDataObjects = array(
'GridFieldExportButtonTest_Team'
@@ -77,7 +77,7 @@ class GridFieldExportButtonTest extends SapphireTest {
}
class GridFieldExportButtonTest_Team extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
'City' => 'Varchar'
);
diff --git a/tests/forms/gridfield/GridFieldPaginatorTest.php b/tests/forms/gridfield/GridFieldPaginatorTest.php
index 8e53e169a..8a77aec0b 100644
--- a/tests/forms/gridfield/GridFieldPaginatorTest.php
+++ b/tests/forms/gridfield/GridFieldPaginatorTest.php
@@ -7,7 +7,7 @@ class GridFieldPaginatorTest extends FunctionalTest {
protected $gridField;
/** @var string */
- static $fixture_file = 'GridFieldTest.yml';
+ protected static $fixture_file = 'GridFieldTest.yml';
/** @var Form */
protected $form;
diff --git a/tests/forms/uploadfield/UploadFieldTest.php b/tests/forms/uploadfield/UploadFieldTest.php
index 9543414ab..20f27ec38 100644
--- a/tests/forms/uploadfield/UploadFieldTest.php
+++ b/tests/forms/uploadfield/UploadFieldTest.php
@@ -6,7 +6,7 @@
class UploadFieldTest extends FunctionalTest {
- static $fixture_file = 'UploadFieldTest.yml';
+ protected static $fixture_file = 'UploadFieldTest.yml';
protected $extraDataObjects = array('UploadFieldTest_Record');
@@ -726,23 +726,23 @@ class UploadFieldTest extends FunctionalTest {
class UploadFieldTest_Record extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Text',
);
- static $has_one = array(
+ private static $has_one = array(
'HasOneFile' => 'File',
'HasOneFileMaxOne' => 'File',
'HasOneFileMaxTwo' => 'File',
'HasOneExtendedFile' => 'UploadFieldTest_ExtendedFile'
);
- static $has_many = array(
+ private static $has_many = array(
'HasManyFiles' => 'File',
'HasManyFilesMaxTwo' => 'File',
);
- static $many_many = array(
+ private static $many_many = array(
'ManyManyFiles' => 'File',
);
@@ -750,7 +750,7 @@ class UploadFieldTest_Record extends DataObject implements TestOnly {
class UploadFieldTest_FileExtension extends DataExtension implements TestOnly {
- public static $has_one = array(
+ private static $has_one = array(
'Record' => 'UploadFieldTest_Record'
);
diff --git a/tests/i18n/i18nSSLegacyAdapterTest.php b/tests/i18n/i18nSSLegacyAdapterTest.php
index 2e7c0a8d5..3aecadef9 100644
--- a/tests/i18n/i18nSSLegacyAdapterTest.php
+++ b/tests/i18n/i18nSSLegacyAdapterTest.php
@@ -12,14 +12,14 @@ class i18nSSLegacyAdapterTest extends SapphireTest {
$this->alternateBasePath = $this->getCurrentAbsolutePath() . "/_fakewebroot";
$this->alternateBaseSavePath = TEMP_FOLDER . '/i18nTextCollectorTest_webroot';
FileSystem::makeFolder($this->alternateBaseSavePath);
- Director::setBaseFolder($this->alternateBasePath);
+ Config::inst()->update('Director', 'alternate_base_folder', $this->alternateBasePath);
// Push a template loader running from the fake webroot onto the stack.
$templateManifest = new SS_TemplateManifest($this->alternateBasePath, null, false, true);
$templateManifest->regenerate(false);
SS_TemplateLoader::instance()->pushManifest($templateManifest);
- $this->_oldTheme = SSViewer::current_theme();
- SSViewer::set_theme('testtheme1');
+ $this->_oldTheme = Config::inst()->get('SSViewer', 'theme');
+ Config::inst()->update('SSViewer', 'theme', 'testtheme1');
$classManifest = new SS_ClassManifest($this->alternateBasePath, null, true, true, false);
SS_ClassLoader::instance()->pushManifest($classManifest);
@@ -43,8 +43,8 @@ class i18nSSLegacyAdapterTest extends SapphireTest {
SS_TemplateLoader::instance()->popManifest();
SS_ClassLoader::instance()->popManifest();
i18n::set_locale($this->originalLocale);
- Director::setBaseFolder(null);
- SSViewer::set_theme($this->_oldTheme);
+ Config::inst()->update('Director', 'alternate_base_folder', null);
+ Config::inst()->update('SSViewer', 'theme', $this->_oldTheme);
i18n::register_translator($this->origAdapter, 'core');
parent::tearDown();
diff --git a/tests/i18n/i18nTest.php b/tests/i18n/i18nTest.php
index 736ffb1fa..a95723cfd 100644
--- a/tests/i18n/i18nTest.php
+++ b/tests/i18n/i18nTest.php
@@ -31,14 +31,14 @@ class i18nTest extends SapphireTest {
$this->alternateBasePath = $this->getCurrentAbsolutePath() . "/_fakewebroot";
$this->alternateBaseSavePath = TEMP_FOLDER . '/i18nTextCollectorTest_webroot';
FileSystem::makeFolder($this->alternateBaseSavePath);
- Director::setBaseFolder($this->alternateBasePath);
+ Config::inst()->update('Director', 'alternate_base_folder', $this->alternateBasePath);
// Push a template loader running from the fake webroot onto the stack.
$templateManifest = new SS_TemplateManifest($this->alternateBasePath, null, false, true);
$templateManifest->regenerate(false);
SS_TemplateLoader::instance()->pushManifest($templateManifest);
- $this->_oldTheme = SSViewer::current_theme();
- SSViewer::set_theme('testtheme1');
+ $this->_oldTheme = Config::inst()->get('SSViewer', 'theme');
+ Config::inst()->update('SSViewer', 'theme', 'testtheme1');
$this->originalLocale = i18n::get_locale();
@@ -58,8 +58,8 @@ class i18nTest extends SapphireTest {
public function tearDown() {
SS_TemplateLoader::instance()->popManifest();
i18n::set_locale($this->originalLocale);
- Director::setBaseFolder(null);
- SSViewer::set_theme($this->_oldTheme);
+ Config::inst()->update('Director', 'alternate_base_folder', null);
+ Config::inst()->update('SSViewer', 'theme', $this->_oldTheme);
i18n::register_translator($this->origAdapter, 'core');
parent::tearDown();
@@ -84,14 +84,14 @@ class i18nTest extends SapphireTest {
public function testDateFormatCustom() {
i18n::set_locale('en_US');
$this->assertEquals('MMM d, y', i18n::get_date_format());
- i18n::set_date_format('d/MM/yyyy');
+ i18n::config()->date_format = 'd/MM/yyyy';
$this->assertEquals('d/MM/yyyy', i18n::get_date_format());
}
public function testTimeFormatCustom() {
i18n::set_locale('en_US');
$this->assertEquals('h:mm:ss a', i18n::get_time_format());
- i18n::set_time_format('HH:mm:ss');
+ i18n::config()->time_format = 'HH:mm:ss';
$this->assertEquals('HH:mm:ss', i18n::get_time_format());
}
@@ -567,20 +567,20 @@ class i18nTest extends SapphireTest {
class i18nTest_DataObject extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'MyProperty' => 'Varchar',
'MyUntranslatedProperty' => 'Text'
);
- static $has_one = array(
+ private static $has_one = array(
'HasOneRelation' => 'Member'
);
- static $has_many = array(
+ private static $has_many = array(
'HasManyRelation' => 'Member'
);
- static $many_many = array(
+ private static $many_many = array(
'ManyManyRelation' => 'Member'
);
diff --git a/tests/i18n/i18nTextCollectorTest.php b/tests/i18n/i18nTextCollectorTest.php
index c1cac97eb..c62faf9b2 100644
--- a/tests/i18n/i18nTextCollectorTest.php
+++ b/tests/i18n/i18nTextCollectorTest.php
@@ -470,8 +470,8 @@ YAML;
public function testCollectFromThemesTemplates() {
$c = new i18nTextCollector();
- $theme = SSViewer::current_theme();
- SSViewer::set_theme('testtheme1');
+ $theme = Config::inst()->get('SSViewer', 'theme');
+ Config::inst()->update('SSViewer', 'theme', 'testtheme1');
$templateFilePath = $this->alternateBasePath . '/themes/testtheme1/templates/Layout/i18nTestTheme1.ss';
$html = file_get_contents($templateFilePath);
@@ -523,7 +523,7 @@ YAML;
array('Theme1 My include replacement no namespace: %s')
);
- SSViewer::set_theme($theme);
+ Config::inst()->update('SSViewer', 'theme', $theme);
}
public function testCollectFromFilesystemAndWriteMasterTables() {
diff --git a/tests/i18n/i18nTextCollectorTestMyObject.php b/tests/i18n/i18nTextCollectorTestMyObject.php
index 692ed0932..3f0561668 100644
--- a/tests/i18n/i18nTextCollectorTestMyObject.php
+++ b/tests/i18n/i18nTextCollectorTestMyObject.php
@@ -4,16 +4,16 @@
* @subpackage tests
*/
class i18nTextCollectorTestMyObject extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'FirstProperty' => 'Varchar',
'SecondProperty' => 'Int'
);
- static $has_many = array(
+ private static $has_many = array(
'Relation' => 'Group'
);
- static $singular_name = "My Object";
+ private static $singular_name = "My Object";
- static $plural_name = "My Objects";
+ private static $plural_name = "My Objects";
}
diff --git a/tests/i18n/i18nTextCollectorTestMySubObject.php b/tests/i18n/i18nTextCollectorTestMySubObject.php
index d594dc015..c6b99e598 100644
--- a/tests/i18n/i18nTextCollectorTestMySubObject.php
+++ b/tests/i18n/i18nTextCollectorTestMySubObject.php
@@ -4,15 +4,15 @@
* @subpackage tests
*/
class i18nTextCollectorTestMySubObject extends i18nTextCollectorTestMyObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'SubProperty' => 'Varchar',
);
- static $has_many = array(
+ private static $has_many = array(
'SubRelation' => 'Group'
);
- static $singular_name = "My Sub Object";
+ private static $singular_name = "My Sub Object";
- static $plural_name = "My Sub Objects";
+ private static $plural_name = "My Sub Objects";
}
diff --git a/tests/injector/InjectorTest.php b/tests/injector/InjectorTest.php
index 7c9a89f0e..16cc4942e 100644
--- a/tests/injector/InjectorTest.php
+++ b/tests/injector/InjectorTest.php
@@ -647,7 +647,8 @@ class NewRequirementsBackend implements TestOnly {
class TestStaticInjections implements TestOnly {
public $backend;
- static $dependencies = array(
+ /** @config */
+ private static $dependencies = array(
'backend' => '%$NewRequirementsBackend'
);
diff --git a/tests/model/AggregateTest.php b/tests/model/AggregateTest.php
index 2d71cbf0c..b1f5336b5 100644
--- a/tests/model/AggregateTest.php
+++ b/tests/model/AggregateTest.php
@@ -10,48 +10,48 @@
* removed from DataObject.
*/
class AggregateTest_Foo extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Foo" => "Int"
);
- static $has_one = array('Bar' => 'AggregateTest_Bar');
- static $belongs_many_many = array('Bazi' => 'AggregateTest_Baz');
+ private static $has_one = array('Bar' => 'AggregateTest_Bar');
+ private static $belongs_many_many = array('Bazi' => 'AggregateTest_Baz');
}
class AggregateTest_Fab extends AggregateTest_Foo {
- static $db = array(
+ private static $db = array(
"Fab" => "Int"
);
}
class AggregateTest_Fac extends AggregateTest_Fab {
- static $db = array(
+ private static $db = array(
"Fac" => "Int"
);
}
class AggregateTest_Bar extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Bar" => "Int"
);
- static $has_many = array(
+ private static $has_many = array(
"Foos" => "AggregateTest_Foo"
);
}
class AggregateTest_Baz extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Baz" => "Int"
);
- static $many_many = array(
+ private static $many_many = array(
"Foos" => "AggregateTest_Foo"
);
}
class AggregateTest extends SapphireTest {
- static $fixture_file = 'AggregateTest.yml';
+ protected static $fixture_file = 'AggregateTest.yml';
protected $extraDataObjects = array(
'AggregateTest_Foo',
diff --git a/tests/model/ComponentSetTest.php b/tests/model/ComponentSetTest.php
index 074fe2503..bc92fa2bd 100644
--- a/tests/model/ComponentSetTest.php
+++ b/tests/model/ComponentSetTest.php
@@ -5,7 +5,7 @@
*/
class ComponentSetTest extends SapphireTest {
- static $fixture_file = 'ComponentSetTest.yml';
+ protected static $fixture_file = 'ComponentSetTest.yml';
protected $extraDataObjects = array(
'ComponentSetTest_Player',
@@ -57,18 +57,18 @@ class ComponentSetTest extends SapphireTest {
}
class ComponentSetTest_Player extends Member implements TestOnly {
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
'Teams' => 'ComponentSetTest_Team'
);
}
class ComponentSetTest_Team extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar',
);
- static $many_many = array(
+ private static $many_many = array(
'Players' => 'ComponentSetTest_Player'
);
}
diff --git a/tests/model/CompositeDBFieldTest.php b/tests/model/CompositeDBFieldTest.php
index 82bbc486f..21f95b921 100644
--- a/tests/model/CompositeDBFieldTest.php
+++ b/tests/model/CompositeDBFieldTest.php
@@ -38,14 +38,14 @@ class CompositeDBFieldTest extends SapphireTest {
}
class CompositeDBFieldTest_DataObject extends DataObject {
- static $db = array(
+ private static $db = array(
'Title' => 'Text',
'MyMoney' => 'Money',
);
}
class SubclassedDBFieldObject extends CompositeDBFieldTest_DataObject {
- static $db = array(
+ private static $db = array(
'OtherField' => 'Text',
'OtherMoney' => 'Money',
);
diff --git a/tests/model/DBTest.php b/tests/model/DBTest.php
index 136d74905..c63a738d9 100644
--- a/tests/model/DBTest.php
+++ b/tests/model/DBTest.php
@@ -5,32 +5,18 @@
*/
class DBTest extends SapphireTest {
- protected $origEnvType;
-
- function setUp() {
- $this->origEnvType = Director::get_environment_type();
- Director::set_environment_type('dev');
-
- parent::setUp();
- }
-
- function tearDown() {
- Director::set_environment_type($this->origEnvType);
-
- parent::tearDown();
- }
-
function testValidAlternativeDatabaseName() {
+ Config::inst()->update('Director', 'environment_type', 'dev');
$this->assertTrue(DB::valid_alternative_database_name('ss_tmpdb1234567'));
$this->assertFalse(DB::valid_alternative_database_name('ss_tmpdb12345678'));
$this->assertFalse(DB::valid_alternative_database_name('tmpdb1234567'));
$this->assertFalse(DB::valid_alternative_database_name('random'));
$this->assertFalse(DB::valid_alternative_database_name(''));
- $origEnvType = Director::get_environment_type();
- Director::set_environment_type('live');
+ Config::inst()->update('Director', 'environment_type', 'live');
$this->assertFalse(DB::valid_alternative_database_name('ss_tmpdb1234567'));
- Director::set_environment_type($origEnvType);
+
+ Config::inst()->update('Director', 'environment_type', 'dev');
}
}
\ No newline at end of file
diff --git a/tests/model/DataDifferencerTest.php b/tests/model/DataDifferencerTest.php
index 049d0f624..b0c20bb01 100644
--- a/tests/model/DataDifferencerTest.php
+++ b/tests/model/DataDifferencerTest.php
@@ -6,7 +6,7 @@
class DataDifferencerTest extends SapphireTest {
- static $fixture_file = 'DataDifferencerTest.yml';
+ protected static $fixture_file = 'DataDifferencerTest.yml';
protected $extraDataObjects = array(
'DataDifferencerTest_Object',
@@ -39,12 +39,12 @@ class DataDifferencerTest extends SapphireTest {
// this is only really necessary to make the test pass when FRAMEWORK_DIR is not "framework"
$image1->Filename = FRAMEWORK_DIR . substr($image1->Filename, 9);
$image2->Filename = FRAMEWORK_DIR . substr($image2->Filename, 9);
- $origUpdateFilesystem = File::$update_filesystem;
+ $origUpdateFilesystem = Config::inst()->get('File', 'update_filesystem');
// we don't want the filesystem being updated on write, as we're only dealing with mock files
- File::$update_filesystem = false;
+ Config::inst()->update('File', 'update_filesystem', false);
$image1->write();
$image2->write();
- File::$update_filesystem = $origUpdateFilesystem;
+ Config::inst()->update('File', 'update_filesystem', $origUpdateFilesystem);
// create a new version
$obj1->ImageID = $image2->ID;
@@ -64,13 +64,13 @@ class DataDifferencerTest extends SapphireTest {
class DataDifferencerTest_Object extends DataObject implements TestOnly {
- static $extensions = array('Versioned("Stage", "Live")');
+ private static $extensions = array('Versioned("Stage", "Live")');
- static $db = array(
+ private static $db = array(
'Choices' => "Varchar",
);
- static $has_one = array(
+ private static $has_one = array(
'Image' => 'DataDifferencerTest_MockImage',
'HasOneRelation' => 'DataDifferencerTest_HasOneRelationObject'
);
@@ -100,11 +100,11 @@ class DataDifferencerTest_Object extends DataObject implements TestOnly {
class DataDifferencerTest_HasOneRelationObject extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar'
);
- static $has_many = array(
+ private static $has_many = array(
'Objects' => 'DataDifferencerTest_Object'
);
}
diff --git a/tests/model/DataExtensionTest.php b/tests/model/DataExtensionTest.php
index 2a459ba0c..a00ebb41f 100644
--- a/tests/model/DataExtensionTest.php
+++ b/tests/model/DataExtensionTest.php
@@ -1,7 +1,7 @@
"Varchar",
"Email" => "Varchar"
);
@@ -169,7 +169,7 @@ class DataExtensionTest_Member extends DataObject implements TestOnly {
class DataExtensionTest_Player extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar'
);
@@ -200,31 +200,31 @@ class DataExtensionTest_PlayerExtension extends DataExtension implements TestOnl
class DataExtensionTest_ContactRole extends DataExtension implements TestOnly {
- public static $db = array(
+ private static $db = array(
'Website' => 'Varchar',
'Phone' => 'Varchar(255)',
);
- public static $has_many = array(
+ private static $has_many = array(
'RelatedObjects' => 'DataExtensionTest_RelatedObject'
);
- public static $defaults = array(
+ private static $defaults = array(
'Phone' => '123'
);
- public static $api_access = true;
+ private static $api_access = true;
}
class DataExtensionTest_RelatedObject extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"FieldOne" => "Varchar",
"FieldTwo" => "Varchar"
);
- static $has_one = array(
+ private static $has_one = array(
"Contact" => "DataExtensionTest_Member"
);
@@ -234,7 +234,7 @@ DataExtensionTest_Member::add_extension('DataExtensionTest_ContactRole');
class DataExtensionTest_MyObject extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar',
);
@@ -295,7 +295,7 @@ class DataExtensionTest_Ext2 extends DataExtension implements TestOnly {
class DataExtensionTest_Faves extends DataExtension implements TestOnly {
- public static $many_many = array(
+ private static $many_many = array(
'Faves' => 'DataExtensionTest_RelatedObject'
);
diff --git a/tests/model/DataListTest.php b/tests/model/DataListTest.php
index f46fc3aaa..f2e8ec99f 100644
--- a/tests/model/DataListTest.php
+++ b/tests/model/DataListTest.php
@@ -3,7 +3,7 @@
class DataListTest extends SapphireTest {
// Borrow the model from DataObjectTest
- static $fixture_file = 'DataObjectTest.yml';
+ protected static $fixture_file = 'DataObjectTest.yml';
protected $extraDataObjects = array(
'DataObjectTest_Team',
diff --git a/tests/model/DataObjectDuplicationTest.php b/tests/model/DataObjectDuplicationTest.php
index 2d4edc9a1..953eaa0b4 100644
--- a/tests/model/DataObjectDuplicationTest.php
+++ b/tests/model/DataObjectDuplicationTest.php
@@ -74,26 +74,26 @@ class DataObjectDuplicationTest extends SapphireTest {
class DataObjectDuplicateTestClass1 extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'text' => 'Varchar'
);
- static $has_many = array(
+ private static $has_many = array(
'twos' => 'DataObjectDuplicateTestClass2'
);
- static $many_many = array(
+ private static $many_many = array(
'threes' => 'DataObjectDuplicateTestClass3'
);
}
class DataObjectDuplicateTestClass2 extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'text' => 'Varchar'
);
- static $has_one = array(
+ private static $has_one = array(
'one' => 'DataObjectDuplicateTestClass1'
);
@@ -101,11 +101,11 @@ class DataObjectDuplicateTestClass2 extends DataObject implements TestOnly {
class DataObjectDuplicateTestClass3 extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'text' => 'Varchar'
);
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
'ones' => 'DataObjectDuplicateTestClass1'
);
}
diff --git a/tests/model/DataObjectLazyLoadingTest.php b/tests/model/DataObjectLazyLoadingTest.php
index ceb073f9d..a5d4e4691 100644
--- a/tests/model/DataObjectLazyLoadingTest.php
+++ b/tests/model/DataObjectLazyLoadingTest.php
@@ -6,7 +6,7 @@
class DataObjectLazyLoadingTest extends SapphireTest {
- static $fixture_file = array(
+ protected static $fixture_file = array(
'DataObjectTest.yml',
'VersionedTest.yml'
);
@@ -395,19 +395,19 @@ class DataObjectLazyLoadingTest extends SapphireTest {
/** Additional classes for versioned lazy loading testing */
class VersionedLazy_DataObject extends DataObject {
- static $db = array(
+ private static $db = array(
"PageName" => "Varchar"
);
- static $extensions = array(
+ private static $extensions = array(
"Versioned('Stage', 'Live')"
);
}
class VersionedLazySub_DataObject extends VersionedLazy_DataObject {
- static $db = array(
+ private static $db = array(
"ExtraField" => "Varchar",
);
- static $extensions = array(
+ private static $extensions = array(
"Versioned('Stage', 'Live')"
);
}
\ No newline at end of file
diff --git a/tests/model/DataObjectSchemaGenerationTest.php b/tests/model/DataObjectSchemaGenerationTest.php
index 1385ad3d9..6c2d86c76 100644
--- a/tests/model/DataObjectSchemaGenerationTest.php
+++ b/tests/model/DataObjectSchemaGenerationTest.php
@@ -127,7 +127,7 @@ class DataObjectSchemaGenerationTest extends SapphireTest {
}
class DataObjectSchemaGenerationTest_DO extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Enum1' => 'Enum("A, B, C, D","")',
'Enum2' => 'Enum("A, B, C, D","A")',
);
@@ -135,12 +135,12 @@ class DataObjectSchemaGenerationTest_DO extends DataObject implements TestOnly {
class DataObjectSchemaGenerationTest_IndexDO extends DataObjectSchemaGenerationTest_DO implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar(255)',
'Content' => 'Text'
);
- static $indexes = array(
+ private static $indexes = array(
'NameIndex' => 'unique ("Title")',
'SearchFields' => array(
'type' => 'fulltext',
@@ -149,7 +149,8 @@ class DataObjectSchemaGenerationTest_IndexDO extends DataObjectSchemaGenerationT
)
);
- static $indexes_alt = array(
+ /** @config */
+ private static $indexes_alt = array(
'NameIndex' => array(
'type' => 'unique',
'name' => 'NameIndex',
diff --git a/tests/model/DataObjectTest.php b/tests/model/DataObjectTest.php
index 49b120ffe..c651e64e9 100644
--- a/tests/model/DataObjectTest.php
+++ b/tests/model/DataObjectTest.php
@@ -5,7 +5,7 @@
*/
class DataObjectTest extends SapphireTest {
- static $fixture_file = 'DataObjectTest.yml';
+ protected static $fixture_file = 'DataObjectTest.yml';
protected $extraDataObjects = array(
'DataObjectTest_Team',
@@ -1120,48 +1120,48 @@ class DataObjectTest extends SapphireTest {
}
class DataObjectTest_Player extends Member implements TestOnly {
- static $db = array(
+ private static $db = array(
'IsRetired' => 'Boolean',
'ShirtNumber' => 'Varchar',
);
- static $has_one = array(
+ private static $has_one = array(
'FavouriteTeam' => 'DataObjectTest_Team',
);
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
'Teams' => 'DataObjectTest_Team'
);
}
class DataObjectTest_Team extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar',
'DatabaseField' => 'HTMLVarchar'
);
- static $has_one = array(
+ private static $has_one = array(
"Captain" => 'DataObjectTest_Player',
'HasOneRelationship' => 'DataObjectTest_Player',
);
- static $has_many = array(
+ private static $has_many = array(
'SubTeams' => 'DataObjectTest_SubTeam',
'Comments' => 'DataObjectTest_TeamComment'
);
- static $many_many = array(
+ private static $many_many = array(
'Players' => 'DataObjectTest_Player'
);
- static $many_many_extraFields = array(
+ private static $many_many_extraFields = array(
'Players' => array(
'Position' => 'Varchar(100)'
)
);
- static $default_sort = "Title";
+ private static $default_sort = "Title";
public function MyTitle() {
return 'Team ' . $this->Title;
@@ -1174,7 +1174,7 @@ class DataObjectTest_Team extends DataObject implements TestOnly {
}
class DataObjectTest_Fixture extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
// Funny field names
'Data' => 'Varchar',
'Duplicate' => 'Varchar',
@@ -1188,7 +1188,7 @@ class DataObjectTest_Fixture extends DataObject implements TestOnly {
'MyFieldWithAltDefault' => 'Varchar'
);
- static $defaults = array(
+ private static $defaults = array(
'MyFieldWithDefault' => 'Default Value',
);
@@ -1201,16 +1201,16 @@ class DataObjectTest_Fixture extends DataObject implements TestOnly {
}
class DataObjectTest_SubTeam extends DataObjectTest_Team implements TestOnly {
- static $db = array(
+ private static $db = array(
'SubclassDatabaseField' => 'Varchar'
);
- static $has_one = array(
+ private static $has_one = array(
"ParentTeam" => 'DataObjectTest_Team',
);
}
class OtherSubclassWithSameField extends DataObjectTest_Team implements TestOnly {
- static $db = array(
+ private static $db = array(
'SubclassDatabaseField' => 'Varchar',
);
}
@@ -1225,11 +1225,11 @@ class DataObjectTest_FieldlessSubTable extends DataObjectTest_Team implements Te
class DataObjectTest_Team_Extension extends DataExtension implements TestOnly {
- static $db = array(
+ private static $db = array(
'ExtendedDatabaseField' => 'Varchar'
);
- static $has_one = array(
+ private static $has_one = array(
'ExtendedHasOneRelationship' => 'DataObjectTest_Player'
);
@@ -1241,7 +1241,7 @@ class DataObjectTest_Team_Extension extends DataExtension implements TestOnly {
class DataObjectTest_ValidatedObject extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar(50)'
);
@@ -1255,38 +1255,38 @@ class DataObjectTest_ValidatedObject extends DataObject implements TestOnly {
}
class DataObjectTest_Company extends DataObject {
- public static $has_one = array (
+ private static $has_one = array (
'CEO' => 'DataObjectTest_CEO',
'PreviousCEO' => 'DataObjectTest_CEO'
);
- public static $has_many = array (
+ private static $has_many = array (
'CurrentStaff' => 'DataObjectTest_Staff.CurrentCompany',
'PreviousStaff' => 'DataObjectTest_Staff.PreviousCompany'
);
}
class DataObjectTest_Staff extends DataObject {
- public static $has_one = array (
+ private static $has_one = array (
'CurrentCompany' => 'DataObjectTest_Company',
'PreviousCompany' => 'DataObjectTest_Company'
);
}
class DataObjectTest_CEO extends DataObjectTest_Staff {
- public static $belongs_to = array (
+ private static $belongs_to = array (
'Company' => 'DataObjectTest_Company.CEO',
'PreviousCompany' => 'DataObjectTest_Company.PreviousCEO'
);
}
class DataObjectTest_TeamComment extends DataObject {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
'Comment' => 'Text'
);
- static $has_one = array(
+ private static $has_one = array(
'Team' => 'DataObjectTest_Team'
);
diff --git a/tests/model/DataObjectTest_Namespaced.php b/tests/model/DataObjectTest_Namespaced.php
index 04ba04649..e0402d62a 100644
--- a/tests/model/DataObjectTest_Namespaced.php
+++ b/tests/model/DataObjectTest_Namespaced.php
@@ -7,7 +7,7 @@ namespace DataObjectTest;
* Note that it was deliberated named to include "\N" to try and trip bad code up.
*/
class NamespacedClass extends \DataObject {
- static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
);
}
diff --git a/tests/model/DataQueryTest.php b/tests/model/DataQueryTest.php
index 95911f343..fe4aed32b 100644
--- a/tests/model/DataQueryTest.php
+++ b/tests/model/DataQueryTest.php
@@ -119,38 +119,38 @@ class DataQueryTest extends SapphireTest {
class DataQueryTest_A extends DataObject implements TestOnly {
- public static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
);
- public static $has_one = array(
+ private static $has_one = array(
'TestC' => 'DataQueryTest_C',
);
}
class DataQueryTest_B extends DataQueryTest_A {
- public static $db = array(
+ private static $db = array(
'Title' => 'Varchar',
);
- public static $has_one = array(
+ private static $has_one = array(
'TestC' => 'DataQueryTest_C',
);
}
class DataQueryTest_C extends DataObject implements TestOnly {
- public static $has_one = array(
+ private static $has_one = array(
'TestA' => 'DataQueryTest_A',
'TestB' => 'DataQueryTest_B',
);
- public static $has_many = array(
+ private static $has_many = array(
'TestAs' => 'DataQueryTest_A',
'TestBs' => 'DataQueryTest_B',
);
- public static $many_many = array(
+ private static $many_many = array(
'ManyTestAs' => 'DataQueryTest_A',
'ManyTestBs' => 'DataQueryTest_B',
);
@@ -158,7 +158,7 @@ class DataQueryTest_C extends DataObject implements TestOnly {
class DataQueryTest_D extends DataObject implements TestOnly {
- public static $has_one = array(
+ private static $has_one = array(
'Relation' => 'DataQueryTest_B',
);
}
diff --git a/tests/model/DatabaseTest.php b/tests/model/DatabaseTest.php
index 7a246a7e4..a4cfdffa1 100644
--- a/tests/model/DatabaseTest.php
+++ b/tests/model/DatabaseTest.php
@@ -150,9 +150,9 @@ class DatabaseTest extends SapphireTest {
class DatabaseTest_MyObject extends DataObject implements TestOnly {
- static $create_table_options = array('MySQLDatabase' => 'ENGINE=InnoDB');
+ private static $create_table_options = array('MySQLDatabase' => 'ENGINE=InnoDB');
- static $db = array(
+ private static $db = array(
'MyField' => 'Varchar'
);
}
diff --git a/tests/model/DbDatetimeTest.php b/tests/model/DbDatetimeTest.php
index 1a89f036a..630c2103b 100644
--- a/tests/model/DbDatetimeTest.php
+++ b/tests/model/DbDatetimeTest.php
@@ -2,7 +2,7 @@
class DbDatetimeTest extends FunctionalTest {
- static $fixture_file = 'DbDatetimeTest.yml';
+ protected static $fixture_file = 'DbDatetimeTest.yml';
protected $extraDataObjects = array('DbDatetimeTest_Team');
@@ -139,7 +139,7 @@ class DbDatetimeTest extends FunctionalTest {
}
class DbDateTimeTest_Team extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar'
);
}
\ No newline at end of file
diff --git a/tests/model/DecimalTest.php b/tests/model/DecimalTest.php
index 9566567eb..8a9dad9dd 100644
--- a/tests/model/DecimalTest.php
+++ b/tests/model/DecimalTest.php
@@ -5,7 +5,7 @@
*/
class DecimalTest extends SapphireTest {
- public static $fixture_file = 'DecimalTest.yml';
+ protected static $fixture_file = 'DecimalTest.yml';
protected $testDataObject;
@@ -46,7 +46,7 @@ class DecimalTest extends SapphireTest {
*/
class DecimalTest_DataObject extends DataObject implements TestOnly {
- public static $db = array(
+ private static $db = array(
'Name' => 'Varchar',
'MyDecimal1' => 'Decimal',
'MyDecimal2' => 'Decimal(5,3,2.5)',
@@ -54,7 +54,7 @@ class DecimalTest_DataObject extends DataObject implements TestOnly {
'MyDecimal4' => 'Decimal'
);
- public static $defaults = array(
+ private static $defaults = array(
'MyDecimal4' => 4
);
diff --git a/tests/model/HasManyListTest.php b/tests/model/HasManyListTest.php
index 1bb3b56fa..5f54d4214 100644
--- a/tests/model/HasManyListTest.php
+++ b/tests/model/HasManyListTest.php
@@ -3,7 +3,7 @@
class HasManyListTest extends SapphireTest {
// Borrow the model from DataObjectTest
- public static $fixture_file = 'DataObjectTest.yml';
+ protected static $fixture_file = 'DataObjectTest.yml';
protected $extraDataObjects = array(
'DataObjectTest_Team',
diff --git a/tests/model/HierarchyTest.php b/tests/model/HierarchyTest.php
index 881b3a247..d3c43957f 100644
--- a/tests/model/HierarchyTest.php
+++ b/tests/model/HierarchyTest.php
@@ -2,7 +2,7 @@
class HierarchyTest extends SapphireTest {
- static $fixture_file = 'HierarchyTest.yml';
+ protected static $fixture_file = 'HierarchyTest.yml';
protected $requiredExtensions = array(
'HierarchyTest_Object' => array('Hierarchy', 'Versioned')
@@ -415,11 +415,11 @@ class HierarchyTest extends SapphireTest {
}
class HierarchyTest_Object extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar'
);
- static $extensions = array(
+ private static $extensions = array(
'Hierarchy',
"Versioned('Stage', 'Live')",
);
diff --git a/tests/model/ImageTest.php b/tests/model/ImageTest.php
index 20626065b..cb9b83e44 100644
--- a/tests/model/ImageTest.php
+++ b/tests/model/ImageTest.php
@@ -6,7 +6,7 @@
*/
class ImageTest extends SapphireTest {
- static $fixture_file = 'ImageTest.yml';
+ protected static $fixture_file = 'ImageTest.yml';
protected $origBackend;
diff --git a/tests/model/ManyManyListTest.php b/tests/model/ManyManyListTest.php
index b8be17d42..d610ab293 100644
--- a/tests/model/ManyManyListTest.php
+++ b/tests/model/ManyManyListTest.php
@@ -3,7 +3,7 @@
class ManyManyListTest extends SapphireTest {
// Borrow the model from DataObjectTest
- public static $fixture_file = 'DataObjectTest.yml';
+ protected static $fixture_file = 'DataObjectTest.yml';
protected $extraDataObjects = array(
'DataObjectTest_Team',
diff --git a/tests/model/MapTest.php b/tests/model/MapTest.php
index a39a60c9b..b5b50bbe1 100755
--- a/tests/model/MapTest.php
+++ b/tests/model/MapTest.php
@@ -2,7 +2,7 @@
class SS_MapTest extends SapphireTest {
// Borrow the model from DataObjectTest
- static $fixture_file = 'DataObjectTest.yml';
+ protected static $fixture_file = 'DataObjectTest.yml';
protected $extraDataObjects = array(
'DataObjectTest_Team',
diff --git a/tests/model/MoneyTest.php b/tests/model/MoneyTest.php
index 9b8bfc92d..cacb4c348 100644
--- a/tests/model/MoneyTest.php
+++ b/tests/model/MoneyTest.php
@@ -13,7 +13,7 @@
*/
class MoneyTest extends SapphireTest {
- static $fixture_file = 'MoneyTest.yml';
+ protected static $fixture_file = 'MoneyTest.yml';
protected $extraDataObjects = array(
'MoneyTest_DataObject',
@@ -271,7 +271,7 @@ class MoneyTest extends SapphireTest {
}
class MoneyTest_DataObject extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'MyMoney' => 'Money',
//'MyOtherMoney' => 'Money',
);
diff --git a/tests/model/MySQLDatabaseTest.php b/tests/model/MySQLDatabaseTest.php
index f10e8b7c9..83f7fb8f4 100644
--- a/tests/model/MySQLDatabaseTest.php
+++ b/tests/model/MySQLDatabaseTest.php
@@ -11,7 +11,7 @@ class MySQLDatabaseTest extends SapphireTest {
public function setUp() {
if(DB::getConn() instanceof MySQLDatabase) {
- MySQLDatabaseTest_DO::$db = array(
+ MySQLDatabaseTest_DO::config()->db = array(
'MultiEnum1' => 'MultiEnum("A, B, C, D","")',
'MultiEnum2' => 'MultiEnum("A, B, C, D","A")',
'MultiEnum3' => 'MultiEnum("A, B, C, D","A, B")',
@@ -43,6 +43,6 @@ class MySQLDatabaseTest extends SapphireTest {
}
class MySQLDatabaseTest_DO extends DataObject implements TestOnly {
- static $db = array();
+ private static $db = array();
}
diff --git a/tests/model/PaginatedListTest.php b/tests/model/PaginatedListTest.php
index 257212bcb..334230f8d 100644
--- a/tests/model/PaginatedListTest.php
+++ b/tests/model/PaginatedListTest.php
@@ -7,7 +7,7 @@
*/
class PaginatedListTest extends SapphireTest {
- static $fixture_file = 'DataObjectTest.yml';
+ protected static $fixture_file = 'DataObjectTest.yml';
protected $extraDataObjects = array(
'DataObjectTest_Team',
diff --git a/tests/model/SQLQueryTest.php b/tests/model/SQLQueryTest.php
index 922444bbf..09edb15b3 100755
--- a/tests/model/SQLQueryTest.php
+++ b/tests/model/SQLQueryTest.php
@@ -2,7 +2,7 @@
class SQLQueryTest extends SapphireTest {
- public static $fixture_file = 'SQLQueryTest.yml';
+ protected static $fixture_file = 'SQLQueryTest.yml';
protected $extraDataObjects = array(
'SQLQueryTest_DO',
@@ -409,7 +409,7 @@ class SQLQueryTest extends SapphireTest {
}
class SQLQueryTest_DO extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Name" => "Varchar",
"Meta" => "Varchar",
"Common" => "Varchar",
@@ -418,16 +418,16 @@ class SQLQueryTest_DO extends DataObject implements TestOnly {
}
class SQLQueryTestBase extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Title" => "Varchar",
);
}
class SQLQueryTestChild extends SQLQueryTestBase {
- static $db = array(
+ private static $db = array(
"Name" => "Varchar",
);
- static $has_one = array(
+ private static $has_one = array(
);
}
diff --git a/tests/model/TransactionTest.php b/tests/model/TransactionTest.php
index ecf137e84..92ffc2688 100644
--- a/tests/model/TransactionTest.php
+++ b/tests/model/TransactionTest.php
@@ -57,7 +57,7 @@ class TransactionTest extends SapphireTest {
}
class TransactionTest_Object extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
'Title' => 'Varchar(255)'
);
}
diff --git a/tests/model/UnsavedRelationListTest.php b/tests/model/UnsavedRelationListTest.php
index c2968d85b..b65a32751 100644
--- a/tests/model/UnsavedRelationListTest.php
+++ b/tests/model/UnsavedRelationListTest.php
@@ -1,7 +1,7 @@
'Varchar',
);
- public static $has_one = array(
+ private static $has_one = array(
'Parent' => 'UnsavedRelationListTest_DataObject',
);
- public static $has_many = array(
+ private static $has_many = array(
'Children' => 'UnsavedRelationListTest_DataObject',
);
- public static $many_many = array(
+ private static $many_many = array(
'Siblings' => 'UnsavedRelationListTest_DataObject',
);
- public static $many_many_extraFields = array(
+ private static $many_many_extraFields = array(
'Siblings' => array(
'Number' => 'Int',
),
diff --git a/tests/model/VersionedTest.php b/tests/model/VersionedTest.php
index e7b11062d..2cb4a7096 100644
--- a/tests/model/VersionedTest.php
+++ b/tests/model/VersionedTest.php
@@ -1,7 +1,7 @@
"Varchar",
'Title' => 'Varchar',
'Content' => 'HTMLText'
);
- static $extensions = array(
+ private static $extensions = array(
"Versioned('Stage', 'Live')"
);
- static $has_one = array(
+ private static $has_one = array(
'Parent' => 'VersionedTest_DataObject'
);
}
class VersionedTest_Subclass extends VersionedTest_DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"ExtraField" => "Varchar",
);
- static $extensions = array(
+ private static $extensions = array(
"Versioned('Stage', 'Live')"
);
}
@@ -439,5 +439,5 @@ class VersionedTest_Subclass extends VersionedTest_DataObject implements TestOnl
* @ignore
*/
class VersionedTest_UnversionedWithField extends DataObject implements TestOnly {
- public static $db = array('Version' => 'Varchar(255)');
+ private static $db = array('Version' => 'Varchar(255)');
}
diff --git a/tests/search/SearchContextTest.php b/tests/search/SearchContextTest.php
index 9e9578563..543d44748 100644
--- a/tests/search/SearchContextTest.php
+++ b/tests/search/SearchContextTest.php
@@ -2,7 +2,7 @@
class SearchContextTest extends SapphireTest {
- static $fixture_file = 'SearchContextTest.yml';
+ protected static $fixture_file = 'SearchContextTest.yml';
protected $extraDataObjects = array(
'SearchContextTest_Person',
@@ -165,14 +165,14 @@ class SearchContextTest extends SapphireTest {
class SearchContextTest_Person extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Name" => "Varchar",
"Email" => "Varchar",
"HairColor" => "Varchar",
"EyeColor" => "Varchar"
);
- static $searchable_fields = array(
+ private static $searchable_fields = array(
"Name", "HairColor", "EyeColor"
);
@@ -180,7 +180,7 @@ class SearchContextTest_Person extends DataObject implements TestOnly {
class SearchContextTest_Book extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Title" => "Varchar",
"Summary" => "Varchar"
);
@@ -189,17 +189,17 @@ class SearchContextTest_Book extends DataObject implements TestOnly {
class SearchContextTest_Company extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Name" => "Varchar",
"Industry" => "Varchar",
"AnnualProfit" => "Int"
);
- static $summary_fields = array(
+ private static $summary_fields = array(
"Industry"
);
- static $searchable_fields = array(
+ private static $searchable_fields = array(
"Name" => "PartialMatchFilter",
"Industry" => array(
'field' => "TextareaField"
@@ -215,19 +215,19 @@ class SearchContextTest_Company extends DataObject implements TestOnly {
class SearchContextTest_Project extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Name" => "Varchar"
);
- static $has_one = array(
+ private static $has_one = array(
"Deadline" => "SearchContextTest_Deadline"
);
- static $has_many = array(
+ private static $has_many = array(
"Actions" => "SearchContextTest_Action"
);
- static $searchable_fields = array(
+ private static $searchable_fields = array(
"Name" => "PartialMatchFilter",
"Actions.SolutionArea" => "ExactMatchFilter",
"Actions.Description" => "PartialMatchFilter"
@@ -237,11 +237,11 @@ class SearchContextTest_Project extends DataObject implements TestOnly {
class SearchContextTest_Deadline extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"CompletionDate" => "SS_Datetime"
);
- static $has_one = array(
+ private static $has_one = array(
"Project" => "SearchContextTest_Project"
);
@@ -249,12 +249,12 @@ class SearchContextTest_Deadline extends DataObject implements TestOnly {
class SearchContextTest_Action extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Description" => "Text",
"SolutionArea" => "Varchar"
);
- static $has_one = array(
+ private static $has_one = array(
"Project" => "SearchContextTest_Project"
);
@@ -262,7 +262,7 @@ class SearchContextTest_Action extends DataObject implements TestOnly {
class SearchContextTest_AllFilterTypes extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"ExactMatch" => "Varchar",
"PartialMatch" => "Varchar",
"SubstringMatch" => "Varchar",
@@ -273,7 +273,7 @@ class SearchContextTest_AllFilterTypes extends DataObject implements TestOnly {
'FulltextField' => 'Text',
);
- static $searchable_fields = array(
+ private static $searchable_fields = array(
"ExactMatch" => "ExactMatchFilter",
"PartialMatch" => "PartialMatchFilter",
"CollectionMatch" => "ExactMatchFilter",
diff --git a/tests/search/SearchFilterApplyRelationTest.php b/tests/search/SearchFilterApplyRelationTest.php
index b124e85c0..c7b6cd49c 100644
--- a/tests/search/SearchFilterApplyRelationTest.php
+++ b/tests/search/SearchFilterApplyRelationTest.php
@@ -9,7 +9,7 @@
* @subpackage testing
*/
class SearchFilterApplyRelationTest extends SapphireTest{
- static $fixture_file = 'SearchFilterApplyRelationTest.yml';
+ protected static $fixture_file = 'SearchFilterApplyRelationTest.yml';
protected $extraDataObjects = array(
'SearchFilterApplyRelationTest_DO',
@@ -110,21 +110,21 @@ class SearchFilterApplyRelationTest extends SapphireTest{
}
class SearchFilterApplyRelationTest_DO extends DataObject implements TestOnly {
- static $has_one = array(
+ private static $has_one = array(
'SearchFilterApplyRelationTest_HasOneGrantChild' => 'SearchFilterApplyRelationTest_HasOneGrantChild'
);
- static $has_many = array(
+ private static $has_many = array(
'SearchFilterApplyRelationTest_HasManyGrantChildren' => 'SearchFilterApplyRelationTest_HasManyGrantChild'
);
- static $many_many = array(
+ private static $many_many = array(
'ManyManyGrantChildren' => 'SearchFilterApplyRelationTest_ManyManyGrantChild'
);
}
class SearchFilterApplyRelationTest_HasOneParent extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Title" => "Varchar"
);
}
@@ -132,7 +132,7 @@ class SearchFilterApplyRelationTest_HasOneParent extends DataObject implements T
class SearchFilterApplyRelationTest_HasOneChild extends SearchFilterApplyRelationTest_HasOneParent
implements TestOnly {
// This is to create an seperate Table only.
- static $db = array(
+ private static $db = array(
"ChildField" => "Varchar"
);
}
@@ -140,16 +140,16 @@ class SearchFilterApplyRelationTest_HasOneChild extends SearchFilterApplyRelatio
class SearchFilterApplyRelationTest_HasOneGrantChild extends SearchFilterApplyRelationTest_HasOneChild
implements TestOnly {
// This is to create an seperate Table only.
- static $db = array(
+ private static $db = array(
"GrantChildField" => "Varchar"
);
- static $has_many = array(
+ private static $has_many = array(
"SearchFilterApplyRelationTest_DOs" => "SearchFilterApplyRelationTest_DO"
);
}
class SearchFilterApplyRelationTest_HasManyParent extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Title" => "Varchar"
);
}
@@ -157,19 +157,19 @@ class SearchFilterApplyRelationTest_HasManyParent extends DataObject implements
class SearchFilterApplyRelationTest_HasManyChild extends SearchFilterApplyRelationTest_HasManyParent
implements TestOnly {
// This is to create an separate Table only.
- static $db = array(
+ private static $db = array(
"ChildField" => "Varchar"
);
}
class SearchFilterApplyRelationTest_HasManyGrantChild extends SearchFilterApplyRelationTest_HasManyChild{
- static $has_one = array(
+ private static $has_one = array(
"SearchFilterApplyRelationTest_DO" => "SearchFilterApplyRelationTest_DO"
);
}
class SearchFilterApplyRelationTest_ManyManyParent extends DataObject implements TestOnly{
- static $db = array(
+ private static $db = array(
"Title" => "Varchar"
);
}
@@ -177,7 +177,7 @@ class SearchFilterApplyRelationTest_ManyManyParent extends DataObject implements
class SearchFilterApplyRelationTest_ManyManyChild extends SearchFilterApplyRelationTest_ManyManyParent
implements TestOnly {
// This is to create an seperate Table only.
- static $db = array(
+ private static $db = array(
"ChildField" => "Varchar"
);
}
@@ -185,10 +185,10 @@ class SearchFilterApplyRelationTest_ManyManyChild extends SearchFilterApplyRelat
class SearchFilterApplyRelationTest_ManyManyGrantChild extends SearchFilterApplyRelationTest_ManyManyChild
implements TestOnly {
// This is to create an seperate Table only.
- static $db = array(
+ private static $db = array(
"GrantChildField" => "Varchar"
);
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
"DOs" => "SearchFilterApplyRelationTest_DO"
);
}
diff --git a/tests/security/BasicAuthTest.php b/tests/security/BasicAuthTest.php
index 4920e4284..649845d03 100644
--- a/tests/security/BasicAuthTest.php
+++ b/tests/security/BasicAuthTest.php
@@ -8,21 +8,21 @@ class BasicAuthTest extends FunctionalTest {
static $original_unique_identifier_field;
- static $fixture_file = 'BasicAuthTest.yml';
+ protected static $fixture_file = 'BasicAuthTest.yml';
public function setUp() {
parent::setUp();
// Fixtures assume Email is the field used to identify the log in identity
- self::$original_unique_identifier_field = Member::get_unique_identifier_field();
- Member::set_unique_identifier_field('Email');
+ self::$original_unique_identifier_field = Member::config()->unique_identifier_field;
+ Member::config()->unique_identifier_field = 'Email';
}
public function tearDown() {
parent::tearDown();
BasicAuth::protect_entire_site(false);
- Member::set_unique_identifier_field(self::$original_unique_identifier_field);
+ Member::config()->unique_identifier_field = self::$original_unique_identifier_field;
}
public function testBasicAuthEnabledWithoutLogin() {
diff --git a/tests/security/GroupCsvBulkLoaderTest.php b/tests/security/GroupCsvBulkLoaderTest.php
index 51d2dcdc8..0f60fc65f 100644
--- a/tests/security/GroupCsvBulkLoaderTest.php
+++ b/tests/security/GroupCsvBulkLoaderTest.php
@@ -4,7 +4,7 @@
* @subpackage tests
*/
class GroupCsvBulkLoaderTest extends SapphireTest {
- static $fixture_file = 'GroupCsvBulkLoaderTest.yml';
+ protected static $fixture_file = 'GroupCsvBulkLoaderTest.yml';
public function testNewImport() {
$loader = new GroupCsvBulkLoader();
diff --git a/tests/security/GroupTest.php b/tests/security/GroupTest.php
index eff91550f..2e951772c 100644
--- a/tests/security/GroupTest.php
+++ b/tests/security/GroupTest.php
@@ -5,7 +5,7 @@
*/
class GroupTest extends FunctionalTest {
- static $fixture_file = 'GroupTest.yml';
+ protected static $fixture_file = 'GroupTest.yml';
public function testGroupCodeDefaultsToTitle() {
$g1 = new Group();
diff --git a/tests/security/MemberAuthenticatorTest.php b/tests/security/MemberAuthenticatorTest.php
index cd7d00196..f0365cd6e 100644
--- a/tests/security/MemberAuthenticatorTest.php
+++ b/tests/security/MemberAuthenticatorTest.php
@@ -10,7 +10,7 @@ class MemberAuthenticatorTest extends SapphireTest {
public function testLegacyPasswordHashMigrationUponLogin() {
$member = new Member();
- $field=Member::get_unique_identifier_field();
+ $field=Member::config()->unique_identifier_field;
$member->$field = 'test1@test.com';
$member->PasswordEncryption = "sha1";
@@ -32,7 +32,7 @@ class MemberAuthenticatorTest extends SapphireTest {
public function testNoLegacyPasswordHashMigrationOnIncompatibleAlgorithm() {
Config::inst()->update('PasswordEncryptor', 'encryptors',
array('crc32'=>array('PasswordEncryptor_PHPHash'=>'crc32')));
- $field=Member::get_unique_identifier_field();
+ $field=Member::config()->unique_identifier_field;
$member = new Member();
$member->$field = 'test2@test.com';
@@ -54,13 +54,13 @@ class MemberAuthenticatorTest extends SapphireTest {
public function testCustomIdentifierField(){
- $origField = Member::get_unique_identifier_field();
- Member::set_unique_identifier_field('Username');
+ $origField = Member::config()->unique_identifier_field;
+ Member::config()->unique_identifier_field = 'Username';
- $label=singleton('Member')->fieldLabel(Member::get_unique_identifier_field());
+ $label=singleton('Member')->fieldLabel(Member::config()->unique_identifier_field);
$this->assertEquals($label, 'Username');
- Member::set_unique_identifier_field($origField);
+ Member::config()->unique_identifier_field = $origField;
}
}
diff --git a/tests/security/MemberCsvBulkLoaderTest.php b/tests/security/MemberCsvBulkLoaderTest.php
index 7e95f93e1..c8ea526df 100644
--- a/tests/security/MemberCsvBulkLoaderTest.php
+++ b/tests/security/MemberCsvBulkLoaderTest.php
@@ -4,7 +4,7 @@
* @subpackage tests
*/
class MemberCsvBulkLoaderTest extends SapphireTest {
- static $fixture_file = 'MemberCsvBulkLoaderTest.yml';
+ protected static $fixture_file = 'MemberCsvBulkLoaderTest.yml';
public function testNewImport() {
$loader = new MemberCsvBulkLoader();
@@ -70,7 +70,7 @@ class MemberCsvBulkLoaderTest extends SapphireTest {
$member = DataObject::get_by_id('Member', $memberID);
// TODO Direct getter doesn't work, wtf!
- $this->assertEquals(Security::get_password_encryption_algorithm(), $member->getField('PasswordEncryption'));
+ $this->assertEquals(Security::config()->password_encryption_algorithm, $member->getField('PasswordEncryption'));
$result = $member->checkPassword('mypassword');
$this->assertTrue($result->valid());
}
diff --git a/tests/security/MemberTest.php b/tests/security/MemberTest.php
index f6a4412a5..279a16848 100644
--- a/tests/security/MemberTest.php
+++ b/tests/security/MemberTest.php
@@ -4,7 +4,7 @@
* @subpackage tests
*/
class MemberTest extends FunctionalTest {
- static $fixture_file = 'MemberTest.yml';
+ protected static $fixture_file = 'MemberTest.yml';
protected $orig = array();
protected $local = null;
@@ -35,13 +35,13 @@ class MemberTest extends FunctionalTest {
public function setUp() {
parent::setUp();
- $this->orig['Member_unique_identifier_field'] = Member::get_unique_identifier_field();
- Member::set_unique_identifier_field('Email');
+ $this->orig['Member_unique_identifier_field'] = Member::config()->unique_identifier_field;
+ Member::config()->unique_identifier_field = 'Email';
Member::set_password_validator(null);
}
public function tearDown() {
- Member::set_unique_identifier_field($this->orig['Member_unique_identifier_field']);
+ Member::config()->unique_identifier_field = $this->orig['Member_unique_identifier_field'];
parent::tearDown();
}
@@ -81,7 +81,7 @@ class MemberTest extends FunctionalTest {
$memberWithPassword->write();
$this->assertEquals(
$memberWithPassword->PasswordEncryption,
- Security::get_password_encryption_algorithm(),
+ Security::config()->password_encryption_algorithm,
'Password encryption is set for new member records on first write (with setting "Password")'
);
@@ -99,8 +99,8 @@ class MemberTest extends FunctionalTest {
$member->PasswordEncryption = 'sha1_v2.4';
$member->write();
- $origAlgo = Security::get_password_encryption_algorithm();
- Security::set_password_encryption_algorithm('none');
+ $origAlgo = Security::config()->password_encryption_algorithm;
+ Security::config()->password_encryption_algorithm = 'none';
$member->Password = 'mynewpassword';
$member->write();
@@ -112,7 +112,7 @@ class MemberTest extends FunctionalTest {
$result = $member->checkPassword('mynewpassword');
$this->assertTrue($result->valid());
- Security::set_password_encryption_algorithm($origAlgo);
+ Security::config()->password_encryption_algorithm = $origAlgo;
}
public function testKeepsEncryptionOnEmptyPasswords() {
@@ -278,7 +278,7 @@ class MemberTest extends FunctionalTest {
* Test that the PasswordExpiry date is set when passwords are changed
*/
public function testPasswordExpirySetting() {
- Member::set_password_expiry(90);
+ Member::config()->password_expiry_days = 90;
$member = $this->objFromFixture('Member', 'test');
$this->assertNotNull($member);
@@ -288,7 +288,7 @@ class MemberTest extends FunctionalTest {
$expiryDate = date('Y-m-d', time() + 90*86400);
$this->assertEquals($expiryDate, $member->PasswordExpiry);
- Member::set_password_expiry(null);
+ Member::config()->password_expiry_days = null;
$valid = $member->changePassword("Xx?1234235");
$this->assertTrue($valid->valid());
diff --git a/tests/security/PermissionCheckboxSetFieldTest.php b/tests/security/PermissionCheckboxSetFieldTest.php
index ca6ad377f..684480dd2 100644
--- a/tests/security/PermissionCheckboxSetFieldTest.php
+++ b/tests/security/PermissionCheckboxSetFieldTest.php
@@ -4,7 +4,7 @@
* @subpackage tests
*/
class PermissionCheckboxSetFieldTest extends SapphireTest {
- static $fixture_file = 'PermissionCheckboxSetFieldTest.yml';
+ protected static $fixture_file = 'PermissionCheckboxSetFieldTest.yml';
public function testHiddenPermissions() {
$f = new PermissionCheckboxSetField(
diff --git a/tests/security/PermissionRoleTest.php b/tests/security/PermissionRoleTest.php
index 0019e5c49..10a7a6062 100644
--- a/tests/security/PermissionRoleTest.php
+++ b/tests/security/PermissionRoleTest.php
@@ -4,7 +4,7 @@
* @subpackage tests
*/
class PermissionRoleTest extends FunctionalTest {
- static $fixture_file = 'PermissionRoleTest.yml';
+ protected static $fixture_file = 'PermissionRoleTest.yml';
public function testDelete() {
$role = $this->objFromFixture('PermissionRole', 'role');
diff --git a/tests/security/PermissionTest.php b/tests/security/PermissionTest.php
index dad628694..842376613 100644
--- a/tests/security/PermissionTest.php
+++ b/tests/security/PermissionTest.php
@@ -6,7 +6,7 @@
*/
class PermissionTest extends SapphireTest {
- static $fixture_file = 'PermissionTest.yml';
+ protected static $fixture_file = 'PermissionTest.yml';
public function testGetCodesGrouped() {
$codes = Permission::get_codes();
@@ -92,11 +92,11 @@ class PermissionTest extends SapphireTest {
$permissionCheckboxSet = new PermissionCheckboxSetField('Permissions','Permissions','Permission','GroupID');
$this->assertContains('CMS_ACCESS_LeftAndMain', $permissionCheckboxSet->Field());
- Permission::add_to_hidden_permissions('CMS_ACCESS_LeftAndMain');
+ Config::inst()->update('Permission', 'hidden_permissions', array('CMS_ACCESS_LeftAndMain'));
$this->assertNotContains('CMS_ACCESS_LeftAndMain', $permissionCheckboxSet->Field());
-
- Permission::remove_from_hidden_permissions('CMS_ACCESS_LeftAndMain');
+
+ Config::inst()->remove('Permission', 'hidden_permissions');
$this->assertContains('CMS_ACCESS_LeftAndMain', $permissionCheckboxSet->Field());
}
}
diff --git a/tests/security/SecurityTest.php b/tests/security/SecurityTest.php
index 3325d09f9..d23246db5 100644
--- a/tests/security/SecurityTest.php
+++ b/tests/security/SecurityTest.php
@@ -6,7 +6,7 @@
* @subpackage tests
*/
class SecurityTest extends FunctionalTest {
- static $fixture_file = 'MemberTest.yml';
+ protected static $fixture_file = 'MemberTest.yml';
protected $autoFollowRedirection = false;
@@ -28,8 +28,8 @@ class SecurityTest extends FunctionalTest {
Authenticator::set_default_authenticator('MemberAuthenticator');
// And that the unique identified field is 'Email'
- $this->priorUniqueIdentifierField = Member::get_unique_identifier_field();
- Member::set_unique_identifier_field('Email');
+ $this->priorUniqueIdentifierField = Member::config()->unique_identifier_field;
+ Member::config()->unique_identifier_field = 'Email';
parent::setUp();
}
@@ -47,7 +47,7 @@ class SecurityTest extends FunctionalTest {
Authenticator::set_default_authenticator($this->priorDefaultAuthenticator);
// Restore unique identifier field
- Member::set_unique_identifier_field($this->priorUniqueIdentifierField);
+ Member::config()->unique_identifier_field = $this->priorUniqueIdentifierField;
parent::tearDown();
}
@@ -249,7 +249,7 @@ class SecurityTest extends FunctionalTest {
$local = i18n::get_locale();
i18n::set_locale('en_US');
- Member::lock_out_after_incorrect_logins(5);
+ Member::config()->lock_out_after_incorrect_logins = 5;
/* LOG IN WITH A BAD PASSWORD 7 TIMES */
@@ -310,7 +310,7 @@ class SecurityTest extends FunctionalTest {
}
public function testAlternatingRepeatedLoginAttempts() {
- Member::lock_out_after_incorrect_logins(3);
+ Member::config()->lock_out_after_incorrect_logins = 3;
// ATTEMPTING LOG-IN TWICE WITH ONE ACCOUNT AND TWICE WITH ANOTHER SHOULDN'T LOCK ANYBODY OUT
@@ -339,7 +339,7 @@ class SecurityTest extends FunctionalTest {
}
public function testUnsuccessfulLoginAttempts() {
- Security::set_login_recording(true);
+ Security::config()->login_recording = true;
/* UNSUCCESSFUL ATTEMPTS WITH WRONG PASSWORD FOR EXISTING USER ARE LOGGED */
$this->doTestLoginForm('sam@silverstripe.com', 'wrongpassword');
@@ -362,7 +362,7 @@ class SecurityTest extends FunctionalTest {
}
public function testSuccessfulLoginAttempts() {
- Security::set_login_recording(true);
+ Security::config()->login_recording = true;
/* SUCCESSFUL ATTEMPTS ARE LOGGED */
$this->doTestLoginForm('sam@silverstripe.com', '1nitialPassword');
diff --git a/tests/testing/YamlFixtureTest.php b/tests/testing/YamlFixtureTest.php
index 6639f15f7..6d1585aa7 100644
--- a/tests/testing/YamlFixtureTest.php
+++ b/tests/testing/YamlFixtureTest.php
@@ -75,19 +75,19 @@ class YamlFixtureTest extends SapphireTest {
}
class YamlFixtureTest_DataObject extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Name" => "Varchar"
);
- static $many_many = array(
+ private static $many_many = array(
"ManyMany" => "YamlFixtureTest_DataObjectRelation"
);
}
class YamlFixtureTest_DataObjectRelation extends DataObject implements TestOnly {
- static $db = array(
+ private static $db = array(
"Name" => "Varchar"
);
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
"TestParent" => "YamlFixtureTest_DataObject"
);
}
diff --git a/tests/travis/_config.php b/tests/travis/_config.php
index 87a69ab9a..543a3442e 100644
--- a/tests/travis/_config.php
+++ b/tests/travis/_config.php
@@ -10,10 +10,4 @@ require_once('conf/ConfigureFromEnv.php');
global $databaseConfig;
$databaseConfig['memory'] = true;
-$databaseConfig['path'] = dirname(dirname(__FILE__)) .'/assets/';
-
-MySQLDatabase::set_connection_charset('utf8');
-
-// Set the current theme. More themes can be downloaded from
-// http://www.silverstripe.org/themes/
-SSViewer::set_theme('simple');
\ No newline at end of file
+$databaseConfig['path'] = dirname(dirname(__FILE__)) .'/assets/';
\ No newline at end of file
diff --git a/tests/view/SSViewerTest.php b/tests/view/SSViewerTest.php
index f3f10f555..bceadd538 100644
--- a/tests/view/SSViewerTest.php
+++ b/tests/view/SSViewerTest.php
@@ -3,18 +3,18 @@
class SSViewerTest extends SapphireTest {
public function setUp() {
parent::setUp();
- SSViewer::set_source_file_comments(false);
+ Config::inst()->update('SSViewer', 'source_file_comments', false);
}
/**
- * Tests for {@link SSViewer::current_theme()} for different behaviour
+ * Tests for {@link Config::inst()->get('SSViewer', 'theme')} for different behaviour
* of user defined themes via {@link SiteConfig} and default theme
* when no user themes are defined.
*/
public function testCurrentTheme() {
//TODO: SiteConfig moved to CMS
- SSViewer::set_theme('mytheme');
- $this->assertEquals('mytheme', SSViewer::current_theme(),
+ Config::inst()->update('SSViewer', 'theme', 'mytheme');
+ $this->assertEquals('mytheme', Config::inst()->get('SSViewer', 'theme'),
'Current theme is the default - user has not defined one');
}
@@ -52,7 +52,6 @@ class SSViewerTest extends SapphireTest {
$template = $this->render("<% require javascript($jsFile) %>
<% require css($cssFile) %>");
-
$this->assertFalse((bool)trim($template), "Should be no content in this return.");
}
@@ -906,8 +905,8 @@ after')
SS_TemplateLoader::instance()->pushManifest($manifest);
- $origTheme = SSViewer::current_theme();
- SSViewer::set_theme($theme);
+ $origTheme = Config::inst()->get('SSViewer', 'theme');
+ Config::inst()->update('SSViewer', 'theme', $theme);
$e = null;
@@ -916,7 +915,7 @@ after')
// Remove all the test themes we created
SS_TemplateLoader::instance()->popManifest();
- SSViewer::set_theme($origTheme);
+ Config::inst()->update('SSViewer', 'theme', $origTheme);
if ($e) throw $e;
}
@@ -966,8 +965,8 @@ after')
}
public function testRewriteHashlinks() {
- $oldRewriteHashLinks = SSViewer::getOption('rewriteHashlinks');
- SSViewer::setOption('rewriteHashlinks', true);
+ $orig = Config::inst()->get('SSViewer', 'rewrite_hash_links');
+ Config::inst()->update('SSViewer', 'rewrite_hash_links', true);
// Emulate SSViewer::process()
$base = Convert::raw2att($_SERVER['REQUEST_URI']);
@@ -997,13 +996,13 @@ after')
);
unlink($tmplFile);
-
- SSViewer::setOption('rewriteHashlinks', $oldRewriteHashLinks);
+
+ Config::inst()->update('SSViewer', 'rewrite_hash_links', $orig);
}
public function testRewriteHashlinksInPhpMode() {
- $oldRewriteHashLinks = SSViewer::getOption('rewriteHashlinks');
- SSViewer::setOption('rewriteHashlinks', 'php');
+ $orig = Config::inst()->get('SSViewer', 'rewrite_hash_links');
+ Config::inst()->update('SSViewer', 'rewrite_hash_links', 'php');
$tmplFile = TEMP_FOLDER . '/SSViewerTest_testRewriteHashlinksInPhpMode_' . sha1(rand()) . '.ss';
@@ -1031,14 +1030,14 @@ after')
// );
unlink($tmplFile);
-
- SSViewer::setOption('rewriteHashlinks', $oldRewriteHashLinks);
+
+ Config::inst()->update('SSViewer', 'rewrite_hash_links', $orig);
}
public function testRenderWithSourceFileComments() {
- $origType = Director::get_environment_type();
- Director::set_environment_type('dev');
- SSViewer::set_source_file_comments(true);
+ $origEnv = Config::inst()->get('Director', 'environment_type');
+ Config::inst()->update('Director', 'environment_type', 'dev');
+ Config::inst()->update('SSViewer', 'source_file_comments', true);
$view = new SSViewer(array('SSViewerTestCommentsFullSource'));
$data = new ArrayData(array());
@@ -1072,9 +1071,9 @@ after')
. '
';
$this->assertEquals($result, $expected);
-
- SSViewer::set_source_file_comments(false);
- Director::set_environment_type($origType);
+
+ Config::inst()->update('SSViewer', 'source_file_comments', false);
+ Config::inst()->update('Director', 'environment_type', $origEnv);
}
public function testLoopIteratorIterator() {
@@ -1173,7 +1172,7 @@ class SSViewerTestFixture extends ViewableData {
class SSViewerTest_ViewableData extends ViewableData implements TestOnly {
- public static $casting = array(
+ private static $casting = array(
'TextValue' => 'Text',
'HTMLValue' => 'HTMLText'
);
diff --git a/tests/view/ViewableDataTest.php b/tests/view/ViewableDataTest.php
index 40d770e02..a90c165fe 100644
--- a/tests/view/ViewableDataTest.php
+++ b/tests/view/ViewableDataTest.php
@@ -128,9 +128,9 @@ class ViewableDataTest extends SapphireTest {
*/
class ViewableDataTest_Castable extends ViewableData {
- public static $default_cast = 'ViewableData_Caster';
+ private static $default_cast = 'ViewableData_Caster';
- public static $casting = array (
+ private static $casting = array (
'alwaysCasted' => 'ViewableDataTest_RequiresCasting',
'castedUnsafeXML' => 'ViewableData_UnescaptedCaster'
);
@@ -205,7 +205,7 @@ class ViewableDataTest_Container extends ViewableData {
}
class ViewableDataTest_CastingClass extends ViewableData {
- public static $casting = array(
+ private static $casting = array(
'Field' => 'CastingType',
'Argument' => 'ArgumentType(Argument)',
'ArrayArgument' => 'ArrayArgumentType(array(foo, bar))'
diff --git a/view/Requirements.php b/view/Requirements.php
index 9e80517c3..5b860c182 100644
--- a/view/Requirements.php
+++ b/view/Requirements.php
@@ -758,7 +758,7 @@ class Requirements_Backend {
*/
public function add_i18n_javascript($langDir, $return = false, $langOnly = false) {
$files = array();
- if(i18n::get_js_i18n()) {
+ if(i18n::config()->js_i18n) {
// Include i18n.js even if no languages are found. The fact that
// add_i18n_javascript() was called indicates that the methods in
// here are needed.
diff --git a/view/SSTemplateParser.php b/view/SSTemplateParser.php
index 912f1f35d..62d347e12 100644
--- a/view/SSTemplateParser.php
+++ b/view/SSTemplateParser.php
@@ -4468,7 +4468,7 @@ class SSTemplateParser extends Parser {
// non-dynamically calculated
$text = preg_replace(
'/href\s*\=\s*\"\#/',
- 'href="\' . (SSViewer::$options[\'rewriteHashlinks\'] ? strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") .
+ 'href="\' . (Config::inst()->get(\'SSViewer\', \'rewrite_hash_links\') ? strip_tags( $_SERVER[\'REQUEST_URI\'] ) : "") .
\'#',
$text
);
diff --git a/view/SSViewer.php b/view/SSViewer.php
index ae9b6a3a6..e3a4d098f 100644
--- a/view/SSViewer.php
+++ b/view/SSViewer.php
@@ -533,25 +533,30 @@ class SSViewer_DataPresenter extends SSViewer_Scope {
class SSViewer {
/**
+ * @config
* @var boolean $source_file_comments
*/
- protected static $source_file_comments = false;
+ private static $source_file_comments = false;
/**
* Set whether HTML comments indicating the source .SS file used to render this page should be
* included in the output. This is enabled by default
*
+ * @deprecated 3.2 Use the "SSViewer.source_file_comments" config setting instead
* @param boolean $val
*/
public static function set_source_file_comments($val) {
- self::$source_file_comments = $val;
+ Deprecation::notice('3.2', 'Use the "SSViewer.source_file_comments" config setting instead');
+ Config::inst()->update('SSViewer', 'source_file_comments', $val);
}
/**
+ * @deprecated 3.2 Use the "SSViewer.source_file_comments" config setting instead
* @return boolean
*/
public static function get_source_file_comments() {
- return self::$source_file_comments;
+ Deprecation::notice('3.2', 'Use the "SSViewer.source_file_comments" config setting instead');
+ return Config::inst()->get('SSViewer', 'source_file_comments');
}
/**
@@ -566,14 +571,16 @@ class SSViewer {
protected $rewriteHashlinks = true;
/**
+ * @config
* @var string
*/
- protected static $current_theme = null;
+ private static $current_theme = null;
/**
+ * @config
* @var string
*/
- protected static $current_custom_theme = null;
+ private static $current_custom_theme = null;
/**
* @var boolean
@@ -590,20 +597,24 @@ class SSViewer {
}
/**
+ * @deprecated 3.2 Use the "SSViewer.theme" config setting instead
* @param string $theme The "base theme" name (without underscores).
*/
public static function set_theme($theme) {
- self::$current_theme = $theme;
+ Deprecation::notice('3.2', 'Use the "SSViewer.theme" config setting instead');
+ Config::inst()->update('SSViewer', 'theme', $theme);
//Static publishing needs to have a theme set, otherwise it defaults to the content controller theme
if(!is_null($theme))
- self::$current_custom_theme=$theme;
+ Config::inst()->update('SSViewer', 'custom_theme', $theme);
}
/**
+ * @deprecated 3.2 Use the "SSViewer.theme" config setting instead
* @return string
*/
public static function current_theme() {
- return self::$current_theme;
+ Deprecation::notice('3.2', 'Use the "SSViewer.theme" config setting instead');
+ return Config::inst()->get('SSViewer', 'theme');
}
/**
@@ -612,7 +623,8 @@ class SSViewer {
* @return string
*/
public static function get_theme_folder() {
- return self::current_theme() ? THEMES_DIR . "/" . self::current_theme() : project();
+ $theme = Config::inst()->get('SSViewer', 'theme');
+ return $theme ? THEMES_DIR . "/" . $theme : project();
}
/**
@@ -643,7 +655,8 @@ class SSViewer {
* @return string
*/
public static function current_custom_theme(){
- return self::$current_custom_theme;
+ Deprecation::notice('3.2', 'Use the "SSViewer.theme" config setting instead');
+ return Config::inst()->get('SSViewer', 'custom_theme');
}
/**
@@ -671,15 +684,19 @@ class SSViewer {
$this->chosenTemplates['main'] = $templateList;
} else {
$this->chosenTemplates = SS_TemplateLoader::instance()->findTemplates(
- $templateList, self::current_theme()
+ $templateList, Config::inst()->get('SSViewer', 'theme')
);
}
if(!$this->chosenTemplates) {
$templateList = (is_array($templateList)) ? $templateList : array($templateList);
- user_error("None of these templates can be found in theme '"
- . self::current_theme() . "': ". implode(".ss, ", $templateList) . ".ss", E_USER_WARNING);
+ user_error(
+ "None of these templates can be found in theme '"
+ . Config::inst()->get('SSViewer', 'theme') . "': "
+ . implode(".ss, ", $templateList) . ".ss",
+ E_USER_WARNING
+ );
}
}
@@ -710,25 +727,40 @@ class SSViewer {
* links: "". This is useful if you're generating a
* page that will be saved to a .php file and may be accessed from different URLs.
*
+ * @deprecated 3.2 Use the "SSViewer.rewrite_hash_links" config setting instead
* @param string $optionName
* @param mixed $optionVal
*/
public static function setOption($optionName, $optionVal) {
- SSViewer::$options[$optionName] = $optionVal;
+ if($optionName == 'rewriteHashlinks') {
+ Deprecation::notice('3.2', 'Use the "SSViewer.rewrite_hash_links" config setting instead');
+ Config::inst()->update('SSViewer', 'rewrite_hash_links', $optionVal);
+ } else {
+ Deprecation::notice('3.2', 'Use the "SSViewer.' . $optionName . '" config setting instead');
+ Config::inst()->update('SSViewer', $optionName, $optionVal);
+ }
}
/**
+ * @deprecated 3.2 Use the "SSViewer.rewrite_hash_links" config setting instead
* @param string
- *
* @return mixed
*/
public static function getOption($optionName) {
- return SSViewer::$options[$optionName];
+ if($optionName == 'rewriteHashlinks') {
+ Deprecation::notice('3.2', 'Use the "SSViewer.rewrite_hash_links" config setting instead');
+ return Config::inst()->get('SSViewer', 'rewrite_hash_links');
+ } else {
+ Deprecation::notice('3.2', 'Use the "SSViewer.' . $optionName . '" config setting instead');
+ return Config::inst()->get('SSViewer', $optionName);
+ }
}
-
- protected static $options = array(
- 'rewriteHashlinks' => true,
- );
+
+ /**
+ * @config
+ * @var boolean
+ */
+ private static $rewrite_hash_links = true;
protected static $topLevel = array();
@@ -744,7 +776,7 @@ class SSViewer {
*/
public function dontRewriteHashlinks() {
$this->rewriteHashlinks = false;
- self::$options['rewriteHashlinks'] = false;
+ Config::inst()->update('SSViewer', 'rewrite_hash_links', false);
return $this;
}
@@ -760,7 +792,7 @@ class SSViewer {
*/
public static function getTemplateFileByType($identifier, $type) {
$loader = SS_TemplateLoader::instance();
- $found = $loader->findTemplates("$type/$identifier", self::current_theme());
+ $found = $loader->findTemplates("$type/$identifier", Config::inst()->get('SSViewer', 'theme'));
if ($found) {
return $found['main'];
@@ -922,9 +954,11 @@ class SSViewer {
array_pop(SSViewer::$topLevel);
// If we have our crazy base tag, then fix # links referencing the current page.
- if($this->rewriteHashlinks && self::$options['rewriteHashlinks']) {
+
+ $rewrite = Config::inst()->get('SSViewer', 'rewrite_hash_links');
+ if($this->rewriteHashlinks && $rewrite) {
if(strpos($output, 'Your results for:' . Convert::raw2xml($request->getVar('Query')) . '
'; return $this->customise(array( @@ -250,7 +250,7 @@ PHP: :::php class MyController extends Controller { - static $allowed_actions = array('search'); + private static $allowed_actions = array('search'); public function search($request) { $rssRelativeLink = "/rss?Query=" . urlencode($_REQUEST['query']) . "&sortOrder=asc"; $rssLink = Controller::join_links($this->Link(), $rssRelativeLink); diff --git a/docs/en/topics/testing/create-functional-test.md b/docs/en/topics/testing/create-functional-test.md index 68465a351..8e7feb835 100644 --- a/docs/en/topics/testing/create-functional-test.md +++ b/docs/en/topics/testing/create-functional-test.md @@ -12,7 +12,7 @@ URLs. Here is an example from the subsites module: :::php class SubsiteAdminTest extends SapphireTest { - static $fixture_file = 'subsites/tests/SubsiteTest.yml'; + private static $fixture_file = 'subsites/tests/SubsiteTest.yml'; /** * Return a session that has a user logged in as an administrator diff --git a/docs/en/topics/testing/create-silverstripe-test.md b/docs/en/topics/testing/create-silverstripe-test.md index a1f329ddc..61ad83a5d 100644 --- a/docs/en/topics/testing/create-silverstripe-test.md +++ b/docs/en/topics/testing/create-silverstripe-test.md @@ -8,7 +8,7 @@ provides us the basics of creating unit tests. class SiteTreeTest extends SapphireTest { // Define the fixture file to use for this test class - static $fixture_file = 'SiteTreeTest.yml'; + private static $fixture_file = 'SiteTreeTest.yml'; /** * Test generation of the URLSegment values. diff --git a/docs/en/topics/theme-development.md b/docs/en/topics/theme-development.md index 4eeb7bd22..86157204b 100644 --- a/docs/en/topics/theme-development.md +++ b/docs/en/topics/theme-development.md @@ -101,10 +101,12 @@ our theme in action. The code for mine is below. $Form -All you have to do now is tell your site to use your new theme - This is defined in the **mysite/_config.php** file +All you have to do now is tell your site to use your new theme. This is defined through +the YAML config, for example in `mysite/_config/config.yml`. - :::php - SSViewer::set_theme('mythemename'); + :::yml + SSViewer: + theme: 'mythemename' Go to yoursite.com/?flush=1 and check it out. You should be using your new theme! Not really that awesome or amazing is diff --git a/docs/en/topics/themes.md b/docs/en/topics/themes.md index 68b90176b..8a1130443 100644 --- a/docs/en/topics/themes.md +++ b/docs/en/topics/themes.md @@ -14,7 +14,7 @@ as a .tar.gz file. 1. Unpack the contents of the zip file into the `themes` directory in your SilverStripe installation. 2. Change the site to the theme. You can do this either by: - - putting the following line in your ./mysite/_config.php: `SSViewer::set_theme("themename");` + - Altering the `SSViewer.theme` setting in your `mysite/_config/config.yml` - changing the theme in the Site Configuration panel in the CMS 3. Visit your homepage with ?flush=all appended to the URL. `http://yoursite.com?flush=all` diff --git a/docs/en/tutorials/2-extending-a-basic-site.md b/docs/en/tutorials/2-extending-a-basic-site.md index 0deaeee3d..8b41b8d77 100644 --- a/docs/en/tutorials/2-extending-a-basic-site.md +++ b/docs/en/tutorials/2-extending-a-basic-site.md @@ -79,7 +79,7 @@ Let's create the *ArticleHolder* page type. :::php 'Date', 'Author' => 'Text' ); @@ -335,13 +335,13 @@ Let's now make a purely cosmetic change that nevertheless helps to make the info Add the following field to the *ArticleHolder* and *ArticlePage* classes: :::php - static $icon = "framework/docs/en/tutorials/_images/treeicons/news-file.gif"; + private static $icon = "framework/docs/en/tutorials/_images/treeicons/news-file.gif"; And this one to the *HomePage* class: :::php - static $icon = "framework/docs/en/tutorials/_images/treeicons/home-file.gif"; + private static $icon = "framework/docs/en/tutorials/_images/treeicons/home-file.gif"; This will change the icons for the pages in the CMS. @@ -422,12 +422,9 @@ Now that we have a complete news section, let's take a look at the staff section 'Image' ); diff --git a/docs/en/tutorials/3-forms.md b/docs/en/tutorials/3-forms.md index 635014f1c..b48ea0fc0 100644 --- a/docs/en/tutorials/3-forms.md +++ b/docs/en/tutorials/3-forms.md @@ -21,7 +21,7 @@ The poll we will be creating on our homepage will ask the user for their name an :::php class HomePage_Controller extends Page_Controller { - static $allowed_actions = array('BrowserPollForm'); + private static $allowed_actions = array('BrowserPollForm'); // ... @@ -175,7 +175,7 @@ If you recall, in the [second tutorial](2-extending-a-basic-site) we said that a :::php 'Text', 'Browser' => 'Text' ); diff --git a/docs/en/tutorials/5-dataobject-relationship-management.md b/docs/en/tutorials/5-dataobject-relationship-management.md index d1e5e0ce3..28bf0ba20 100644 --- a/docs/en/tutorials/5-dataobject-relationship-management.md +++ b/docs/en/tutorials/5-dataobject-relationship-management.md @@ -34,11 +34,11 @@ Let's create the `Student` and `Project` objects. :::php 'Varchar', 'University' => 'Varchar', ); - static $has_one = array( + private static $has_one = array( 'Project' => 'Project' ); } @@ -48,7 +48,7 @@ Let's create the `Student` and `Project` objects. :::php 'Student' ); } @@ -90,7 +90,7 @@ The restriction is enforced through the `$allowed_children` directive. :::php 'Varchar', ); - static $belongs_many_many = array( + private static $belongs_many_many = array( 'Projects' => 'Project' ); } @@ -207,7 +207,7 @@ The first step is to create the `Mentor` object and set the relation with the `P :::php class Project extends Page { // ... - static $many_many = array( + private static $many_many = array( 'Mentors' => 'Mentor' ); } diff --git a/email/Email.php b/email/Email.php index 9f9c38e57..90f040477 100644 --- a/email/Email.php +++ b/email/Email.php @@ -112,10 +112,11 @@ class Email extends ViewableData { protected $template_data = null; /** - * @param sring $admin_email_address The default administrator email address. + * @config + * @var string The default administrator email address. * This will be set in the config on a site-by-site basis */ - static $admin_email_address = ''; + private static $admin_email_address = ''; /** * Send every email generated by the Email class to the given address. @@ -124,10 +125,11 @@ class Email extends ViewableData { * * To set this, set Email.send_all_emails_to in your yml config file. * It can also be set in _ss_environment.php with SS_SEND_ALL_EMAILS_TO. - * + * + * @config * @param string $send_all_emails_to Email-Address */ - protected static $send_all_emails_to = null; + private static $send_all_emails_to = null; /** * Send every email generated by the Email class *from* the given address. @@ -135,40 +137,23 @@ class Email extends ViewableData { * * To set this, set Email.send_all_emails_from in your yml config file. * It can also be set in _ss_environment.php with SS_SEND_ALL_EMAILS_FROM. - * + * + * @config * @param string $send_all_emails_from Email-Address */ - protected static $send_all_emails_from = null; + private static $send_all_emails_from = null; /** - * BCC every email generated by the Email class to the given address. - * It won't affect the original delivery in the same way that send_all_emails_to does. It just adds a BCC header - * with the given email address. Note that you can only call this once - subsequent calls will overwrite the - * configuration variable. - * - * This can be used when you have a system that relies heavily on email and you want someone to be checking all - * correspondence. - * - * To set this, set Email.bcc_all_emails_to in your yml config file. - * - * @param string $bcc_all_emails_to Email-Address + * @config + * @param string BCC every email generated by the Email class to the given address. */ - protected static $bcc_all_emails_to = null; + private static $bcc_all_emails_to = null; /** - * CC every email generated by the Email class to the given address. - * It won't affect the original delivery in the same way that send_all_emails_to does. It just adds a CC header - * with the given email address. Note that you can only call this once - subsequent calls will overwrite the - * configuration variable. - * - * This can be used when you have a system that relies heavily on email and you want someone to be checking all - * correspondence. - * - * To set this, set Email.cc_all_emails_to in your yml config file. - * - * @param string $cc_all_emails_to Email-Address + * @config + * @param string CC every email generated by the Email class to the given address. */ - protected static $cc_all_emails_to = null; + private static $cc_all_emails_to = null; /** * Create a new email. @@ -364,7 +349,7 @@ class Email extends ViewableData { * and it won't be plain email :) */ protected function parseVariables($isPlain = false) { - SSViewer::set_source_file_comments(false); + Config::inst()->update('SSViewer', 'source_file_comments', false); if(!$this->parseVariables_done) { $this->parseVariables_done = true; @@ -417,7 +402,7 @@ class Email extends ViewableData { $this->parseVariables(true); - if(empty($this->from)) $this->from = Email::getAdminEmail(); + if(empty($this->from)) $this->from = Email::config()->admin_email; $headers = $this->customHeaders; @@ -482,7 +467,7 @@ class Email extends ViewableData { $this->parseVariables(); - if(empty($this->from)) $this->from = Email::getAdminEmail(); + if(empty($this->from)) $this->from = Email::config()->admin_email; $headers = $this->customHeaders; @@ -542,18 +527,22 @@ class Email extends ViewableData { * as a contact address on system error pages. * * Used by {@link Email->send()}, {@link Email->sendPlain()}, {@link Debug->friendlyError()}. - * + * + * @deprecated 3.2 Use the "Email.admin_email" config setting instead * @param string $newEmail */ public static function setAdminEmail($newEmail) { - self::$admin_email_address = $newEmail; + Deprecation::notice('3.2', 'Use the "Email.admin_email" config setting instead'); + Config::inst()->update('Email', 'admin_email', $newEmail); } /** + * @deprecated 3.2 Use the "Email.admin_email" config setting instead * @return string */ public static function getAdminEmail() { - return self::$admin_email_address; + Deprecation::notice('3.2', 'Use the "Email.admin_email" config setting instead'); + return Config::inst()->get('Email', 'admin_email'); } /** @@ -562,9 +551,12 @@ class Email extends ViewableData { * This can be used when testing, by putting a command like this in your _config.php file * * if(!Director::isLive()) Email::send_all_emails_to("someone@example.com") + * + * @deprecated 3.2 Use the "Email.send_all_emails_to" config setting instead */ public static function send_all_emails_to($emailAddress) { - self::$send_all_emails_to = $emailAddress; + Deprecation::notice('3.2', 'Use the "Email.send_all_emails_to" config setting instead'); + Config::inst()->update('Email', 'send_all_emails_to', $emailAddress); } /** @@ -577,9 +569,12 @@ class Email extends ViewableData { * correspondence. * * if(Director::isLive()) Email::cc_all_emails_to("supportperson@example.com") + * + * @deprecated 3.2 Use the "Email.cc_all_emails_to" config setting instead */ public static function cc_all_emails_to($emailAddress) { - self::$cc_all_emails_to = $emailAddress; + Deprecation::notice('3.2', 'Use the "Email.cc_all_emails_to" config setting instead'); + Config::inst()->update('Email', 'cc_all_emails_to', $emailAddress); } /** @@ -592,9 +587,12 @@ class Email extends ViewableData { * correspondence. * * if(Director::isLive()) Email::cc_all_emails_to("supportperson@example.com") + * + * @deprecated 3.2 Use the "Email.bcc_all_emails_to" config setting instead */ public static function bcc_all_emails_to($emailAddress) { - self::$bcc_all_emails_to = $emailAddress; + Deprecation::notice('3.2', 'Use the "Email.bcc_all_emails_to" config setting instead'); + Config::inst()->update('Email', 'bcc_all_emails_to', $emailAddress); } /** diff --git a/filesystem/File.php b/filesystem/File.php index 985e47098..c4d5406f5 100644 --- a/filesystem/File.php +++ b/filesystem/File.php @@ -64,13 +64,13 @@ */ class File extends DataObject { - static $default_sort = "\"Name\""; + private static $default_sort = "\"Name\""; - static $singular_name = "File"; + private static $singular_name = "File"; - static $plural_name = "Files"; + private static $plural_name = "Files"; - static $db = array( + private static $db = array( "Name" => "Varchar(255)", "Title" => "Varchar(255)", "Filename" => "Text", @@ -79,24 +79,25 @@ class File extends DataObject { 'ShowInSearch' => 'Boolean(1)', ); - static $has_one = array( + private static $has_one = array( "Parent" => "File", "Owner" => "Member" ); - static $has_many = array(); + private static $has_many = array(); - static $many_many = array(); + private static $many_many = array(); - static $defaults = array( + private static $defaults = array( "ShowInSearch" => 1, ); - static $extensions = array( + private static $extensions = array( "Hierarchy", ); /** + * @config * @var array List of allowed file extensions, enforced through {@link validate()}. * * Note: if you modify this, you should also change a configuration file in the assets directory. @@ -108,7 +109,7 @@ class File extends DataObject { * * Instructions for the change you need to make are included in a comment in the config file. */ - public static $allowed_extensions = array( + private static $allowed_extensions = array( '','html','htm','xhtml','js','css', 'bmp','png','gif','jpg','jpeg','ico','pcx','tif','tiff', 'au','mid','midi','mpa','mp3','ogg','m4a','ra','wma','wav','cda', @@ -120,9 +121,10 @@ class File extends DataObject { ); /** + * @config * @var array Category identifiers mapped to commonly used extensions. */ - static $app_categories = array( + private static $app_categories = array( 'audio' => array( "aif" ,"au" ,"mid" ,"midi" ,"mp3" ,"ra" ,"ram" ,"rm","mp3" ,"wav" ,"m4a" ,"snd" ,"aifc" ,"aiff" ,"wma", "apl", "avr" ,"cda" ,"mp4" ,"ogg" @@ -145,13 +147,18 @@ class File extends DataObject { ); /** + * @config * @var If this is true, then restrictions set in {@link $allowed_max_file_size} and * {@link $allowed_extensions} will be applied to users with admin privileges as * well. */ - public static $apply_restrictions_to_admin = true; + private static $apply_restrictions_to_admin = true; - public static $update_filesystem = true; + /** + * @config + * @var boolean + */ + private static $update_filesystem = true; /** * Cached result of a "SHOW FIELDS" call @@ -322,7 +329,10 @@ class File extends DataObject { public function getCMSFields() { // Preview if($this instanceof Image) { - $formattedImage = $this->getFormattedImage('SetWidth', Image::$asset_preview_width); + $formattedImage = $this->getFormattedImage( + 'SetWidth', + Config::inst()->get('Image', 'asset_preview_width') + ); $thumbnail = $formattedImage ? $formattedImage->URL : ''; $previewField = new LiteralField("ImageFull", "
- * FileNameFilter::$default_use_transliterator = false;
- * FileNameFilter::$default_replacements = array();
+ * FileNameFilter:
+ * default_use_transliterator: false
+ * default_replacements:
*
*
* See {@link URLSegmentFilter} for a more generic implementation.
@@ -29,14 +30,16 @@
class FileNameFilter extends Object {
/**
+ * @config
* @var Boolean
*/
- static $default_use_transliterator = true;
+ private static $default_use_transliterator = true;
/**
+ * @config
* @var Array See {@link setReplacements()}.
*/
- static $default_replacements = array(
+ private static $default_replacements = array(
'/\s/' => '-', // remove whitespace
'/_/' => '-', // underscores to dashes
'/[^A-Za-z0-9+.\-]+/' => '', // remove non-ASCII chars, only allow alphanumeric plus dash and dot
@@ -87,7 +90,7 @@ class FileNameFilter extends Object {
* @return Array
*/
public function getReplacements() {
- return ($this->replacements) ? $this->replacements : self::$default_replacements;
+ return ($this->replacements) ? $this->replacements : (array)$this->config()->default_replacements;
}
/**
@@ -99,7 +102,7 @@ class FileNameFilter extends Object {
* @return SS_Transliterator|NULL
*/
public function getTransliterator() {
- if($this->transliterator === null && self::$default_use_transliterator) {
+ if($this->transliterator === null && $this->config()->default_use_transliterator) {
$this->transliterator = SS_Transliterator::create();
}
return $this->transliterator;
diff --git a/filesystem/Filesystem.php b/filesystem/Filesystem.php
index 4e87f608d..87f081163 100644
--- a/filesystem/Filesystem.php
+++ b/filesystem/Filesystem.php
@@ -7,9 +7,17 @@
*/
class Filesystem extends Object {
- public static $file_create_mask = 02775;
+ /**
+ * @config
+ * @var integer Integer
+ */
+ private static $file_create_mask = 02775;
- public static $folder_create_mask = 02775;
+ /**
+ * @config
+ * @var integer Integer
+ */
+ private static $folder_create_mask = 02775;
protected static $cache_folderModTime;
@@ -23,7 +31,7 @@ class Filesystem extends Object {
*/
public static function makeFolder($folder) {
if(!file_exists($base = dirname($folder))) self::makeFolder($base);
- if(!file_exists($folder)) mkdir($folder, Filesystem::$folder_create_mask);
+ if(!file_exists($folder)) mkdir($folder, Config::inst()->get('Filesystem', 'folder_create_mask'));
}
/**
diff --git a/filesystem/Folder.php b/filesystem/Folder.php
index d76e4b677..95c6ee538 100644
--- a/filesystem/Folder.php
+++ b/filesystem/Folder.php
@@ -19,11 +19,11 @@
*/
class Folder extends File {
- static $singular_name = "Folder";
+ private static $singular_name = "Folder";
- static $plural_name = "Folders";
+ private static $plural_name = "Folders";
- static $default_sort = "\"Name\"";
+ private static $default_sort = "\"Name\"";
/**
*
diff --git a/filesystem/GD.php b/filesystem/GD.php
index b2b632618..1639d9292 100644
--- a/filesystem/GD.php
+++ b/filesystem/GD.php
@@ -8,15 +8,22 @@ class GDBackend extends Object implements Image_Backend {
protected $gd, $width, $height;
protected $quality;
- protected static $default_quality = 75;
+ /**
+ * @config
+ * @var integer
+ */
+ private static $default_quality = 75;
/**
* Set the default image quality.
+ *
+ * @deprecated 3.2 Use the "GDBackend.default_quality" config setting instead
* @param quality int A number from 0 to 100, 100 being the best quality.
*/
public static function set_default_quality($quality) {
+ Deprecation::notice('3.2', 'Use the "GDBackend.default_quality" config setting instead');
if(is_numeric($quality) && (int) $quality >= 0 && (int) $quality <= 100) {
- self::$default_quality = (int) $quality;
+ Config::inst()->set('GDBackend', 'default_quality', (int) $quality);
}
}
@@ -46,8 +53,9 @@ class GDBackend extends Object implements Image_Backend {
}
}
- $this->quality = self::$default_quality;
parent::__construct();
+
+ $this->quality = $this->config()->default_quality;
}
public function setImageResource($resource) {
@@ -431,7 +439,7 @@ class GDBackend extends Object implements Image_Backend {
public function makeDir($dirname) {
if(!file_exists(dirname($dirname))) $this->makeDir(dirname($dirname));
- if(!file_exists($dirname)) mkdir($dirname, Filesystem::$folder_create_mask);
+ if(!file_exists($dirname)) mkdir($dirname, Config::inst()->get('Filesystem', 'folder_create_mask'));
}
public function writeTo($filename) {
@@ -471,12 +479,12 @@ class GDBackend extends Object implements Image_Backend {
* Backwards compatibility
*/
class GD extends GDBackend {
+
+ /**
+ * @deprecated 3.2 Use the "GDBackend.default_quality" config setting instead
+ */
public static function set_default_quality($quality) {
- Deprecation::notice(
- '3.1',
- 'GDBackend::set_default_quality instead',
- Deprecation::SCOPE_CLASS
- );
+ Deprecation::notice('3.2', 'Use the "GDBackend.default_quality" config setting instead');
GDBackend::set_default_quality($quality);
}
}
diff --git a/filesystem/ImagickBackend.php b/filesystem/ImagickBackend.php
index d94fb0652..8773b5cc0 100644
--- a/filesystem/ImagickBackend.php
+++ b/filesystem/ImagickBackend.php
@@ -9,9 +9,10 @@ if(class_exists('Imagick')) {
class ImagickBackend extends Imagick implements Image_Backend {
/**
+ * @config
* @var int
*/
- protected static $default_quality = 75;
+ private static $default_quality = 75;
/**
* __construct
@@ -23,7 +24,7 @@ class ImagickBackend extends Imagick implements Image_Backend {
if(is_string($filename)) {
parent::__construct($filename);
} else {
- self::setImageCompressionQuality(self::$default_quality);
+ self::setImageCompressionQuality($this->config()->default_quality);
}
}
@@ -42,12 +43,15 @@ class ImagickBackend extends Imagick implements Image_Backend {
/**
* set_default_quality
*
- * @static
+ * @deprecated 3.2 Use the "IMagickBackend.default_quality" config setting instead
* @param int $quality
* @return void
*/
public static function set_default_quality($quality) {
- self::$default_quality = $quality;
+ Deprecation::notice('3.2', 'Use the "IMagickBackend.default_quality" config setting instead');
+ if(is_numeric($quality) && (int) $quality >= 0 && (int) $quality <= 100) {
+ Config::inst()->set('IMagickBackend', 'default_quality', (int) $quality);
+ }
}
/**
diff --git a/filesystem/Upload.php b/filesystem/Upload.php
index d8b2ef3d1..10954d300 100644
--- a/filesystem/Upload.php
+++ b/filesystem/Upload.php
@@ -21,7 +21,7 @@
*/
class Upload extends Controller {
- static $allowed_actions = array(
+ private static $allowed_actions = array(
'index',
'load'
);
@@ -64,14 +64,15 @@ class Upload extends Controller {
* A foldername relative to /assets,
* where all uploaded files are stored by default.
*
+ * @config
* @var string
*/
- public static $uploads_folder = "Uploads";
+ private static $uploads_folder = "Uploads";
public function __construct() {
parent::__construct();
$this->validator = new Upload_Validator();
- $this->replaceFile = $this->config()->get('replaceFile');
+ $this->replaceFile = $this->config()->replaceFile;
}
/**
@@ -105,7 +106,7 @@ class Upload extends Controller {
public function load($tmpFile, $folderPath = false) {
$this->clearErrors();
- if(!$folderPath) $folderPath = self::$uploads_folder;
+ if(!$folderPath) $folderPath = $this->config()->uploads_folder;
if(!is_array($tmpFile)) {
user_error("Upload::load() Not passed an array. Most likely, the form hasn't got the right enctype",
@@ -127,10 +128,10 @@ class Upload extends Controller {
// Create a folder for uploading.
if(!file_exists(ASSETS_PATH)){
- mkdir(ASSETS_PATH, Filesystem::$folder_create_mask);
+ mkdir(ASSETS_PATH, Config::inst()->get('Filesystem', 'folder_create_mask'));
}
if(!file_exists(ASSETS_PATH . "/" . $folderPath)){
- mkdir(ASSETS_PATH . "/" . $folderPath, Filesystem::$folder_create_mask);
+ mkdir(ASSETS_PATH . "/" . $folderPath, Config::inst()->get('Filesystem', 'folder_create_mask'));
}
// Generate default filename
diff --git a/forms/CountryDropdownField.php b/forms/CountryDropdownField.php
index 96a3eac2a..61a5f0e83 100644
--- a/forms/CountryDropdownField.php
+++ b/forms/CountryDropdownField.php
@@ -13,13 +13,13 @@ class CountryDropdownField extends DropdownField {
* Should we default the dropdown to the region determined from the user's locale?
* @var bool
*/
- static $default_to_locale = true;
+ private static $default_to_locale = true;
/**
* The region code to default to if default_to_locale is set to false, or we can't determine a region from a locale
* @var string
*/
- static $default_country = 'NZ';
+ private static $default_country = 'NZ';
protected $extraClasses = array('dropdown');
@@ -59,7 +59,7 @@ class CountryDropdownField extends DropdownField {
$source = $this->getSource();
if (!$this->value || !isset($source[$this->value])) {
- if ($this->config()->get('default_to_locale') && $this->locale()) {
+ if ($this->config()->default_to_locale && $this->locale()) {
$locale = new Zend_Locale();
$locale->setLocale($this->locale());
$this->value = $locale->getRegion();
@@ -67,7 +67,7 @@ class CountryDropdownField extends DropdownField {
}
if (!$this->value || !isset($source[$this->value])) {
- $this->value = $this->config()->get('default_country');
+ $this->value = $this->config()->default_country;
}
return parent::Field();
diff --git a/forms/DateField.php b/forms/DateField.php
index c08da0b3e..c73953e6b 100644
--- a/forms/DateField.php
+++ b/forms/DateField.php
@@ -58,9 +58,10 @@ require_once 'Zend/Date.php';
class DateField extends TextField {
/**
+ * @config
* @var array
*/
- static $default_config = array(
+ private static $default_config = array(
'showcalendar' => false,
'jslocale' => null,
'dmyfields' => false,
@@ -94,13 +95,12 @@ class DateField extends TextField {
$this->locale = i18n::get_locale();
}
- $this->config = self::$default_config;
-
+ $this->config = $this->config()->default_config;
if(!$this->getConfig('dateformat')) {
$this->setConfig('dateformat', i18n::get_date_format());
}
- foreach (self::$default_config AS $defaultK => $defaultV) {
+ foreach ($this->config()->default_config AS $defaultK => $defaultV) {
if ($defaultV) {
if ($defaultK=='locale')
$this->locale = $defaultV;
@@ -321,16 +321,14 @@ class DateField extends TextField {
}
/**
+ * @deprecated 3.2 Use the "DateField.default_config" config setting instead
* @param String $k
* @param mixed $v
* @return boolean
*/
public static function set_default_config($k, $v) {
- if (array_key_exists($k,self::$default_config)) {
- self::$default_config[$k]=$v;
- return true;
- }
- return false;
+ Deprecation::notice('3.2', 'Use the "DateField.default_config" config setting instead');
+ return Config::inst()->update('DateField', 'default_config', array($k => $v));
}
/**
@@ -457,7 +455,11 @@ class DateField extends TextField {
* @return mixed|array
*/
public function getConfig($name = null) {
- return $name ? $this->config[$name] : $this->config;
+ if($name) {
+ return isset($this->config[$name]) ? $this->config[$name] : null;
+ } else {
+ return $this->config;
+ }
}
}
@@ -517,10 +519,10 @@ class DateField_View_JQuery extends Object {
protected $jqueryLocaleFile = '';
/**
- * @var array Maps values from {@link i18n::$all_locales()} to
+ * @var array Maps values from {@link i18n::$all_locales} to
* localizations existing in jQuery UI.
*/
- static $locale_map = array(
+ private static $locale_map = array(
'en_GB' => 'en-GB',
'en_US' => 'en',
'en_NZ' => 'en-GB',
@@ -595,12 +597,13 @@ class DateField_View_JQuery extends Object {
*/
protected function getLang() {
$locale = $this->getField()->getLocale();
+ $map = $this->config()->locale_map;
if($this->getField()->getConfig('jslocale')) {
// Undocumented config property for now, might move to the jQuery view helper
$lang = $this->getField()->getConfig('jslocale');
- } else if(array_key_exists($locale, self::$locale_map)) {
+ } else if(array_key_exists($locale, $map)) {
// Specialized mapping for combined lang properties
- $lang = self::$locale_map[$locale];
+ $lang = $map[$locale];
} else {
// Fall back to default lang (meaning "en_US" turns into "en")
$lang = i18n::get_lang_from_locale($locale);
diff --git a/forms/DatetimeField.php b/forms/DatetimeField.php
index 4de0bf606..5b5d583ad 100644
--- a/forms/DatetimeField.php
+++ b/forms/DatetimeField.php
@@ -42,9 +42,10 @@ class DatetimeField extends FormField {
protected $timeField = null;
/**
+ * @config
* @var array
*/
- static $default_config = array(
+ private static $default_config = array(
'datavalueformat' => 'YYYY-MM-dd HH:mm:ss',
'usertimezone' => null,
'datetimeorder' => '%s %s',
@@ -56,7 +57,7 @@ class DatetimeField extends FormField {
protected $config;
public function __construct($name, $title = null, $value = ""){
- $this->config = self::$default_config;
+ $this->config = $this->config()->default_config;
$this->dateField = DateField::create($name . '[date]', false)
->addExtraClass('fieldgroup-field');
@@ -302,7 +303,11 @@ class DatetimeField extends FormField {
* @return mixed
*/
public function getConfig($name = null) {
- return $name ? $this->config[$name] : $this->config;
+ if($name) {
+ return isset($this->config[$name]) ? $this->config[$name] : null;
+ } else {
+ return $this->config;
+ }
}
public function validate($validator) {
diff --git a/forms/FileField.php b/forms/FileField.php
index 5aeb68f78..29cb4b283 100644
--- a/forms/FileField.php
+++ b/forms/FileField.php
@@ -160,7 +160,7 @@ class FileField extends FormField {
* @return string
*/
public function getFolderName() {
- return ($this->folderName !== false) ? $this->folderName : Upload::$uploads_folder;
+ return ($this->folderName !== false) ? $this->folderName : Config::inst()->get('Upload', 'uploads_folder');
}
public function validate($validator) {
diff --git a/forms/Form.php b/forms/Form.php
index 10038e92e..6bf81eac5 100644
--- a/forms/Form.php
+++ b/forms/Form.php
@@ -197,7 +197,7 @@ class Form extends RequestHandler {
$this->securityToken = ($securityEnabled) ? new SecurityToken() : new NullSecurityToken();
}
- static $url_handlers = array(
+ private static $url_handlers = array(
'field/$FieldName!' => 'handleField',
'POST ' => 'httpSubmission',
'GET ' => 'httpSubmission',
diff --git a/forms/HtmlEditorConfig.php b/forms/HtmlEditorConfig.php
index 165ba370d..aef07d589 100644
--- a/forms/HtmlEditorConfig.php
+++ b/forms/HtmlEditorConfig.php
@@ -13,8 +13,9 @@
*/
class HtmlEditorConfig {
- static $configs = array();
- static $current = null;
+ private static $configs = array();
+
+ private static $current = null;
/**
* Get the HtmlEditorConfig object for the given identifier. This is a correct way to get an HtmlEditorConfig
diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
index a8954ca34..ccbf86b49 100644
--- a/forms/HtmlEditorField.php
+++ b/forms/HtmlEditorField.php
@@ -9,9 +9,10 @@
class HtmlEditorField extends TextareaField {
/**
+ * @config
* @var Boolean Use TinyMCE's GZIP compressor
*/
- static $use_gzip = true;
+ private static $use_gzip = true;
protected $rows = 30;
@@ -23,7 +24,7 @@ class HtmlEditorField extends TextareaField {
$configObj = HtmlEditorConfig::get_active();
- if(self::$use_gzip) {
+ if(Config::inst()->get('HtmlEditorField', 'use_gzip')) {
$internalPlugins = array();
foreach($configObj->getPlugins() as $plugin => $path) if(!$path) $internalPlugins[] = $plugin;
$tag = TinyMCE_Compressor::renderTag(array(
@@ -241,7 +242,7 @@ class HtmlEditorField_Readonly extends ReadonlyField {
*/
class HtmlEditorField_Toolbar extends RequestHandler {
- static $allowed_actions = array(
+ private static $allowed_actions = array(
'LinkForm',
'MediaForm',
'viewfile'
@@ -424,7 +425,7 @@ class HtmlEditorField_Toolbar extends RequestHandler {
$computerUploadField->addExtraClass('ss-assetuploadfield');
$computerUploadField->removeExtraClass('ss-uploadfield');
$computerUploadField->setTemplate('HtmlEditorField_UploadField');
- $computerUploadField->setFolderName(Upload::$uploads_folder);
+ $computerUploadField->setFolderName(Config::inst()->get('Upload', 'uploads_folder'));
$tabSet = new TabSet(
"MediaFormInsertMediaTabs",
diff --git a/forms/TimeField.php b/forms/TimeField.php
index 47a2af262..14fc9709e 100644
--- a/forms/TimeField.php
+++ b/forms/TimeField.php
@@ -24,9 +24,10 @@ require_once 'Zend/Date.php';
class TimeField extends TextField {
/**
+ * @config
* @var array
*/
- static $default_config = array(
+ private static $default_config = array(
'timeformat' => null,
'use_strtotime' => true,
'datavalueformat' => 'HH:mm:ss'
@@ -54,7 +55,7 @@ class TimeField extends TextField {
$this->locale = i18n::get_locale();
}
- $this->config = self::$default_config;
+ $this->config = $this->config()->default_config;
if(!$this->getConfig('timeformat')) {
$this->setConfig('timeformat', i18n::get_time_format());
@@ -184,7 +185,11 @@ class TimeField extends TextField {
* @return mixed|array
*/
public function getConfig($name = null) {
- return $name ? $this->config[$name] : $this->config;
+ if($name) {
+ return isset($this->config[$name]) ? $this->config[$name] : null;
+ } else {
+ return $this->config;
+ }
}
/**
diff --git a/forms/TreeDropdownField.php b/forms/TreeDropdownField.php
index 5b4fd5945..8c1981ff5 100644
--- a/forms/TreeDropdownField.php
+++ b/forms/TreeDropdownField.php
@@ -42,11 +42,11 @@
class TreeDropdownField extends FormField {
- public static $url_handlers = array(
+ private static $url_handlers = array(
'$Action!/$ID' => '$Action'
);
- public static $allowed_actions = array(
+ private static $allowed_actions = array(
'tree'
);
diff --git a/forms/UploadField.php b/forms/UploadField.php
index 1ec573bed..ca2dc2067 100644
--- a/forms/UploadField.php
+++ b/forms/UploadField.php
@@ -31,7 +31,7 @@ class UploadField extends FileField {
/**
* @var array
*/
- public static $allowed_actions = array(
+ private static $allowed_actions = array(
'upload',
'attach',
'handleItem',
@@ -41,7 +41,7 @@ class UploadField extends FileField {
/**
* @var array
*/
- public static $url_handlers = array(
+ private static $url_handlers = array(
'item/$ID' => 'handleItem',
'select' => 'handleSelect',
'$Action!' => '$Action',
@@ -158,7 +158,9 @@ class UploadField extends FileField {
if($items) $this->setItems($items);
// filter out '' since this would be a regex problem on JS end
- $this->getValidator()->setAllowedExtensions(array_filter(File::$allowed_extensions));
+ $this->getValidator()->setAllowedExtensions(
+ array_filter(Config::inst()->get('File', 'allowed_extensions'))
+ );
// get the lower max size
$this->getValidator()->setAllowedMaxFileSize(min(File::ini2bytes(ini_get('upload_max_filesize')),
File::ini2bytes(ini_get('post_max_size'))));
@@ -688,7 +690,7 @@ class UploadField_ItemHandler extends RequestHandler {
*/
protected $itemID;
- public static $url_handlers = array(
+ private static $url_handlers = array(
'$Action!' => '$Action',
'' => 'index',
);
@@ -918,7 +920,7 @@ class UploadField_SelectHandler extends RequestHandler {
*/
protected $folderName;
- public static $url_handlers = array(
+ private static $url_handlers = array(
'$Action!' => '$Action',
'' => 'index',
);
diff --git a/forms/gridfield/GridField.php b/forms/gridfield/GridField.php
index 33a7cd830..b6d0ffbf5 100644
--- a/forms/gridfield/GridField.php
+++ b/forms/gridfield/GridField.php
@@ -24,7 +24,7 @@ class GridField extends FormField {
*
* @var array
*/
- public static $allowed_actions = array(
+ private static $allowed_actions = array(
'index',
'gridFieldAlterAction'
);
diff --git a/forms/gridfield/GridFieldDetailForm.php b/forms/gridfield/GridFieldDetailForm.php
index 582be93cb..882eb76b4 100644
--- a/forms/gridfield/GridFieldDetailForm.php
+++ b/forms/gridfield/GridFieldDetailForm.php
@@ -220,7 +220,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
*/
protected $template = 'GridFieldItemEditView';
- static $url_handlers = array(
+ private static $url_handlers = array(
'$Action!' => '$Action',
'' => 'edit',
);
diff --git a/forms/gridfield/GridFieldPageCount.php b/forms/gridfield/GridFieldPageCount.php
index 6b142c711..749b0a090 100755
--- a/forms/gridfield/GridFieldPageCount.php
+++ b/forms/gridfield/GridFieldPageCount.php
@@ -32,10 +32,11 @@ class GridFieldPageCount implements GridField_HTMLProvider {
/**
* Flag indicating whether or not this control should throw an error if a
* {@link GridFieldPaginator} is not present on the same {@link GridField}
- *
+ *
+ * @config
* @var boolean
*/
- public static $require_paginator = true;
+ private static $require_paginator = true;
/**
* Retrieves an instance of a GridFieldPaginator attached to the same control
@@ -46,7 +47,7 @@ class GridFieldPageCount implements GridField_HTMLProvider {
protected function getPaginator($gridField) {
$paginator = $gridField->getConfig()->getComponentByType('GridFieldPaginator');
- if(!$paginator && self::$require_paginator) {
+ if(!$paginator && Config::inst()->get('GridFieldPageCount', 'require_paginator')) {
throw new LogicException(
get_class($this) . " relies on a GridFieldPaginator to be added " .
"to the same GridField, but none are present."
diff --git a/i18n/i18n.php b/i18n/i18n.php
index 543624687..e2b150d57 100644
--- a/i18n/i18n.php
+++ b/i18n/i18n.php
@@ -69,24 +69,28 @@ class i18n extends Object implements TemplateGlobalProvider {
protected static $current_locale = '';
/**
+ * @config
* @var string
*/
- protected static $default_locale = 'en_US';
+ private static $default_locale = 'en_US';
/**
+ * @config
* @var boolean
*/
- protected static $js_i18n = true;
+ private static $js_i18n = true;
/**
+ * @config
* @var string
*/
- protected static $date_format;
+ private static $date_format;
/**
+ * @config
* @var string
*/
- protected static $time_format;
+ private static $time_format;
/**
* @var array Array of priority keys to instances of Zend_Translate, mapped by name.
@@ -107,24 +111,30 @@ class i18n extends Object implements TemplateGlobalProvider {
*
* @see Requirements::process_i18n_javascript()
*
+ * @deprecated 3.2 Use the "i18n.js_i18n" config setting instead
* @param bool $bool
*/
public static function set_js_i18n($bool) {
- self::$js_i18n = $bool;
+ Deprecation::notice('3.2', 'Use the "i18n.js_i18n" config setting instead');
+ Config::inst()->update('i18n', 'js_i18n', $bool);
}
/**
+ * @deprecated 3.2 Use the "i18n.js_i18n" config setting instead
* @return bool
*/
public static function get_js_i18n() {
+ Deprecation::notice('3.2', 'Use the "i18n.js_i18n" config setting instead');
return self::$js_i18n;
}
/**
+ * @deprecated 3.2 Use the "i18n.date_format" config setting instead
* @param string ISO date format
*/
public static function set_date_format($format) {
- self::$date_format = $format;
+ Deprecation::notice('3.2', 'Use the "i18n.date_format" config setting instead');
+ Config::inst()->update('i18n', 'date_format', $format);
}
/**
@@ -132,14 +142,17 @@ class i18n extends Object implements TemplateGlobalProvider {
*/
public static function get_date_format() {
require_once 'Zend/Date.php';
- return (self::$date_format) ? self::$date_format : Zend_Locale_Format::getDateFormat(self::get_locale());
+ $dateFormat = Config::inst()->get('i18n', 'date_format');
+ return ($dateFormat) ? $dateFormat : Zend_Locale_Format::getDateFormat(self::get_locale());
}
/**
+ * @deprecated 3.2 Use the "i18n.time_format" config setting instead
* @param string ISO time format
*/
public static function set_time_format($format) {
- self::$time_format = $format;
+ Deprecation::notice('3.2', 'Use the "i18n.time_format" config setting instead');
+ Config::inst()->update('i18n', 'time_format', $format);
}
/**
@@ -147,15 +160,17 @@ class i18n extends Object implements TemplateGlobalProvider {
*/
public static function get_time_format() {
require_once 'Zend/Date.php';
- return (self::$time_format) ? self::$time_format : Zend_Locale_Format::getTimeFormat(self::get_locale());
+ $timeFormat = Config::inst()->get('i18n', 'time_format');
+ return ($timeFormat) ? $timeFormat : Zend_Locale_Format::getTimeFormat(self::get_locale());
}
/**
* An exhaustive list of possible locales (code => language and country)
*
+ * @config
* @var array
*/
- public static $all_locales = array (
+ private static $all_locales = array (
'aa_DJ' => 'Afar (Djibouti)',
'ab_GE' => 'Abkhazian (Georgia)',
'abr_GH' => 'Abron (Ghana)',
@@ -731,11 +746,12 @@ class i18n extends Object implements TemplateGlobalProvider {
);
/**
+ * @config
* @var array $common_locales
* Sorted alphabtically by the common language name,
* not the locale key.
*/
- public static $common_locales = array(
+ private static $common_locales = array(
'af_ZA' => array('Afrikaans', 'Afrikaans'),
'sq_AL' => array('Albanian', 'shqip'),
'ar_EG' => array('Arabic', 'العربية'),
@@ -822,7 +838,11 @@ class i18n extends Object implements TemplateGlobalProvider {
'zu_ZA' => array('Zulu', 'isiZulu'),
);
- static $tinymce_lang = array(
+ /**
+ * @config
+ * @var array
+ */
+ private static $tinymce_lang = array(
'ca_AD' => 'ca',
'ca_ES' => 'ca',
'cs_CZ' => 'cs',
@@ -986,13 +1006,14 @@ class i18n extends Object implements TemplateGlobalProvider {
);
/**
+ * @config
* @var array $likely_subtags Provides you "likely locales"
* for a given "short" language code. This is a guess,
* as we can't disambiguate from e.g. "en" to "en_US" - it
* could also mean "en_UK".
* @see http://www.unicode.org/cldr/data/charts/supplemental/likely_subtags.html
*/
- static $likely_subtags = array(
+ private static $likely_subtags = array(
'aa' => 'aa_ET',
'ab' => 'ab_GE',
'ady' => 'ady_RU',
@@ -1666,7 +1687,7 @@ class i18n extends Object implements TemplateGlobalProvider {
*/
public static function get_common_locales($native = false) {
$languages = array();
- foreach (self::$common_locales as $code => $name) {
+ foreach (Config::inst()->get('i18n', 'common_locales') as $code => $name) {
$languages[$code] = ($native ? $name[1] : $name[0]);
}
return $languages;
@@ -1678,7 +1699,8 @@ class i18n extends Object implements TemplateGlobalProvider {
* @return list of languages in the form 'code' => 'name'
*/
public static function get_locale_list() {
- return self::$all_locales;
+ Deprecation::notice('3.2', 'Use the "i18n.all_locales" config setting instead');
+ return (array)Config::inst()->get('i18n', 'all_locales');
}
/**
@@ -1697,6 +1719,7 @@ class i18n extends Object implements TemplateGlobalProvider {
foreach($modules as $module) {
if(!file_exists("{$module}/lang/")) continue;
+ $allLocales = Config::inst()->get('i18n', 'all_locales');
$moduleLocales = scandir("{$module}/lang/");
foreach($moduleLocales as $moduleLocale) {
preg_match('/(.*)\.[\w\d]+$/',$moduleLocale, $matches);
@@ -1704,7 +1727,7 @@ class i18n extends Object implements TemplateGlobalProvider {
// Normalize locale to include likely region tag.
// TODO Replace with CLDR list of actually available languages/regions
$locale = str_replace('-', '_', self::get_locale_from_lang($locale));
- $locales[$locale] = (@self::$all_locales[$locale]) ? self::$all_locales[$locale] : $locale;
+ $locales[$locale] = (isset($allLocales[$locale])) ? $allLocales[$locale] : $locale;
}
}
}
@@ -1763,8 +1786,9 @@ class i18n extends Object implements TemplateGlobalProvider {
* @return Language
*/
public static function get_tinymce_lang() {
- if(isset(self::$tinymce_lang[self::get_locale()])) {
- return self::$tinymce_lang[self::get_locale()];
+ $lang = Config::inst()->get('i18n', 'tinymce_lang');
+ if(isset($lang[self::get_locale()])) {
+ return $lang[self::get_locale()];
}
return 'en';
@@ -1819,10 +1843,11 @@ class i18n extends Object implements TemplateGlobalProvider {
* @return string Long locale, e.g. "en_US"
*/
public static function get_locale_from_lang($lang) {
+ $subtags = Config::inst()->get('i18n', 'likely_subtags');
if(preg_match('/\-|_/', $lang)) {
return $lang;
- } else if(isset(self::$likely_subtags[$lang])) {
- return self::$likely_subtags[$lang];
+ } else if(isset($subtags[$lang])) {
+ return $subtags[$lang];
} else {
return $lang . '_' . strtoupper($lang);
}
@@ -1880,7 +1905,7 @@ class i18n extends Object implements TemplateGlobalProvider {
public static function validate_locale($locale) {
// Convert en-US to en_US
$locale = str_replace('-', '_', $locale);
- return (array_key_exists($locale, self::$all_locales));
+ return (array_key_exists($locale, Config::inst()->get('i18n', 'all_locales')));
}
/**
@@ -1983,7 +2008,7 @@ class i18n extends Object implements TemplateGlobalProvider {
if(is_dir($themesBase)) {
foreach(scandir($themesBase) as $theme) {
if(
- strpos($theme, SSViewer::current_theme()) === 0
+ strpos($theme, Config::inst()->get('SSViewer', 'theme')) === 0
&& file_exists("{$themesBase}/{$theme}/lang/")
) {
$filename = $adapter->getFilenameForLocale($locale);
diff --git a/i18n/i18nTextCollector.php b/i18n/i18nTextCollector.php
index abb9e064b..3af422154 100644
--- a/i18n/i18nTextCollector.php
+++ b/i18n/i18nTextCollector.php
@@ -462,7 +462,7 @@ class i18nTextCollector_Writer_Php implements i18nTextCollector_Writer {
// Create folder for lang files
$langFolder = $path . '/lang';
if(!file_exists($langFolder)) {
- Filesystem::makeFolder($langFolder, Filesystem::$folder_create_mask);
+ Filesystem::makeFolder($langFolder, Config::inst()->get('Filesystem', 'folder_create_mask'));
touch($langFolder . '/_manifest_exclude');
}
@@ -539,7 +539,7 @@ class i18nTextCollector_Writer_RailsYaml implements i18nTextCollector_Writer {
// Create folder for lang files
$langFolder = $path . '/lang';
if(!file_exists($langFolder)) {
- Filesystem::makeFolder($langFolder, Filesystem::$folder_create_mask);
+ Filesystem::makeFolder($langFolder, Config::inst()->get('Filesystem', 'folder_create_mask'));
touch($langFolder . '/_manifest_exclude');
}
@@ -587,8 +587,9 @@ class i18nTextCollector_Writer_RailsYaml implements i18nTextCollector_Writer {
*/
class i18nTextCollector_Parser extends SSTemplateParser {
- static $entities = array();
- static $currentEntity = array();
+ private static $entities = array();
+
+ private static $currentEntity = array();
public function Translate__construct(&$res) {
self::$currentEntity = array(null,null,null); //start with empty array
diff --git a/main.php b/main.php
index d0110eef1..1f98f7e82 100644
--- a/main.php
+++ b/main.php
@@ -31,7 +31,7 @@ if (version_compare(phpversion(), '5.3.2', '<')) {
* - Sets up error handlers with {@link Debug::loadErrorHandlers()}
* - Calls {@link DB::connect()}, passing it the global variable $databaseConfig that should
* be defined in an _config.php
- * - Sets up the default director rules using {@link Director::addRules()}
+ * - Sets up the default director rules using {@link Director::$rules}
*
* After that, it calls {@link Director::direct()}, which is responsible for doing most of the
* real work.
diff --git a/model/Aggregate.php b/model/Aggregate.php
index 295131b57..f0dce851b 100644
--- a/model/Aggregate.php
+++ b/model/Aggregate.php
@@ -35,7 +35,7 @@
*/
class Aggregate extends ViewableData {
- static $cache = null;
+ private static $cache = null;
/** Build & cache the cache object */
protected static function cache() {
diff --git a/model/DataObject.php b/model/DataObject.php
index ec63615c1..6fb408961 100644
--- a/model/DataObject.php
+++ b/model/DataObject.php
@@ -71,20 +71,23 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
/**
* Human-readable singular name.
* @var string
+ * @config
*/
- public static $singular_name = null;
+ private static $singular_name = null;
/**
* Human-readable pluaral name
* @var string
+ * @config
*/
- public static $plural_name = null;
+ private static $plural_name = null;
/**
* Allow API access to this object?
* @todo Define the options that can be set here
+ * @config
*/
- public static $api_access = false;
+ private static $api_access = false;
/**
* True if this DataObject has been destroyed.
@@ -136,7 +139,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
protected $brokenOnWrite = false;
/**
- * Should dataobjects be validated before they are written?
+ * @config
+ * @var boolean Should dataobjects be validated before they are written?
*/
private static $validation_enabled = true;
@@ -164,19 +168,24 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
/**
* Returns when validation on DataObjects is enabled.
+ *
+ * @deprecated 3.2 Use the "DataObject.validation_enabled" config setting instead
* @return bool
*/
public static function get_validation_enabled() {
- return self::$validation_enabled;
+ Deprecation::notice('3.2', 'Use the "DataObject.validation_enabled" config setting instead');
+ return Config::inst()->get('DataObject', 'validation_enabled');
}
/**
* Set whether DataObjects should be validated before they are written.
* @param $enable bool
* @see DataObject::validate()
+ * @deprecated 3.2 Use the "DataObject.validation_enabled" config setting instead
*/
public static function set_validation_enabled($enable) {
- self::$validation_enabled = (bool) $enable;
+ Deprecation::notice('3.2', 'Use the "DataObject.validation_enabled" config setting instead');
+ Config::inst()->update('DataObject', 'validation_enabled', (bool)$enable);
}
/**
@@ -1066,7 +1075,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
E_USER_WARNING
);
}
- else if(self::get_validation_enabled()) {
+ else if(Config::inst()->get('DataObject', 'validation_enabled')) {
$valid = $this->validate();
if (!$valid->valid()) {
$writeException = new ValidationException(
@@ -3335,14 +3344,14 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @var array
* @config
*/
- public static $db = null;
+ private static $db = null;
/**
* Use a casting object for a field. This is a map from
* field name to class name of the casting object.
* @var array
*/
- public static $casting = array(
+ private static $casting = array(
"LastEdited" => "SS_Datetime",
"Created" => "SS_Datetime",
"Title" => 'Text',
@@ -3364,8 +3373,9 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* included in the next major release. Please use with care.
*
* @var array
+ * @config
*/
- static $create_table_options = array(
+ private static $create_table_options = array(
'MySQLDatabase' => 'ENGINE=InnoDB'
);
@@ -3375,8 +3385,9 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* See {@link SS_Database->requireIndex()} and custom subclasses for details on the array notation.
*
* @var array
+ * @config
*/
- public static $indexes = null;
+ private static $indexes = null;
/**
* Inserts standard column-values when a DataObject
@@ -3388,8 +3399,9 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* or false in your subclass. Setting it to null won't work.
*
* @var array
+ * @config
*/
- public static $defaults = null;
+ private static $defaults = null;
/**
* Multidimensional array which inserts default data into the database
@@ -3404,8 +3416,9 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* ).
*
* @var array
+ * @config
*/
- public static $default_records = null;
+ private static $default_records = null;
/**
* One-to-zero relationship defintion. This is a map of component name to data type. In order to turn this into a
@@ -3414,8 +3427,9 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* Note that you cannot have a has_one and belongs_to relationship with the same name.
*
* @var array
+ * @config
*/
- public static $has_one = null;
+ private static $has_one = null;
/**
* A meta-relationship that allows you to define the reverse side of a {@link DataObject::$has_one}.
@@ -3427,8 +3441,9 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* Note that you cannot have a has_one and belongs_to relationship with the same name.
*
* @var array
+ * @config
*/
- public static $belongs_to;
+ private static $belongs_to;
/**
* This defines a one-to-many relationship. It is a map of component name to the remote data class.
@@ -3439,15 +3454,17 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* which foreign key to use.
*
* @var array
+ * @config
*/
- public static $has_many = null;
+ private static $has_many = null;
/**
* many-many relationship definitions.
* This is a map from component name to data type.
* @var array
+ * @config
*/
- public static $many_many = null;
+ private static $many_many = null;
/**
* Extra fields to include on the connecting many-many table.
@@ -3463,22 +3480,25 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
*
*
* @var array
+ * @config
*/
- public static $many_many_extraFields = null;
+ private static $many_many_extraFields = null;
/**
* The inverse side of a many-many relationship.
* This is a map from component name to data type.
* @var array
+ * @config
*/
- public static $belongs_many_many = null;
+ private static $belongs_many_many = null;
/**
* The default sort expression. This will be inserted in the ORDER BY
* clause of a SQL query if no other sort expression is provided.
* @var string
+ * @config
*/
- public static $default_sort = null;
+ private static $default_sort = null;
/**
* Default list of fields that can be scaffolded by the ModelAdmin
@@ -3512,20 +3532,23 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* )
* );
*
+ * @config
*/
- public static $searchable_fields = null;
+ private static $searchable_fields = null;
/**
* User defined labels for searchable_fields, used to override
* default display in the search form.
+ * @config
*/
- public static $field_labels = null;
+ private static $field_labels = null;
/**
* Provides a default list of fields to be used by a 'summary'
* view of this object.
+ * @config
*/
- public static $summary_fields = null;
+ private static $summary_fields = null;
/**
* Provides a list of allowed methods that can be called via RESTful api.
diff --git a/model/Database.php b/model/Database.php
index 44093e881..7770f03d2 100644
--- a/model/Database.php
+++ b/model/Database.php
@@ -6,23 +6,20 @@
* @subpackage model
*/
abstract class SS_Database {
- /**
- * Connection object to the database.
- * @param resource
- */
- static $globalConn;
/**
+ * @config
* @var boolean Check tables when running /dev/build, and repair them if necessary.
* In case of large databases or more fine-grained control on how to handle
* data corruption in tables, you can disable this behaviour and handle it
* outside of this class, e.g. through a nightly system task with extended logging capabilities.
*/
- static $check_and_repair_on_build = true;
+ private static $check_and_repair_on_build = true;
/**
* If this is false, then information about database operations
* will be displayed, eg creation of tables.
+ *
* @param boolean
*/
protected $supressOutput = false;
@@ -329,7 +326,9 @@ abstract class SS_Database {
$this->transCreateTable($table, $options, $extensions);
$this->alterationMessage("Table $table: created","created");
} else {
- if(self::$check_and_repair_on_build) $this->checkAndRepairTable($table, $options);
+ if(Config::inst()->get('Database', 'check_and_repair_on_build')) {
+ $this->checkAndRepairTable($table, $options);
+ }
// Check if options changed
$tableOptionsChanged = false;
diff --git a/model/DatabaseAdmin.php b/model/DatabaseAdmin.php
index f63643b58..94b0c37a9 100644
--- a/model/DatabaseAdmin.php
+++ b/model/DatabaseAdmin.php
@@ -14,7 +14,7 @@ require_once("model/DB.php");
class DatabaseAdmin extends Controller {
/// SECURITY ///
- static $allowed_actions = array(
+ private static $allowed_actions = array(
'index',
'build',
'cleanup',
diff --git a/model/Image.php b/model/Image.php
index 810c456ae..b8c6ca9ae 100644
--- a/model/Image.php
+++ b/model/Image.php
@@ -12,54 +12,59 @@ class Image extends File {
const ORIENTATION_PORTRAIT = 1;
const ORIENTATION_LANDSCAPE = 2;
- static $backend = "GDBackend";
+ private static $backend = "GDBackend";
- static $casting = array(
+ private static $casting = array(
'Tag' => 'HTMLText',
);
/**
- * The width of an image thumbnail in a strip.
- * @var int
+ * @config
+ * @var int The width of an image thumbnail in a strip.
*/
- public static $strip_thumbnail_width = 50;
+ private static $strip_thumbnail_width = 50;
/**
- * The height of an image thumbnail in a strip.
- * @var int
+ * @config
+ * @var int The height of an image thumbnail in a strip.
*/
- public static $strip_thumbnail_height = 50;
+ private static $strip_thumbnail_height = 50;
/**
- * The width of an image thumbnail in the CMS.
- * @var int
+ * @config
+ * @var int The width of an image thumbnail in the CMS.
*/
- public static $cms_thumbnail_width = 100;
+ private static $cms_thumbnail_width = 100;
/**
- * The height of an image thumbnail in the CMS.
+ * @config
+ * @var int The height of an image thumbnail in the CMS.
*/
- public static $cms_thumbnail_height = 100;
+ private static $cms_thumbnail_height = 100;
/**
- * The width of an image thumbnail in the Asset section.
+ * @config
+ * @var int The width of an image thumbnail in the Asset section.
*/
- public static $asset_thumbnail_width = 100;
+ private static $asset_thumbnail_width = 100;
/**
- * The height of an image thumbnail in the Asset section.
+ * @config
+ * @var int The height of an image thumbnail in the Asset section.
*/
- public static $asset_thumbnail_height = 100;
+ private static $asset_thumbnail_height = 100;
/**
- * The width of an image preview in the Asset section.
+ * @config
+ * @var int The width of an image preview in the Asset section.
*/
- public static $asset_preview_width = 400;
+ private static $asset_preview_width = 400;
/**
- * The height of an image preview in the Asset section.
+ * @config
+ * @var int The height of an image preview in the Asset section.
*/
- public static $asset_preview_height = 200;
+ private static $asset_preview_height = 200;
public static function set_backend($backend) {
self::$backend = $backend;
@@ -158,11 +163,11 @@ class Image extends File {
// Create a folder
if(!file_exists(ASSETS_PATH)) {
- mkdir(ASSETS_PATH, Filesystem::$folder_create_mask);
+ mkdir(ASSETS_PATH, Config::inst()->get('Filesystem', 'folder_create_mask'));
}
if(!file_exists(ASSETS_PATH . "/$class")) {
- mkdir(ASSETS_PATH . "/$class", Filesystem::$folder_create_mask);
+ mkdir(ASSETS_PATH . "/$class", Config::inst()->get('Filesystem', 'folder_create_mask'));
}
// Generate default filename
diff --git a/model/Image_Backend.php b/model/Image_Backend.php
index e4642d0cd..7e5a0ba3a 100644
--- a/model/Image_Backend.php
+++ b/model/Image_Backend.php
@@ -24,16 +24,7 @@ interface Image_Backend {
* @return void
*/
public function writeTo($path);
-
- /**
- * set_default_quality
- *
- * @static
- * @param int $quality
- * @return void
- */
- public static function set_default_quality($quality);
-
+
/**
* setQuality
*
diff --git a/model/MySQLDatabase.php b/model/MySQLDatabase.php
index 597532a4b..e9724d749 100644
--- a/model/MySQLDatabase.php
+++ b/model/MySQLDatabase.php
@@ -26,6 +26,10 @@ class MySQLDatabase extends SS_Database {
*/
private $database;
+ /**
+ * @config
+ * @var String
+ */
private static $connection_charset = null;
private $supportsTransactions = true;
@@ -39,9 +43,12 @@ class MySQLDatabase extends SS_Database {
* However, sites created before version 2.4.0 should leave this unset or data that isn't 7-bit
* safe will be corrupted. As such, the installer comes with this set in mysite/_config.php by
* default in versions 2.4.0 and later.
+ *
+ * @deprecated 3.1 Use "MySQLDatabase.connection_charset" config setting instead
*/
public static function set_connection_charset($charset = 'utf8') {
- self::$connection_charset = $charset;
+ Deprecation::notice('3.2', 'Use "MySQLDatabase.connection_charset" config setting instead');
+ Config::inst()->update('MySQLDatabase', 'connection_charset', $charset);
}
/**
@@ -67,8 +74,8 @@ class MySQLDatabase extends SS_Database {
$this->query("SET sql_mode = 'ANSI'");
- if(self::$connection_charset) {
- $this->dbConn->set_charset(self::$connection_charset);
+ if(Config::inst()->get('MySQLDatabase', 'connection_charset')) {
+ $this->dbConn->set_charset(Config::inst()->get('MySQLDatabase', 'connection_charset'));
}
$this->active = $this->dbConn->select_db($parameters['database']);
diff --git a/model/Transliterator.php b/model/Transliterator.php
index 4a8a5018f..d703edfd5 100644
--- a/model/Transliterator.php
+++ b/model/Transliterator.php
@@ -15,16 +15,17 @@
*/
class SS_Transliterator extends Object {
/**
- * Allow the use of iconv() to perform transliteration. Set to false to disable.
+ * @config
+ * @var boolean Allow the use of iconv() to perform transliteration. Set to false to disable.
* Even if this variable is true, iconv() won't be used if it's not installed.
*/
- static $use_iconv = false;
+ private static $use_iconv = false;
/**
* Convert the given utf8 string to a safe ASCII source
*/
public function toASCII($source) {
- if(function_exists('iconv') && self::$use_iconv) return $this->useIconv($source);
+ if(function_exists('iconv') && $this->config()->use_iconv) return $this->useIconv($source);
else return $this->useStrTr($source);
}
diff --git a/model/URLSegmentFilter.php b/model/URLSegmentFilter.php
index 77240e282..f086d67b5 100644
--- a/model/URLSegmentFilter.php
+++ b/model/URLSegmentFilter.php
@@ -17,14 +17,16 @@
class URLSegmentFilter extends Object {
/**
+ * @config
* @var Boolean
*/
- static $default_use_transliterator = true;
+ private static $default_use_transliterator = true;
/**
+ * @config
* @var Array See {@link setReplacements()}.
*/
- static $default_replacements = array(
+ private static $default_replacements = array(
'/&/u' => '-and-',
'/&/u' => '-and-',
'/\s/u' => '-', // remove whitespace
@@ -39,10 +41,11 @@ class URLSegmentFilter extends Object {
* Useful for character sets that have little overlap with ASCII (e.g. far eastern),
* as well as better search engine optimization for URLs.
* @see http://www.ietf.org/rfc/rfc3987
- *
+ *
+ * @config
* @var boolean
*/
- static $default_allow_multibyte = false;
+ private static $default_allow_multibyte = false;
/**
* @var Array See {@link setReplacements()}
@@ -92,7 +95,7 @@ class URLSegmentFilter extends Object {
* @return Array
*/
public function getReplacements() {
- return ($this->replacements) ? $this->replacements : self::$default_replacements;
+ return ($this->replacements) ? $this->replacements : (array)$this->config()->default_replacements;
}
/**
@@ -104,7 +107,7 @@ class URLSegmentFilter extends Object {
* @return SS_Transliterator|NULL
*/
public function getTransliterator() {
- if($this->transliterator === null && self::$default_use_transliterator) {
+ if($this->transliterator === null && $this->config()->default_use_transliterator) {
$this->transliterator = SS_Transliterator::create();
}
return $this->transliterator;
@@ -133,6 +136,6 @@ class URLSegmentFilter extends Object {
* @return boolean
*/
public function getAllowMultibyte() {
- return ($this->allowMultibyte !== null) ? $this->allowMultibyte : self::$default_allow_multibyte;
+ return ($this->allowMultibyte !== null) ? $this->allowMultibyte : $this->config()->default_allow_multibyte;
}
}
diff --git a/model/Versioned.php b/model/Versioned.php
index aedcb32d6..fbb69a176 100644
--- a/model/Versioned.php
+++ b/model/Versioned.php
@@ -55,7 +55,7 @@ class Versioned extends DataExtension {
*
* @var array $db_for_versions_table
*/
- static $db_for_versions_table = array(
+ private static $db_for_versions_table = array(
"RecordID" => "Int",
"Version" => "Int",
"WasPublished" => "Boolean",
@@ -69,7 +69,7 @@ class Versioned extends DataExtension {
*
* @var array $indexes_for_versions_table
*/
- static $indexes_for_versions_table = array(
+ private static $indexes_for_versions_table = array(
'RecordID_Version' => '("RecordID","Version")',
'RecordID' => true,
'Version' => true,
@@ -103,7 +103,7 @@ class Versioned extends DataExtension {
$this->liveStage = array_pop($stages);
}
- static $db = array(
+ private static $db = array(
'Version' => 'Int'
);
@@ -152,7 +152,7 @@ class Versioned extends DataExtension {
$query->replaceText("`{$table}_versions`.`ID`", "`{$table}_versions`.`RecordID`");
// Add all
- * Security::set_login_recording(true);
- *
+ * Enable through {@link Security::$login_recording}.
*
* Caution: Please make sure that enabling logging
* complies with your privacy standards. We're logging
@@ -17,21 +14,21 @@
*/
class LoginAttempt extends DataObject {
- static $db = array(
+ private static $db = array(
'Email' => 'Varchar(255)',
'Status' => "Enum('Success,Failure')",
'IP' => 'Varchar(255)',
);
- static $has_one = array(
+ private static $has_one = array(
'Member' => 'Member', // only linked if the member actually exists
);
- static $has_many = array();
+ private static $has_many = array();
- static $many_many = array();
+ private static $many_many = array();
- static $belongs_many_many = array();
+ private static $belongs_many_many = array();
/**
*
diff --git a/security/Member.php b/security/Member.php
index b87063356..db2217641 100644
--- a/security/Member.php
+++ b/security/Member.php
@@ -7,7 +7,7 @@
*/
class Member extends DataObject implements TemplateGlobalProvider {
- static $db = array(
+ private static $db = array(
'FirstName' => 'Varchar',
'Surname' => 'Varchar',
'Email' => 'Varchar(256)', // See RFC 5321, Section 4.5.3.1.3.
@@ -33,27 +33,31 @@ class Member extends DataObject implements TemplateGlobalProvider {
'TimeFormat' => 'Varchar(30)',
);
- static $belongs_many_many = array(
+ private static $belongs_many_many = array(
'Groups' => 'Group',
);
- static $has_one = array();
+ private static $has_one = array();
- static $has_many = array();
+ private static $has_many = array();
- static $many_many = array();
+ private static $many_many = array();
- static $many_many_extraFields = array();
+ private static $many_many_extraFields = array();
- static $default_sort = '"Surname", "FirstName"';
+ private static $default_sort = '"Surname", "FirstName"';
- static $indexes = array(
+ private static $indexes = array(
'Email' => true,
//Removed due to duplicate null values causing MSSQL problems
//'AutoLoginHash' => Array('type'=>'unique', 'value'=>'AutoLoginHash', 'ignoreNulls'=>true)
);
- static $notify_password_change = false;
+ /**
+ * @config
+ * @var boolean
+ */
+ private static $notify_password_change = false;
/**
* All searchable database columns
@@ -66,50 +70,59 @@ class Member extends DataObject implements TemplateGlobalProvider {
* with definition for different searching algorithms
* (LIKE, FULLTEXT) and default FormFields to construct a searchform.
*/
- static $searchable_fields = array(
+ private static $searchable_fields = array(
'FirstName',
'Surname',
'Email',
);
- static $summary_fields = array(
+ private static $summary_fields = array(
'FirstName' => 'First Name',
'Surname' => 'Last Name',
'Email' => 'Email',
);
/**
+ * @config
* @var Array See {@link set_title_columns()}
*/
- static $title_format = null;
+ private static $title_format = null;
/**
* The unique field used to identify this member.
* By default, it's "Email", but another common
* field could be Username.
- *
+ *
+ * @config
* @var string
*/
- protected static $unique_identifier_field = 'Email';
+ private static $unique_identifier_field = 'Email';
/**
+ * @config
* {@link PasswordValidator} object for validating user's password
*/
- protected static $password_validator = null;
+ private static $password_validator = null;
/**
+ * @config
* The number of days that a password should be valid for.
* By default, this is null, which means that passwords never expire
*/
- protected static $password_expiry_days = null;
+ private static $password_expiry_days = null;
- protected static $lock_out_after_incorrect_logins = null;
+ /**
+ * @config
+ * @var Int
+ */
+ private static $lock_out_after_incorrect_logins = null;
/**
- * If this is set, then a session cookie with the given name will be set on log-in,
+ * @config
+ * @var String If this is set, then a session cookie with the given name will be set on log-in,
* and cleared on logout.
*/
- protected static $login_marker_cookie = null;
+ private static $login_marker_cookie = null;
/**
* Indicates that when a {@link Member} logs in, Member:session_regenerate_id()
@@ -117,13 +130,18 @@ class Member extends DataObject implements TemplateGlobalProvider {
*
* This doesn't always work, especially if you're trying to set session cookies
* across an entire site using the domain parameter to session_set_cookie_params()
- *
+ *
+ * @config
* @var boolean
*/
- protected static $session_regenerate_id = true;
+ private static $session_regenerate_id = true;
+ /**
+ * @deprecated 3.2 Use the "Member.session_regenerate_id" config setting instead
+ */
public static function set_session_regenerate_id($bool) {
- self::$session_regenerate_id = $bool;
+ Deprecation::notice('3.2', 'Use the "Member.session_regenerate_id" config setting instead');
+ self::config()->session_regenerate_id = $bool;
}
/**
@@ -174,11 +192,13 @@ class Member extends DataObject implements TemplateGlobalProvider {
*
* RewriteCond %{HTTP_COOKIE} !SS_LOGGED_IN=1
*
- *
+ *
+ * @deprecated 3.2 Use the "Member.login_marker_cookie" config setting instead
* @param $cookieName string The name of the cookie to set.
*/
public static function set_login_marker_cookie($cookieName) {
- self::$login_marker_cookie = $cookieName;
+ Deprecation::notice('3.2', 'Use the "Member.login_marker_cookie" config setting instead');
+ self::config()->login_marker_cookie = $cookieName;
}
/**
@@ -254,21 +274,25 @@ class Member extends DataObject implements TemplateGlobalProvider {
/**
* Get the field used for uniquely identifying a member
* in the database. {@see Member::$unique_identifier_field}
- *
+ *
+ * @deprecated 3.2 Use the "Member.unique_identifier_field" config setting instead
* @return string
*/
public static function get_unique_identifier_field() {
- return self::$unique_identifier_field;
+ Deprecation::notice('3.2', 'Use the "Member.unique_identifier_field" config setting instead');
+ return Member::config()->unique_identifier_field;
}
/**
* Set the field used for uniquely identifying a member
* in the database. {@see Member::$unique_identifier_field}
- *
+ *
+ * @deprecated 3.2 Use the "Member.unique_identifier_field" config setting instead
* @param $field The field name to set as the unique field
*/
public static function set_unique_identifier_field($field) {
- self::$unique_identifier_field = $field;
+ Deprecation::notice('3.2', 'Use the "Member.unique_identifier_field" config setting instead');
+ Member::config()->unique_identifier_field = $field;
}
/**
@@ -288,16 +312,22 @@ class Member extends DataObject implements TemplateGlobalProvider {
/**
* Set the number of days that a password should be valid for.
* Set to null (the default) to have passwords never expire.
+ *
+ * @deprecated 3.2 Use the "Member.password_expiry_days" config setting instead
*/
public static function set_password_expiry($days) {
- self::$password_expiry_days = $days;
+ Deprecation::notice('3.2', 'Use the "Member.password_expiry_days" config setting instead');
+ self::config()->password_expiry_days = $days;
}
/**
* Configure the security system to lock users out after this many incorrect logins
+ *
+ * @deprecated 3.2 Use the "Member.lock_out_after_incorrect_logins" config setting instead
*/
public static function lock_out_after_incorrect_logins($numLogins) {
- self::$lock_out_after_incorrect_logins = $numLogins;
+ Deprecation::notice('3.2', 'Use the "Member.lock_out_after_incorrect_logins" config setting instead');
+ self::config()->lock_out_after_incorrect_logins = $numLogins;
}
@@ -316,7 +346,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
Session::set("loggedInAs", $this->ID);
// This lets apache rules detect whether the user has logged in
- if(self::$login_marker_cookie) Cookie::set(self::$login_marker_cookie, 1, 0);
+ if(Member::config()->login_marker_cookie) Cookie::set(Member::config()->login_marker_cookie, 1, 0);
$this->NumVisit++;
@@ -334,7 +364,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
}
// Clear the incorrect log-in count
- if(self::$lock_out_after_incorrect_logins) {
+ if(self::config()->lock_out_after_incorrect_logins) {
$this->FailedLoginCount = 0;
}
@@ -394,7 +424,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
self::session_regenerate_id();
Session::set("loggedInAs", $member->ID);
// This lets apache rules detect whether the user has logged in
- if(self::$login_marker_cookie) Cookie::set(self::$login_marker_cookie, 1, 0, null, null, false, true);
+ if(Member::config()->login_marker_cookie) Cookie::set(Member::config()->login_marker_cookie, 1, 0, null, null, false, true);
$generator = new RandomGenerator();
$token = $generator->randomToken('sha1');
@@ -416,7 +446,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
*/
public function logOut() {
Session::clear("loggedInAs");
- if(self::$login_marker_cookie) Cookie::set(self::$login_marker_cookie, null, 0);
+ if(Member::config()->login_marker_cookie) Cookie::set(Member::config()->login_marker_cookie, null, 0);
self::session_regenerate_id();
$this->extend('memberLoggedOut');
@@ -632,7 +662,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
// If a member with the same "unique identifier" already exists with a different ID, don't allow merging.
// Note: This does not a full replacement for safeguards in the controller layer (e.g. in a registration form),
// but rather a last line of defense against data inconsistencies.
- $identifierField = self::$unique_identifier_field;
+ $identifierField = Member::config()->unique_identifier_field;
if($this->$identifierField) {
// Note: Same logic as Member_Validator class
$idClause = ($this->ID) ? sprintf(" AND \"Member\".\"ID\" <> %d", (int)$this->ID) : '';
@@ -665,7 +695,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
(Director::isLive() || Email::mailer() instanceof TestMailer)
&& $this->isChanged('Password')
&& $this->record['Password']
- && Member::$notify_password_change
+ && $this->config()->notify_password_change
) {
$e = Member_ChangePasswordEmail::create();
$e->populateTemplate($this);
@@ -681,7 +711,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
$encryption_details = Security::encrypt_password(
$this->Password, // this is assumed to be cleartext
$this->Salt,
- ($this->PasswordEncryption) ? $this->PasswordEncryption : Security::get_password_encryption_algorithm(),
+ ($this->PasswordEncryption) ? $this->PasswordEncryption : Security::config()->password_encryption_algorithm,
$this
);
@@ -693,8 +723,8 @@ class Member extends DataObject implements TemplateGlobalProvider {
// If we haven't manually set a password expiry
if(!$this->isChanged('PasswordExpiry')) {
// then set it for us
- if(self::$password_expiry_days) {
- $this->PasswordExpiry = date('Y-m-d', time() + 86400 * self::$password_expiry_days);
+ if(self::config()->password_expiry_days) {
+ $this->PasswordExpiry = date('Y-m-d', time() + 86400 * self::config()->password_expiry_days);
} else {
$this->PasswordExpiry = null;
}
@@ -812,7 +842,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
*/
public static function set_title_columns($columns, $sep = ' ') {
if (!is_array($columns)) $columns = array($columns);
- self::$title_format = array('columns' => $columns, 'sep' => $sep);
+ self::config()->title_format = array('columns' => $columns, 'sep' => $sep);
}
//------------------- HELPER METHODS -----------------------------------//
@@ -828,12 +858,13 @@ class Member extends DataObject implements TemplateGlobalProvider {
* of the member is equal 0, only the surname is returned.
*/
public function getTitle() {
- if (self::$title_format) {
+ $format = $this->config()->title_format;
+ if ($format) {
$values = array();
- foreach(self::$title_format['columns'] as $col) {
+ foreach($format['columns'] as $col) {
$values[] = $this->getField($col);
}
- return join(self::$title_format['sep'], $values);
+ return join($format['sep'], $values);
}
if($this->getField('ID') === 0)
return $this->getField('Surname');
@@ -861,13 +892,14 @@ class Member extends DataObject implements TemplateGlobalProvider {
// This should be abstracted to SSDatabase concatOperator or similar.
$op = (DB::getConn() instanceof MSSQLDatabase) ? " + " : " || ";
- if (self::$title_format) {
+ $format = self::config()->title_format;
+ if ($format) {
$columnsWithTablename = array();
- foreach(self::$title_format['columns'] as $column) {
+ foreach($format['columns'] as $column) {
$columnsWithTablename[] = "\"$tableName\".\"$column\"";
}
- return "(".join(" $op '".self::$title_format['sep']."' $op ", $columnsWithTablename).")";
+ return "(".join(" $op '".$format['sep']."' $op ", $columnsWithTablename).")";
} else {
return "(\"$tableName\".\"Surname\" $op ' ' $op \"$tableName\".\"FirstName\")";
}
@@ -1126,7 +1158,7 @@ class Member extends DataObject implements TemplateGlobalProvider {
$mainFields->removeByName('PasswordExpiry');
$mainFields->removeByName('LockedOutUntil');
- if(!self::$lock_out_after_incorrect_logins) {
+ if(!self::config()->lock_out_after_incorrect_logins) {
$mainFields->removeByName('FailedLoginCount');
}
@@ -1363,12 +1395,12 @@ class Member extends DataObject implements TemplateGlobalProvider {
* This can be used to lock the user out temporarily if too many failed attempts are made.
*/
public function registerFailedLogin() {
- if(self::$lock_out_after_incorrect_logins) {
+ if(self::config()->lock_out_after_incorrect_logins) {
// Keep a tally of the number of failed log-ins so that we can lock people out
$this->FailedLoginCount = $this->FailedLoginCount + 1;
$this->write();
- if($this->FailedLoginCount >= self::$lock_out_after_incorrect_logins) {
+ if($this->FailedLoginCount >= self::config()->lock_out_after_incorrect_logins) {
$this->LockedOutUntil = date('Y-m-d H:i:s', time() + 15*60);
$this->write();
}
@@ -1531,8 +1563,7 @@ class Member_Validator extends RequiredFields {
public function php($data) {
$valid = parent::php($data);
- $identifierField = Member::get_unique_identifier_field();
-
+ $identifierField = Member::config()->unique_identifier_field;
$SQL_identifierField = Convert::raw2sql($data[$identifierField]);
$member = DataObject::get_one('Member', "\"$identifierField\" = '{$SQL_identifierField}'");
diff --git a/security/MemberAuthenticator.php b/security/MemberAuthenticator.php
index 7654cca37..e78357df7 100644
--- a/security/MemberAuthenticator.php
+++ b/security/MemberAuthenticator.php
@@ -13,7 +13,7 @@ class MemberAuthenticator extends Authenticator {
* If set, will migrate to new precision-safe password hashing
* upon login. See http://open.silverstripe.org/ticket/3004.
*/
- static $migrate_legacy_hashes = array(
+ private static $migrate_legacy_hashes = array(
'md5' => 'md5_v2.4',
'sha1' => 'sha1_v2.4'
);
@@ -45,7 +45,7 @@ class MemberAuthenticator extends Authenticator {
} else {
$member = DataObject::get_one(
"Member",
- "\"" . Member::get_unique_identifier_field() . "\" = '$SQL_user' AND \"Password\" IS NOT NULL"
+ "\"" . Member::config()->unique_identifier_field . "\" = '$SQL_user' AND \"Password\" IS NOT NULL"
);
if($member) {
@@ -64,7 +64,7 @@ class MemberAuthenticator extends Authenticator {
/**
* TODO We could handle this with an extension
*/
- if(Security::login_recording()) {
+ if(Security::config()->login_recording) {
$attempt = new LoginAttempt();
if($member) {
// successful login (member is existing with matching password)
@@ -77,7 +77,7 @@ class MemberAuthenticator extends Authenticator {
// failed login - we're trying to see if a user exists with this email (disregarding wrong passwords)
$existingMember = DataObject::get_one(
"Member",
- "\"" . Member::get_unique_identifier_field() . "\" = '$SQL_user'"
+ "\"" . Member::config()->unique_identifier_field . "\" = '$SQL_user'"
);
if($existingMember) {
$attempt->MemberID = $existingMember->ID;
diff --git a/security/MemberLoginForm.php b/security/MemberLoginForm.php
index 755006efc..1e5e2bceb 100644
--- a/security/MemberLoginForm.php
+++ b/security/MemberLoginForm.php
@@ -58,7 +58,7 @@ class MemberLoginForm extends LoginForm {
);
} else {
if(!$fields) {
- $label=singleton('Member')->fieldLabel(Member::get_unique_identifier_field());
+ $label=singleton('Member')->fieldLabel(Member::config()->unique_identifier_field);
$fields = new FieldList(
new HiddenField("AuthenticationMethod", null, $this->authenticator_class, $this),
// Regardless of what the unique identifer field is (usually 'Email'), it will be held in the
@@ -66,7 +66,7 @@ class MemberLoginForm extends LoginForm {
new TextField("Email", $label, Session::get('SessionForms.MemberLoginForm.Email'), null, $this),
new PasswordField("Password", _t('Member.PASSWORD', 'Password'))
);
- if(Security::$autologin_enabled) {
+ if(Security::config()->autologin_enabled) {
$fields->push(new CheckboxField(
"Remember",
_t('Member.REMEMBERME', "Remember me next time?")
@@ -184,8 +184,8 @@ JS
}
// If a default login dest has been set, redirect to that.
- if (Security::default_login_dest()) {
- return $this->controller->redirect(Director::absoluteBaseURL() . Security::default_login_dest());
+ if (Security::config()->default_login_dest) {
+ return $this->controller->redirect(Director::absoluteBaseURL() . Security::config()->default_login_dest);
}
// Redirect the user to the page where he came from
diff --git a/security/MemberPassword.php b/security/MemberPassword.php
index fe3551e39..95b4256dd 100644
--- a/security/MemberPassword.php
+++ b/security/MemberPassword.php
@@ -5,21 +5,21 @@
* @subpackage security
*/
class MemberPassword extends DataObject {
- static $db = array(
+ private static $db = array(
'Password' => 'Varchar(160)',
'Salt' => 'Varchar(50)',
'PasswordEncryption' => 'Varchar(50)',
);
- static $has_one = array(
+ private static $has_one = array(
'Member' => 'Member'
);
- static $has_many = array();
+ private static $has_many = array();
- static $many_many = array();
+ private static $many_many = array();
- static $belongs_many_many = array();
+ private static $belongs_many_many = array();
/**
* Log a password change from the given member.
diff --git a/security/PasswordEncryptor.php b/security/PasswordEncryptor.php
index 283f4b358..ed5742711 100644
--- a/security/PasswordEncryptor.php
+++ b/security/PasswordEncryptor.php
@@ -15,8 +15,9 @@ abstract class PasswordEncryptor {
/**
* @var array
+ * @config
*/
- protected static $encryptors = array();
+ private static $encryptors = array();
/**
* @return Array Map of encryptor code to the used class.
diff --git a/security/PasswordValidator.php b/security/PasswordValidator.php
index 8389c299d..4dfbe5535 100644
--- a/security/PasswordValidator.php
+++ b/security/PasswordValidator.php
@@ -16,7 +16,8 @@
* @subpackage security
*/
class PasswordValidator extends Object {
- static $character_strength_tests = array(
+
+ private static $character_strength_tests = array(
'lowercase' => '/[a-z]/',
'uppercase' => '/[A-Z]/',
'digits' => '/[0-9]/',
@@ -73,7 +74,7 @@ class PasswordValidator extends Object {
$score = 0;
$missedTests = array();
foreach($this->testNames as $name) {
- if(preg_match(self::$character_strength_tests[$name], $password)) $score++;
+ if(preg_match(self::config()->character_strength_tests[$name], $password)) $score++;
else $missedTests[] = $name;
}
diff --git a/security/Permission.php b/security/Permission.php
index 3e7bb12fb..e8e55ddcd 100644
--- a/security/Permission.php
+++ b/security/Permission.php
@@ -8,25 +8,25 @@ class Permission extends DataObject implements TemplateGlobalProvider {
// the (1) after Type specifies the DB default value which is needed for
// upgrades from older SilverStripe versions
- static $db = array(
+ private static $db = array(
"Code" => "Varchar",
"Arg" => "Int",
"Type" => "Int(1)"
);
- static $has_one = array(
+ private static $has_one = array(
"Group" => "Group"
);
- static $indexes = array(
+ private static $indexes = array(
"Code" => true
);
- static $defaults = array(
+ private static $defaults = array(
"Type" => 1
);
- static $has_many = array();
+ private static $has_many = array();
- static $many_many = array();
+ private static $many_many = array();
- static $belongs_many_many = array();
+ private static $belongs_many_many = array();
/**
* This is the value to use for the "Type" field if a permission should be
@@ -53,42 +53,38 @@ class Permission extends DataObject implements TemplateGlobalProvider {
*
* @var bool
*/
- static $declared_permissions = null;
+ private static $declared_permissions = null;
/**
* Linear list of declared permissions in the system.
*
* @var array
*/
- protected static $declared_permissions_list = null;
+ private static $declared_permissions_list = null;
/**
+ * @config
* @var $strict_checking Boolean Method to globally disable "strict" checking,
* which means a permission will be granted if the key does not exist at all.
*/
- static $strict_checking = true;
-
- /**
- * If this setting is set, then permissions can imply other permissions
- *
- * @var bool
- */
- static $implied_permissions = false;
+ private static $strict_checking = true;
/**
* Set to false to prevent the 'ADMIN' permission from implying all
* permissions in the system
*
+ * @config
* @var bool
*/
- static $admin_implies_all = true;
+ private static $admin_implies_all = true;
/**
* a list of permission codes which doesn't appear in the Permission list
* when make the {@link PermissionCheckboxSetField}
+ * @config
* @var array;
*/
- static $hidden_permissions = array();
+ private static $hidden_permissions = array();
/**
* Check that the current member has the given permission.
@@ -157,7 +153,7 @@ class Permission extends DataObject implements TemplateGlobalProvider {
// If $admin_implies_all was false then this would be inefficient, but that's an edge
// case and this keeps the code simpler
if(!is_array($code)) $code = array($code);
- if(self::$admin_implies_all) $code[] = "ADMIN";
+ if(Config::inst()->get('Permission', 'admin_implies_all')) $code[] = "ADMIN";
// Multiple $code values - return true if at least one matches, ie, intersection exists
return (bool)array_intersect($code, self::$cache_permissions[$memberID]);
@@ -195,7 +191,7 @@ class Permission extends DataObject implements TemplateGlobalProvider {
$SQL_code = Convert::raw2sql($code);
- $adminFilter = (self::$admin_implies_all) ? ",'ADMIN'" : '';
+ $adminFilter = (Config::inst()->get('Permission', 'admin_implies_all')) ? ",'ADMIN'" : '';
// Raw SQL for efficiency
$permission = DB::query("
@@ -212,7 +208,7 @@ class Permission extends DataObject implements TemplateGlobalProvider {
if($permission) return $permission;
// Strict checking disabled?
- if(!self::$strict_checking || !$strict) {
+ if(!Config::inst()->get('Permission', 'strict_checking') || !$strict) {
$hasPermission = DB::query("
SELECT COUNT(*)
FROM \"Permission\"
@@ -534,21 +530,27 @@ class Permission extends DataObject implements TemplateGlobalProvider {
/**
* add a permission represented by the $code to the {@link slef::$hidden_permissions} list
*
+ * @deprecated 3.1 Use "Permission.hidden_permissions" config setting instead
* @param $code string - the permissions code
* @return void
*/
public static function add_to_hidden_permissions($code){
- self::$hidden_permissions[] = $code;
+ if(is_string($codes)) $codes = array($codes);
+ Deprecation::notice('3.2', 'Use "Permission.hidden_permissions" config setting instead');
+ Config::inst()->update('Permission', 'hidden_permissions', $codes);
}
/**
* remove a permission represented by the $code from the {@link slef::$hidden_permissions} list
*
+ * @deprecated 3.1 Use "Permission.hidden_permissions" config setting instead
* @param $code string - the permissions code
* @return void
*/
public static function remove_from_hidden_permissions($code){
- self::$hidden_permissions = array_diff(self::$hidden_permissions, array($code));
+ if(is_string($codes)) $codes = array($codes);
+ Deprecation::notice('3.2', 'Use "Permission.hidden_permissions" config setting instead');
+ Config::inst()->remove('Permission', 'hidden_permissions', $codes);
}
/**
@@ -557,17 +559,13 @@ class Permission extends DataObject implements TemplateGlobalProvider {
* Permissions can be grouped by nesting arrays. Scalar values are always
* treated as permissions.
*
+ * @deprecated 3.2 Use "Permission.declared_permissions" config setting instead
* @param array $permArray A (possibly nested) array of permissions to
* declare for the system.
*/
public static function declare_permissions($permArray) {
- if(is_array(self::$declared_permissions)) {
- self::$declared_permissions =
- array_merge_recursive(self::$declared_permissions, $permArray);
- }
- else {
- self::$declared_permissions = $permArray;
- }
+ Deprecation::notice('3.2', 'Use "Permission.declared_permissions" config setting instead');
+ self::config()->declared_permissions = $permArray;
}
diff --git a/security/PermissionCheckboxSetField.php b/security/PermissionCheckboxSetField.php
index cc8932882..0c2ca25f6 100644
--- a/security/PermissionCheckboxSetField.php
+++ b/security/PermissionCheckboxSetField.php
@@ -160,13 +160,14 @@ class PermissionCheckboxSetField extends FormField {
$odd = 0;
$options = '';
+ $globalHidden = (array)Config::inst()->get('Permission', 'hidden_permissions');
if($this->source) {
// loop through all available categorized permissions and see if they're assigned for the given groups
foreach($this->source as $categoryName => $permissions) {
$options .= "