tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
10,460 Commits 31 Branches 527 Tags 162 MiB
f07ad307e4
Commit Graph

793 Commits

Author SHA1 Message Date
Ingo Schommer
1f7f8b8aee BUGFIX Don't' set 'Referer' header in FunctionalTest->get()/post() if its explicitly passed to the method 2012-05-04 11:49:30 +02:00
Ingo Schommer
e929753992 MINOR Using correct $locale format in installer (regression from last commit) 2012-05-03 00:00:51 +02:00
Ingo Schommer
0068b6d5b6 BUGFIX Showing only actually available languages for selection during install (fixes #7260) 2012-05-02 23:35:20 +02:00
Andrew O'Neil
fa60f9e8b2 ENHANCEMENT: Implement blowfish encryption and use it by default. (#7111) 2012-05-02 13:51:29 +12:00
Sean Harvey
3ccaa1f864 MINOR Supress any error connecting to the database so the installer 
doesn't show it in the page header
 2012-04-30 11:15:21 +12:00
Sean Harvey
32d4ec837c Merge pull request #374 from oddnoc/installer-email-password-feedback 
BUGFIX: Start a PHP session in installer.
 2012-04-27 21:49:38 -07:00
Sean Harvey
b03cf04dbd BUGFIX Updating MySQLDatabaseConfigurationHelper to check for MySQLi 
instead of mysql_connect and other old function usage, as we've moved to
MySQLi in MySQLDatabase.php now
 2012-04-28 12:13:58 +12:00
Fred Condo
b8228271e6 BUGFIX: Start a PHP session in installer. 
This fixes blank username and password on home/successfullyinstalled
 2012-04-27 16:51:47 -07:00
Fred Condo
df6a249bf0 BUGFIX: Change requirement rubrics to remove confusion 
Resolves #7199

Change all the rubrics to be nouns or questions, rather than a statement of
the desired setting. If the setting is correct, we get a nice green OK; if
not, it was confusing for the rubric to state the opposite of the failure
mode, which is described in the long message.
 2012-04-26 15:04:07 -07:00
Sean Harvey
bda849afeb BUGFIX Check for SimpleXML support in PHP at the installation step 2012-04-22 22:43:06 +12:00
Sean Harvey
cc339c37c4 BUGFIX Ensure the SS3 installer checks for CType support in PHP, as language YAML parser uses this in framework. 2012-04-22 17:45:56 +12:00
Sean Harvey
c55e0b8b95 MINOR Fixing up PHP versions to be consistent with 
33ae83640b
 2012-04-20 15:08:01 +12:00
Sam Minnee
33ae83640b MINOR: Lowered 5.3.10 recommendation to 5.3.4 2012-04-20 14:45:57 +12:00
Sean Harvey
16e950cb6a MINOR Tidy up of code formatting in TestRunner 
MINOR Fixing up old ObjectStaticTest and merging into ConfigTest
 2012-04-18 23:29:54 +12:00
Sean Harvey
4c6be2931b BUGFIX Removing use of deprecated Object static functions like 
get_static(), set_static(), uninherited() etc. Replace with equivalent
Config system get(), update()
 2012-04-18 23:10:57 +12:00
Mateusz Uzdowski
e262a29193 ENHANCEMENT: move code introspection functions to the silverstripe-codeviz module 2012-04-17 14:45:26 +12:00
Sean Harvey
69c066cb2c Merge pull request #332 from mateusz/strict 
BUGFIX: fix up some E_STRICT errors
 2012-04-16 16:59:29 -07:00
Mateusz Uzdowski
59663f9289 BUGFIX: fix up some E_STRICT errors 2012-04-17 11:51:55 +12:00
Will Rossiter
7a4392ca03 Merge pull request #324 from halkyon/installer_fixes 
MINOR: Fix install not loading because of Zend/Translate.php dependency in i18n.php
 2012-04-16 16:34:53 -07:00
Sean Harvey
5f73643e3f BUGFIX Hardcoding locales in installer, because we can't include i18n 
properly, and including core/Core.php is too much.
 2012-04-17 11:02:18 +12:00
Sean Harvey
ad2a21cc92 API CHANGE getSysTempDir() is now deprecated, use sys_get_temp_dir() 
instead!
 2012-04-17 10:53:41 +12:00
Sean Harvey
dc0031cf26 BUGFIX Fixed broken installer trying to include i18n thirdparty Zend 
libs, which depends on Core.php being included first because include
paths are setup there first. This has the effect of removing redundant
code in the installer like temp path discovery, as Core takes care of
that for us.
 2012-04-17 10:53:40 +12:00
Sean Harvey
d0984ec897 MINOR Line break after sentence of message 2012-04-17 10:53:40 +12:00
Sean Harvey
bbf04ee7ea MINOR Removed function_exists() checks which aren't necessary for PHP 5.2+ 2012-04-16 13:15:41 +12:00
Sean Harvey
ebe75fefab MINOR Update locations to server requirements page 2012-04-15 16:29:14 +12:00
Sean Harvey
515a2ccfcc MINOR Updating old URLs in installer, show message about creating admin 
account
 2012-04-15 16:01:06 +12:00
Sean Harvey
e71b8d6215 MINOR Installer cleanups, removing references to old "command line 
installation" which is no longer supported.
MINOR Removed stray semi-colon when showing version in installer
template.
 2012-04-15 15:05:20 +12:00
Sean Harvey
6405c44bc2 MINOR Enable the highest level of error_reporting() in install, to be 
consistent with Core.php
 2012-04-15 10:50:20 +12:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814 MINOR Add newline to end of files without one 2012-04-15 10:50:19 +12:00
Sean Harvey
f57a763524 MINOR Ensure incomplete tests also have a backtrace 2012-04-15 00:26:17 +12:00
Sean Harvey
ce097a7b54 ENHANCEMENT If there are no test failures, but incomplete tests, mark 
summary of test run as "ok but incomplete" in yellow for CliTestReporter
 2012-04-15 00:07:15 +12:00
Sean Harvey
edaed5ef7e BUGFIX If SS_Backtrace::get_rendered_backtrace() has $plainText argument 
to TRUE, ensure there is no HTML in the output.
 2012-04-15 00:05:49 +12:00
Sean Harvey
fc18b2c788 ENHANCEMENT TestReporter now reports incomplete tests properly 2012-04-14 23:11:54 +12:00
Will Rossiter
907568b182 ENHANCEMENT: move hard coded template HTML for composite field and field group out to separate template files. 2012-04-14 17:36:08 +12:00
Robert Curry
8b0dafb30d ENHANCEMENT: Change PHP version requirements. Part of #7131. 2012-04-13 13:12:48 +12:00
Mateusz Uzdowski
5186a0cea3 BUGFIX: remove unnecessary setComponent call - no longer used (os6175) 2012-04-12 17:04:24 +12:00
Ingo Schommer
a3d99b082d MINOR Resetting Security::$database_is_ready state during tests (regression from a9509a610d) 2012-04-11 17:22:55 +02:00
Ingo Schommer
ca24120a5e MINOR Install screen visual tweaks, more visible disabled state on install button, conditional version number (to avoid it showing without a version), referencing new theme in install screen, using new layout in install progress screen as well 2012-04-11 16:49:31 +02:00
Ingo Schommer
ac45e5b9c0 Merge branch 'integration' 
Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html
 2012-04-11 16:31:12 +02:00
Ingo Schommer
6cd91ff449 Merge pull request #299 from ajoneil/sapphire 
---

Conflicts:
	forms/NumericField.php
 2012-04-11 15:36:35 +02:00
Paul Clarke
4f23ac1722 ENHANCEMENT Installer styling, moving away from blackcandy 2012-04-11 22:51:10 +12:00
Andrew O'Neil
c5aa074bff BUGFIX: Fix E_STRICT errors not being reported 2012-04-11 14:39:02 +12:00
Ingo Schommer
8c5e56fe31 Merge branch 'master' into integration 
Conflicts:
	admin/css/screen.css
	dev/install/php5-required.html
 2012-04-09 21:10:08 +02:00
Jeremy Bridson
697ffb82a7 ENHANCEMENT:fixed styling on "installing SilverStripe" page. 2012-04-05 12:01:27 +12:00
Jeremy Bridson
c1f6f20114 ENHANCEMENT:added logo to header on ss3 install page - plus compass regenerated icon sprites. 2012-04-05 11:18:11 +12:00
Ingo Schommer
40d73127ae MINOR Using late static binding instead of Object::create() calls 2012-04-04 17:10:31 +02:00
Ingo Schommer
af80ab5ab7 Merge pull request #282 from halkyon/php52_references 
Removed checks for versions less than PHP 5.3
 2012-04-04 07:47:04 -07:00
Jeremy Bridson
875eef9992 ENHANCEMENT:Styled the php5 required page and fixed a couple of styling issues on the install page in IE. 2012-04-04 13:26:28 +12:00
Jeremy Bridson
63b23a2155 ENHANCEMENT:incorporating "simple" theme into the the SS3 Install - styling the install page to fit with the "simple" theme 2012-04-03 17:31:40 +12:00
Sean Harvey
349019e780 MINOR Adjusted wording based on E_DEPRECATED and E_USER_DEPRECATED error levels. 2012-04-03 10:28:07 +12:00
Sean Harvey
68aaae8cc0 MINOR Update docs and version checking for PHP 5.3+ 2012-04-03 09:54:55 +12:00
Ingo Schommer
2ecfbc49f5 Merge pull request #276 from halkyon/e_deprecated_fixes 
E_DEPRECATED fixes - split() replaced with preg_split()
 2012-03-28 02:31:04 -07:00
Sean Harvey
e0dc3aaf21 Merge pull request #278 from silverstripe-scienceninjas/install-and-php5-ini-settings 
BUGFIX The SilverStripe installer throwing warning on settings that was okey
 2012-03-28 02:20:27 -07:00
Stig Lindqvist
1a81c3de27 BUGFIX The SilverStripe installer throwing warning on settings that was legit. 2012-03-28 17:56:57 +13:00
Fred Condo
5954774530 BUGFIX: Use UTC consistently across all tests for date/time calculations 
This ensures that tests will not pass or fail based on whether the test
machine is on NZ time.

This partially reverts df050eda5d, which has
already been merged. Instead of finding tests that use date calculations, we
are now setting the default time zone in SapphireTest so it will apply to the
whole test suite and any future tests.

Adjust expected values in certain tests for UTC, where the expected values had
previously been expressed in NZ time.

When creating a temp DB for test fixtures, create the DB connection with
timezone UTC.
 2012-03-27 10:29:07 -07:00
Sean Harvey
cf014dc56d MINOR Replaced use of deprecated split() with preg_split() and fixed use of "&new Class()" which is deprecated in PHP 5.3 
ENHANCEMENT E_DEPRECATED and E_USER_DEPRECATED are now handled as notice level errors in Debug.
 2012-03-27 23:16:52 +13:00
Sam Minnee
7db3b8ecd6 MINOR: Raise deprecation errors in the same way as notice-level errors. 2012-03-24 16:34:10 +13:00
Andrew O'Neil
6db08cbc36 MINOR: Fix tests on PHPUnit 3.4 2012-03-14 16:05:19 +13:00
Sean Harvey
3d62832fbb MINOR Removed session_start() call in installer, as it contradicts the requireFunction check for session_start as part of the installer 2012-03-12 10:25:39 +13:00
Sean Harvey
0c30bfc2dd MINOR Tweak text about display_errors 2012-03-12 10:17:57 +13:00
Robert Curry
d34dca675a MINOR: Fix typographical errors. 2012-03-09 17:00:25 +13:00
Robert Curry
ecb279c33e Issue #6667: Check for TEMP_FOLDER _ss_envrionment override in install script. 2012-03-09 15:06:01 +13:00
Ryan O'Hara
63d5927e50 BUGFIX: Added TemplateGlobalProvider include to installer, as required by i18n. 2012-03-09 10:45:24 +13:00
Ingo Schommer
6c24589a92 Merge pull request #208 from sminnee/fix-startsession 
BUGFIX: Fixed dev/tests/startsession form action
 2012-03-05 00:07:06 -08:00
Sam Minnee
f1579a2cdd MINOR: Corrected date in installer copyright (open.ss.org #6833) 2012-03-05 14:51:42 +13:00
Sam Minnee
a5e809be49 BUGFIX: Fixed dev/tests/startsession form action 2012-03-05 14:36:38 +13:00
Sam Minnee
adfdd068e2 Merge branch 'ereg-to-preg' of https://github.com/AngryPHPNerd/sapphire 
Conflicts:
	model/fieldtypes/Date.php
 2012-03-05 13:54:20 +13:00
Kirk Mayo
c211b7c435 Added some simple code to show the location of the loaded php.ini file when php configuration or file permision errors exist 2012-03-04 21:01:12 +13:00
AngryPHPNerd
0e2cbb0b88 Replace ereg with preg_* 2012-02-27 22:14:02 +01:00
Fred Condo
d370423825 Clean up trailing ?> per coding standard 
All sapphire but the lang directory
 2012-02-12 12:40:16 -08:00
Ingo Schommer
fcf103cd14 MINOR Check for display_errors=Off during installation (fixes #5779) 2012-02-11 01:19:29 +01:00
Ingo Schommer
24e2003e35 ENHANCEMENT Allow logging of extra data in SS_Log::log() (currently only displayed through SS_LogEmailWriter) 2012-02-06 23:38:37 +01:00
Ingo Schommer
d3be6edb4e ENHANCEMENT Allowing string arguments in SS_Log::log() 2012-02-06 23:38:35 +01:00
Ingo Schommer
5284f9019c MINOR Improved email log styling through inline style declaration (which now extends styles to tables), using smaller non-serif font for better readability 2012-02-06 23:38:34 +01:00
Ingo Schommer
c7b02d2063 MINOR Rewrite stack trace from "In line <line> of <file>" to a more readable and common "<file>:<line>" 2012-02-06 23:38:32 +01:00
Andrew O'Neil
15a641a99c BUGFIX Clear requirements after running a unit test 2012-02-03 13:07:12 +01:00
dompie
3c09e9dfc4 ENH: Some webhosters require username/password credentials to test for 
existing DB server
 2012-01-11 16:05:19 +01:00
James Miller
f1542edd1e Unicode actually fixed... 2012-01-10 16:15:03 +13:00
James Miller
3f59f13c6b Fixed odd unicode character issue 2012-01-10 16:11:25 +13:00
Aatch
80e2985f49 Wrap the Last Edited Date in single quotes, doesn't work otherwise. 2012-01-10 16:01:24 +13:00
James Miller
bf2ba121bd Allowed the fixture to overwrite the LastEdited field on an object 2012-01-10 13:24:31 +13:00
joaosantos81
889bcf74c0 Currently, the time format does not allow differentiate the AM/PM hours since the format choosen is 12h and no AM/PM label is added to each log line. So, my suggestion is to convert to 24h format (using a H instead of h) to fix this issue. 
More details, see PHP date function doc - http://php.net/manual/en/function.date.php
 2011-12-29 16:17:14 +00:00
Sam Minnee
0bdfc0c515 MINOR: On PHPUnit 3.6, show the output of tests. 2011-12-17 16:42:31 +13:00
Mark James
e102d9ddc9 BUGFIX: Corrected use of ENT_QUOTES/UTF8 on htmlentities in installer introduced by r3a7ac9759ab8f98eee0bb15db4618fd0ee146ab6. fixes #6806 2011-12-16 22:27:42 +00:00
Ingo Schommer
3a7ac9759a BUGFIX Consistently using multibyte-safe htmlentities() 2011-11-29 10:43:06 +01:00
Sam Minnee
f1480c20bf MINOR: Amended PHPUnit execution to work with PHPUnit 3.6 2011-11-08 11:26:40 +13:00
Hamish Friedlander
bc7217d1ea BUGFIX: Deprecation notices should fire in test mode too, just not in live mode 2011-10-31 13:51:31 +13:00
Stig Lindqvist
6cf03b9c2b MINOR Fixed whitespace and added docblocks 2011-10-28 02:11:55 +02:00
Stig Lindqvist
3c5fd14f38 BUGFIX Deprecation class throws notice on PHP 5.2 
Checks on constants must be within quotes.
 2011-10-28 02:09:28 +02:00
Sam Minnee
e5afa25522 MINOR: Use Deprecation class to indicate deprecated methods in core. 2011-10-29 17:34:31 +13:00
Sam Minnee
ad9bc59d10 ENHANCEMENT: Include the caller of the deprecated method in the notice that it throws. 2011-10-29 17:34:31 +13:00
Sam Minnee
4c93c3be19 ENHANCEMENT: Allow Deprecation::notice() to be called without passing release number. 2011-10-29 17:34:31 +13:00
Hamish Friedlander
436e0f0475 ENHANCEMENT: Make the installer work when CMS module isnt present 2011-10-29 17:23:22 +13:00
Hamish Friedlander
af667eb8ec ENHANCEMENT: Move install.php to sapphire and seperate the PHP version check from the rest of it so we dont have to worry about PHP4 so much. TODO: Allow it to be run directly without needing the stub install.php in the root from silverstripe-installer 2011-10-29 16:40:27 +13:00
Will Rossiter
b70bc85ed3 MINOR remove missing icon from debug view 2011-10-29 15:47:07 +13:00
Simon Welsh
840343ffb7 Checks for array to string conversion (E_NOTICE as of PHP5.4) 2011-10-29 10:49:17 +13:00
Stig Lindqvist
e38dd08ea5 MINOR: Fix docblocks to reference SS_List instead of (now deprecated) DataObjectSet where appropriate 2011-10-28 15:58:55 +13:00
Hamish Friedlander
0a3e0f15de MINOR: Replace references to FieldSet (now deprecated) with references to FieldList 2011-10-28 15:58:55 +13:00
Hamish Friedlander
e5ea2ea94d ENHANCEMENT: Add Deprecation class to handle throwing deprecation notices nicely on methods that are still in use in framework or cms 2011-10-28 15:58:54 +13:00
Stig Lindqvist
2101d3c09b MINOR Added codecoverage on a single test to the allowed actions 2011-09-27 11:00:28 +13:00
Will Rossiter
37d197c52f MINOR altered skipTest to be a instance property rather than static 2011-09-26 17:11:49 +13:00
Will Rossiter
1732a17114 Merged new-orm into datagrid 2011-09-26 16:47:54 +13:00
Will Rossiter
e740bf8a65 ENHANCEMENT: added SapphireTest:: boolean to flag tests that should be skipped from the TestRunner 2011-09-26 16:08:41 +13:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
Ingo Schommer
d4e42c2b11 MINOR Declaring SS_SysLogWriter::factory() to comply with changed parent interface 2011-08-12 17:05:54 +02:00
Ingo Schommer
8249834cf6 MINOR Adding 'runTask' to allowed_actions in TaskRunner 2011-08-12 17:05:54 +02:00
Ingo Schommer
f11751c42d MINOR Fixed SS_LogEmailWriter and SS_LogFileWriter to adhere to new Zend interface 2011-05-30 21:30:32 +12:00
Ingo Schommer
0adac9d40b ENHANCEMENT Allowing filtered arguments on specific functions like mysql_connect() in SS_Backtrace 2011-05-26 22:04:01 +12:00
ajshort
3f132a105b API CHANGE: Replaced DataObjectSet instances with ArrayList. 2011-05-05 20:40:24 +10:00
Sam Minnee
7fbb919ce8 API CHANGE: Introduce DataModel object, as a representation of the project's entire data model, and tie it to $this->model an all DataObjects, Controllers, and RequestHandlers for easy non-static access. 
API CHANGE: Add DataList::newObject(), which creates a new object on that DataList.
API CHANGE: RequestHandler::handleRequest() now needs to handle a $model argument, if you override it.
 2011-05-01 17:33:02 +12:00
ajshort
ff3d3816ca MINOR: Updated SapphireTest::dataObjectArrayMatch() to use array_key_exists() rather than isset(). This allows tempting for NULL values in DOS assertion methods. 2011-05-01 15:26:29 +12:00
Sam Minnee
de1494e3a8 ENHANCEMENT: Implemented DataList as the successor of DataObjectSet. DataList doesn't execute the query until it's actually needed, allowing for a more flexible ORM. 
API CHANGE: augmentSQL is now passed a DataQuery object from which query parameters can be extracted.
API CHANGE: DataObjectDecorators that manipulate the query can now define augmentDataQueryCreation().
API CHANGE: The container class argument for DataObject::get() is deprecated.
API CHANGE: DataObject::buildSQL() and DataObject::extendedSQL() are deprecated; just use DataObject::get() now.
API CHANGE: DataObject::instance_get() and DataObject::instance_get_one() are deprecated, and can no longer be overloaded.
API CHANGE: DataObject::buildDataObjectSet() is deprecated.
API CHANGE: Cant't call manual manipulation methods on DataList such as insertFirst()
 2011-05-01 15:25:45 +12:00
ajshort
3a1c2df4e7 API CHANGE: Renamed DataObjectDecorator to DataExtension. 
API CHANGE: Renamed LeftAndMainDecorator to LeftAndMainExtension.
MINOR: Replaced all references to decorators with extension.
 2011-04-26 11:01:38 +10:00
Ingo Schommer
9b29616710 API CHANGE Rearranged files in sapphire to reflect core dependencies more accurately, and have the tests/ folder mirror its folder structure 2011-03-31 09:56:21 +13:00
Ingo Schommer
2870eb9212 MINOR Changed $fixture_path to relative filenames in all sapphire test cases in order to allow easier file moving and less verbosity in tests 2011-03-30 23:04:48 +13:00
Ingo Schommer
14e1341df6 ENHANCEMENT Added support for SapphireTest::$fixture_file paths relative to current class location ('MyTest.yml' or '../otherfolder/MyTest.yml'). Added SapphireTest->getCurrentAbsolutePath() and getCurrentRelativePath() for easy access within unit tests 2011-03-30 20:05:22 +13:00
Ingo Schommer
b1f27b40ce MINOR Updated image references in sapphire/ folder to local files, rather than requiring cms/ folder (copied a bunch of images files over for this) 2011-03-29 21:34:26 +13:00
Ingo Schommer
5f59b3a3c9 MINOR Fixed paths due to file moving into sapphire/admin 2011-03-29 18:08:32 +13:00
Ingo Schommer
1225426e75 MINOR Fixed @package declarations 2011-03-29 18:07:58 +13:00
Ingo Schommer
6d18e38278 MINOR Checking for optional classes in 'cms' module in SapphireTest 2011-03-29 18:07:57 +13:00
Ingo Schommer
d61444e976 API CHANGE Moved Translatable class into new 'translatable' module 2011-03-29 18:07:56 +13:00
Paul Meyrick
dc36725869 MINOR Using BlankPage template in SecurityTest, BasicAuthTest to remove ContentController dependency 
MINOR Checking for SiteTree class existence in Security, Translatable
MINOR Checking for ContentController existence in FulltextSearchable
MINOR Removed unnecessary ContentController tests from ObjectTest
MINOR Replaced CMS specific examples in PermissionCheckboxSetFieldTest, DataObjectTest
MINOR Changed SecurityTest to make assertions against Security/login rather than relying on redirection from admin/cms
 2011-03-29 18:07:55 +13:00
ajshort
c34105438c FEATURE: Replaced the template manifest with SS_TemplateLoader, which finds templates from a stack of SS_TemplateManifest objects. 2011-03-24 21:30:57 +11:00
ajshort
bc0a1b7a05 MINOR: Updated various methods to use new manifest methods rather than ManifestBuilder functions or globals. 2011-03-24 20:14:43 +11:00
ajshort
0c78935db4 API CHANGE: Replaced ManifestBuilder::load_test_manifest() calls with new function TestRunner::use_test_manifest(), which pushes a test manifest onto the class loader. 2011-03-24 20:14:43 +11:00
Ingo Schommer
da909a0214 BUGFIX Fixed usage of htmlentities() and html_entity_decode() to be UTF8 compatible by default 2011-03-21 18:13:01 +13:00
Ingo Schommer
002e40bd79 MINOR Added deprecated SapphireTest->assertType() in order to support PHPUnit 3.5 or newer, but stay backwards compatible to PHPUnit 3.4 2011-03-11 15:12:17 +13:00
Ingo Schommer
9d10e88ea5 Revert "API CHANGE Removing support for PHPUnit 3.4 (3.5.0 has been released in Sept 2010). Removing PhpUnitWrapper_3_4, and adding better version detection." - too many complications with our build environments running mixed versions of SilverStripe 
This reverts commit 23e342ce03.
 2011-03-11 14:45:49 +13:00
Sam Minnee
d045970d83 Merge remote branch 'origin/master' 2011-02-22 10:57:59 +13:00
Sam Minnee
27246ce982 MINOR: Fixed 2.4 mergeback 2011-02-22 10:53:58 +13:00
Ingo Schommer
23e342ce03 API CHANGE Removing support for PHPUnit 3.4 (3.5.0 has been released in Sept 2010). Removing PhpUnitWrapper_3_4, and adding better version detection. 2011-02-21 18:49:09 +13:00
Sam Minnee
1e0c4ae8d1 Merge branch '2.4' 
Conflicts:
	cache/Cache.php
	cli/CliController.php
	core/Convert.php
	core/Core.php
	core/ManifestBuilder.php
	core/Object.php
	core/SSViewer.php
	core/control/ContentController.php
	core/control/ContentNegotiator.php
	core/control/FormResponse.php
	core/control/RequestHandler.php
	core/control/SilverStripeNavigatorItem.php
	core/i18n.php
	core/i18nTextCollector.php
	core/model/DataObjectSet.php
	core/model/Hierarchy.php
	core/model/Image.php
	core/model/MySQLDatabase.php
	core/model/SiteConfig.php
	core/model/SiteTree.php
	core/model/Translatable.php
	core/model/VirtualPage.php
	dev/Debug.php
	dev/SapphireTest.php
	dev/TestRunner.php
	dev/YamlFixture.php
	dev/install/MySQLDatabaseConfigurationHelper.php
	docs/en/installation/from-source.md
	docs/en/topics/themes.md
	docs/en/tutorials/4-site-search.md
	email/Mailer.php
	filesystem/File.php
	filesystem/Folder.php
	forms/ComplexTableField.php
	forms/CurrencyField.php
	forms/DateField.php
	forms/FieldSet.php
	forms/FileField.php
	forms/FileIFrameField.php
	forms/HtmlEditorConfig.php
	forms/HtmlEditorField.php
	forms/SelectionGroup.php
	forms/SimpleImageField.php
	forms/TabSet.php
	forms/TableField.php
	forms/TableListField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	integration/Geoip.php
	javascript/SelectionGroup.js
	javascript/TreeSelectorField.js
	javascript/UpdateURL.js
	javascript/core/jquery.ondemand.js
	javascript/tiny_mce_improvements.js
	javascript/tree/tree.js
	lang/en_US.php
	search/ContentControllerSearchExtension.php
	security/Group.php
	security/Member.php
	security/PermissionCheckboxSetField.php
	security/PermissionRole.php
	security/Security.php
	static-main.php
	templates/RelationComplexTableField.ss
	templates/TableListField.ss
	tests/ConvertTest.php
	tests/DataObjectSetTest.php
	tests/DataObjectTest.php
	tests/DataObjectTest.yml
	tests/RequestHandlingTest.php
	tests/SSViewerTest.php
	tests/SiteTreePermissionsTest.php
	tests/SiteTreeTest.php
	tests/TransactionTest.php
	tests/api/RestfulServiceTest.php
	tests/control/DirectorTest.php
	tests/control/ModelAsControllerTest.php
	tests/fieldtypes/WidgetAreaEditorTest.php
	tests/forms/CurrencyFieldTest.php
	tests/forms/FormTest.php
	tests/model/DatabaseTest.php
	tests/model/ImageTest.php
	tests/search/ContentControllerSearchExtensionTest.php
	tests/security/MemberAuthenticatorTest.php
	thirdparty/.gitignore
	thirdparty/behaviour/behaviour.js
	thirdparty/firebug-lite/firebug.js
	thirdparty/firebug-lite/firebugx.js
	thirdparty/jquery-form/jquery.form.js
	thirdparty/jquery-livequery/jquery.livequery.js
	thirdparty/jquery-livequery/test/jquery.js
	thirdparty/jquery-livequery/test/test.html
	thirdparty/jquery-livequery/test/test2.html
	thirdparty/jquery-metadata/META.json
	thirdparty/jquery-metadata/README
	thirdparty/jquery-metadata/jquery.metadata.js
	thirdparty/jquery-metadata/test/index.html
	thirdparty/jquery-metadata/test/jquery.js
	thirdparty/jquery-metadata/test/test.js
	thirdparty/jquery-metadata/test/testrunner.js
	thirdparty/jquery-metadata/test/testsuite.css
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_2e83ff_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_454545_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_888888_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_cd0a0a_256x240.png
	thirdparty/jquery-ui/i18n/jquery-ui-i18n.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ar.js
	thirdparty/jquery-ui/i18n/ui.datepicker-bg.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ca.js
	thirdparty/jquery-ui/i18n/ui.datepicker-cs.js
	thirdparty/jquery-ui/i18n/ui.datepicker-da.js
	thirdparty/jquery-ui/i18n/ui.datepicker-de.js
	thirdparty/jquery-ui/i18n/ui.datepicker-el.js
	thirdparty/jquery-ui/i18n/ui.datepicker-eo.js
	thirdparty/jquery-ui/i18n/ui.datepicker-es.js
	thirdparty/jquery-ui/i18n/ui.datepicker-fa.js
	thirdparty/jquery-ui/i18n/ui.datepicker-fi.js
	thirdparty/jquery-ui/i18n/ui.datepicker-fr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-he.js
	thirdparty/jquery-ui/i18n/ui.datepicker-hr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-hu.js
	thirdparty/jquery-ui/i18n/ui.datepicker-hy.js
	thirdparty/jquery-ui/i18n/ui.datepicker-id.js
	thirdparty/jquery-ui/i18n/ui.datepicker-is.js
	thirdparty/jquery-ui/i18n/ui.datepicker-it.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ja.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ko.js
	thirdparty/jquery-ui/i18n/ui.datepicker-lt.js
	thirdparty/jquery-ui/i18n/ui.datepicker-lv.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ms.js
	thirdparty/jquery-ui/i18n/ui.datepicker-nl.js
	thirdparty/jquery-ui/i18n/ui.datepicker-no.js
	thirdparty/jquery-ui/i18n/ui.datepicker-pl.js
	thirdparty/jquery-ui/i18n/ui.datepicker-pt-BR.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ro.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ru.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sk.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sl.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sq.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sr-SR.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sv.js
	thirdparty/jquery-ui/i18n/ui.datepicker-th.js
	thirdparty/jquery-ui/i18n/ui.datepicker-tr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-uk.js
	thirdparty/jquery-ui/i18n/ui.datepicker-zh-CN.js
	thirdparty/jquery-ui/i18n/ui.datepicker-zh-TW.js
	thirdparty/jquery/jquery.js
	thirdparty/jsmin/.piston.yml
	thirdparty/jsmin/jsmin.php
	thirdparty/prototype/prototype.js
	thirdparty/scriptaculous/dragdrop.js
	thirdparty/simplepie/.piston.yml
	thirdparty/spyc/.piston.yml
	thirdparty/spyc/README
	thirdparty/spyc/php4/spyc.php4
	thirdparty/spyc/php4/test.php4
	thirdparty/spyc/spyc.php
	thirdparty/spyc/spyc.yaml
	thirdparty/tinymce-advcode/dialog.html
	thirdparty/tinymce-advcode/editor_plugin_src.js
	thirdparty/tinymce-advcode/js/dialog.js
	thirdparty/tinymce/langs/en.js
	thirdparty/tinymce/plugins/advhr/langs/en_dlg.js
	thirdparty/tinymce/plugins/advhr/rule.htm
	thirdparty/tinymce/plugins/advimage/image.htm
	thirdparty/tinymce/plugins/advimage/langs/en_dlg.js
	thirdparty/tinymce/plugins/advlink/langs/en_dlg.js
	thirdparty/tinymce/plugins/advlink/link.htm
	thirdparty/tinymce/plugins/emotions/emotions.htm
	thirdparty/tinymce/plugins/emotions/langs/en_dlg.js
	thirdparty/tinymce/plugins/example/dialog.htm
	thirdparty/tinymce/plugins/fullpage/fullpage.htm
	thirdparty/tinymce/plugins/fullpage/langs/en_dlg.js
	thirdparty/tinymce/plugins/fullscreen/fullscreen.htm
	thirdparty/tinymce/plugins/inlinepopups/template.htm
	thirdparty/tinymce/plugins/media/langs/en_dlg.js
	thirdparty/tinymce/plugins/media/media.htm
	thirdparty/tinymce/plugins/paste/js/pasteword.js
	thirdparty/tinymce/plugins/paste/langs/en_dlg.js
	thirdparty/tinymce/plugins/paste/pastetext.htm
	thirdparty/tinymce/plugins/paste/pasteword.htm
	thirdparty/tinymce/plugins/searchreplace/langs/en_dlg.js
	thirdparty/tinymce/plugins/searchreplace/searchreplace.htm
	thirdparty/tinymce/plugins/spellchecker/editor_plugin.js
	thirdparty/tinymce/plugins/spellchecker/editor_plugin_src.js
	thirdparty/tinymce/plugins/style/langs/en_dlg.js
	thirdparty/tinymce/plugins/style/props.htm
	thirdparty/tinymce/plugins/table/cell.htm
	thirdparty/tinymce/plugins/table/langs/en_dlg.js
	thirdparty/tinymce/plugins/table/merge_cells.htm
	thirdparty/tinymce/plugins/table/row.htm
	thirdparty/tinymce/plugins/table/table.htm
	thirdparty/tinymce/plugins/template/langs/en_dlg.js
	thirdparty/tinymce/plugins/template/template.htm
	thirdparty/tinymce/plugins/xhtmlxtras/abbr.htm
	thirdparty/tinymce/plugins/xhtmlxtras/acronym.htm
	thirdparty/tinymce/plugins/xhtmlxtras/attributes.htm
	thirdparty/tinymce/plugins/xhtmlxtras/cite.htm
	thirdparty/tinymce/plugins/xhtmlxtras/del.htm
	thirdparty/tinymce/plugins/xhtmlxtras/ins.htm
	thirdparty/tinymce/plugins/xhtmlxtras/langs/en_dlg.js
	thirdparty/tinymce/themes/advanced/about.htm
	thirdparty/tinymce/themes/advanced/anchor.htm
	thirdparty/tinymce/themes/advanced/charmap.htm
	thirdparty/tinymce/themes/advanced/color_picker.htm
	thirdparty/tinymce/themes/advanced/image.htm
	thirdparty/tinymce/themes/advanced/langs/en.js
	thirdparty/tinymce/themes/advanced/langs/en_dlg.js
	thirdparty/tinymce/themes/advanced/link.htm
	thirdparty/tinymce/themes/advanced/source_editor.htm
	thirdparty/tinymce/themes/simple/langs/en.js
	thirdparty/tinymce/tiny_mce.js
	thirdparty/tinymce/tiny_mce_src.js
	widgets/Widget.php
 2011-02-14 18:47:53 +13:00
Carlos Barberis
184e8bd852 ENHANCEMENT: Added allowed actions to core classes 2011-02-14 11:14:51 +13:00
Sean Harvey
c00e5a384b MINOR Ensure php5-required.html template shows correct minimum and recommended PHP versions (thanks mattcleg!) (from r114915) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@114916 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:20:06 +13:00
Ingo Schommer
f79c6aeb83 BUGFIX Don't allow HTML formatting in RequestHandler->httpError() by sending "Content-Type: text/plain" response headers. (from r114444) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@114445 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:20:03 +13:00
Ingo Schommer
30e3f08efb MINOR Checking for class_exists() before SapphireTest::is_running_tests() to avoid including the whole testing framework, and triggering PHPUnit to run a performance-intensive directory traversal for coverage file blacklists (from r114332) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@114334 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:20:03 +13:00
Sean Harvey
9367dc40a1 MINOR Fixed PHP strict standard where non-variables cannot be passed by reference 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@113968 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:20:01 +13:00
Sean Harvey
cfcf7a5358 MINOR Fixed output spelling mistake and formatting in SapphireTest::delete_all_temp_dbs() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@113450 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:59 +13:00
Ingo Schommer
e4d3584805 ENHANCEMENT Added SecurityToken to wrap CSRF protection via "SecurityID" request parameter 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@113272 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:58 +13:00
Ingo Schommer
5168cf92a8 BUGFIX ModelViewer doesn't work due to minor bug introduced by making $_CLASS_MANIFEST keys lowercase (fixes #6144, thanks daniel.lindkvist) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@113249 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:58 +13:00
Ingo Schommer
4e8b6b9fd7 BUGFIX Add PHPUnit includes to SapphireTest? class (can be loaded outside of TestRunner? for static calls, in which case the PHPUnit autoloaders/includes aren't in place yet) (merged from r113156) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@113157 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:58 +13:00
Sam Minnee
0abb1b12b1 MINOR: Fix to SapphireInfo for git-svn checkouts. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@112962 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:58 +13:00
Sean Harvey
593fa99ce4 MINOR Removed "In line of " text in CLI test reporter which did not work. Details are in the backtrace below anyway, so it's not required 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@112321 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:57 +13:00
Sean Harvey
6dd19f40de ENHANCEMENT Show "Database Configuration" section of installer requirements for reference (collapsed by default) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111873 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:55 +13:00
Sean Harvey
8fb332ac36 MINOR #5943 Debug::text() boolean values are amended with (bool) so they don't get confused with "true" or "false" which could be strings (thanks Pigeon!) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111676 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:54 +13:00
Ingo Schommer
95eedee6d6 BUGFIX Force tidy to avoid wrapping long lines in CSSContentParser, it breaks our FunctionalTest string assertions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111176 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:53 +13:00
Sean Harvey
2002073fcc BUGFIX Fixed regression where coverage report request did not get passed through to runTests() in TestRunner::all() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111092 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:52 +13:00
Sean Harvey
3c51c0cd71 BUGFIX Fixed regression of dev/tests/all running a coverage report instead of just unit tests 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111091 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:52 +13:00