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
11,605 Commits 31 Branches 527 Tags 162 MiB
5c3809a165
Commit Graph

870 Commits

Author SHA1 Message Date
Ingo Schommer
0da70dafa4 Enforce 'dev' environment for test runs 
Otherwise tests like ControllerTest will fail because Deprecation notices
 2013-06-19 00:13:02 +02:00
Ingo Schommer
4ebd5ab740 Merge pull request #2057 from jthomerson/enhancement_3.1_do_not_run_abstract_test_cases 
ENHANCEMENT: Do not attempt to run abstract test classes
 2013-06-07 07:54:05 -07:00
Ingo Schommer
7791f20f49 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
 2013-06-05 15:17:06 +02:00
Ingo Schommer
f8b1c08c67 Behat: Copy fixture identifier to "Name" or "Title" by default 
This makes fixture setup less verbose, particularly for behat
tests (e.g. with "Given a page 'About Us'")
 2013-06-05 14:32:42 +02:00
Jeremy Thomerson
12cade8126 ENHANCEMENT: Do not attempt to run abstract test classes 
There is no reason to try to run test cases of a class that is abstract.  By
skipping them we allow developers to create abstract test case classes that
have test functions in them.  This is especially helpful when someone is
testing multiple implementations of the same service interface.  Most of their
tests can be in the abstract class, and then they can create concrete test
classes for each of their implementations and inherit all of the testing that
is built into the abstract class.
 2013-06-03 20:25:08 +00:00
Ingo Schommer
d5510f54b3 Merge pull request #2041 from Mark-M/patch-1 
FIX Deprecation $manifest not in global scope
 2013-06-03 00:30:26 -07:00
Ingo Schommer
5d97f615ce Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-31 17:52:24 +02:00
Mark-M
1a19e27bd0 FIX Deprecation $manifest not in global scope 
$manifest is not in the global scope, patched it to use SS_ClassLoader to get the manifest instead.
 2013-05-31 15:32:10 +02:00
Damian Mooyman
0ee79d43db BUG Fixed major issue with testing dataobjects that implement TestOnly and extend non-TestOnly dataobjects. Database regeneration would incorrectly populate the ClassName column 2013-05-27 16:39:57 +12:00
Simon Welsh
e90012787d Merge branch 'hackfest_may_2013' of https://github.com/NightJar/sapphire into 3.1 
Conflicts:
	docs/en/changelogs/3.1.0.md
 2013-05-25 20:07:54 +12:00
Nightjar
5ec8158977 Check that Webserver is not Apache/1.x in light of installer assets/.htaccess alterations 2013-05-25 20:03:36 +12:00
Sam Minnée
f6fbd78cd9 Merge pull request #1786 from colymba/3.0-htaccess-fix 
vendor folder is blocked only if outside themes
 2013-05-24 23:50:41 -07:00
Stephen Shkardoon
ab224a0e1c Fix return the member ID for logInWithPermission 
Will now return the ID, as per the doc-block comment
 2013-05-25 17:16:10 +12:00
Stephen Shkardoon
aa3699ff0a Deprecate magic_quotes and fix bad install opts 
Change the in_array call to not do bad things with strict casting off
Add a deprecated message if you run with magic_quotes on
Change the requirement for magic_quotes to an error
 2013-05-25 12:42:52 +12:00
Daniel Hensby
ac989cc3c0 Regression due to previous patch 
Fixing installer regression due to patch #1972
 2013-05-24 15:29:39 +01:00
Daniel Hensby
bc9567c9ef FIX Environment file finder logic 
Fixing the logic that searches for environment files so that warnings
due to open_basedir are suppressed and both the 'realdir' and the server
path are spidered for the environment file.
 2013-05-22 14:35:33 +01:00
Daniel Hensby
9a6a6ec75d Arbitrary placement of _ss_environment.php in parent folders 
Removes hardcoding to three levels
 2013-05-14 13:39:43 +02:00
Ingo Schommer
7bf790a5fa Merge pull request #1875 from wilr/open6473 
FIX: If CSV column mapping maps to function, keep key values
 2013-05-14 04:02:01 -07:00
Will Rossiter
7ea96504c6 Code formatting / PHPDoc cleanup 2013-05-14 22:06:02 +12:00
Will Rossiter
c8af0fd7d1 FIX: If CSV column mapping maps to function, keep key value as key. 
Fixes http://open.silverstripe.org/ticket/6473

When using CSVParser::$columnMapping to map columns to a callback action, it previously used the action name as the key value. This prevented users from defining multiple entries to the same callback. This patch retains those key values and simply runs the callback field name filter later on.
 2013-05-14 22:00:52 +12:00
jean
3de75f396e FIX Avoid unnecessary user_error when no controller set for friendly errors in Debug class 2013-05-14 16:58:57 +12:00
Ingo Schommer
8c9dd02d73 Merge pull request #1876 from wilr/open6449 
Suggest users install curl, tidy on their machines.
 2013-05-12 14:21:50 -07:00
Zauberfisch
6f11f92f5b Reverted 9a52dae207 & ed19bbc3ba 2013-05-11 18:50:02 +00:00
Will Rossiter
e56abaca4f Suggest users install curl, tidy on their machines. 2013-05-11 18:31:02 +12:00
Jeremy Shipman
d47b202697 Restored c4eac5310e (merge error) 
FIX: Instead of CsvBulkLoader->findExistingRecord out right failing (i.e. no duplicate found) when the duplicate check field is empty, it will now continue on to check other duplicateCheck fields.
Added extra testing data to CSVBulkLoaderTest so that it fails.
 2013-05-09 23:06:02 +02:00
Ingo Schommer
3b02d22989 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	dev/CsvBulkLoader.php
 2013-05-09 10:34:20 +02:00
Ingo Schommer
ced199b877 Direct writing of "Security.token" through dev/generatesecuretoken 2013-05-09 10:31:49 +02:00
Ingo Schommer
5d9cbae949 Merge pull request #1819 from oddnoc/csvbulkloader-findexisting-3.1 
Use the correct variable as the key into $record
 2013-05-08 04:23:05 -07:00
Will Rossiter
22e8ba6ff6 FIX: Check for POST support in installer 
Also two minor fixes for Web server configuration
	* Prevent notice on unsupported setups.
	* Show successful message.

Conflicts:
	dev/install/install.php5
 2013-05-08 22:51:27 +12:00
Fred Condo
bd5c8520bb FIX: Use the correct variable as the key into $record 
It was using $fieldName, which is the CSV field name, not the database
field name. This prevents duplicate detection from working. It now
properly uses $SQL_fieldName.

Update CsvBulkLoaderTest to remove keys that are nonexistent in the CSV
test data. Having them causes the test to fail with an undefined-index
error. This did not previously fail because of the bug in CsvBulkLoader
that this patch fixes. This partially reverts c4eac53.
 2013-05-01 06:50:40 -07:00
Fred Condo
68cf2f5db7 Use the correct variable as the key into $record 
It was using $fieldName, which is the CSV field name, not the database
field name. This prevents duplicate detection from working. It now
properly uses $SQL_fieldName
 2013-04-29 17:25:16 -07:00
colymba
41c0f8080e FIX Only block root vendor folder 
Use RewriteRule instead to take in account any subfolder via RewriteBase. Deny ss-cache and composer via RewriteRule too.
 2013-04-27 16:03:35 +03:00
Jeremy Shipman
c4eac5310e FIX: Instead of CsvBulkLoader->findExistingRecord out right failing (i.e. no duplicate found) when the duplicate check field is empty, it will now continue on to check other duplicateCheck fields. 
Added extra testing data to CSVBulkLoaderTest so that it fails.
 2013-04-19 16:52:39 +12:00
Ingo Schommer
9856fcef21 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	javascript/DateField.js
	model/DataQuery.php
	model/Versioned.php
	tests/forms/RequirementsTest.php
	tests/model/DataObjectLazyLoadingTest.php
	view/Requirements.php
 2013-04-09 14:45:35 +02:00
Ingo Schommer
9a52dae207 Removed LOLCAT locale from installer (fixes #1457) 2013-04-04 11:18:40 +02:00
Sean Harvey
a99c829ed1 Ensure composer files aren't accessible using IIS 2013-04-03 15:59:14 +13:00
Ingo Schommer
3334eafcb1 API Marked statics private, use Config API instead (#8317) 
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
 2013-03-24 17:20:53 +01:00
Ingo Schommer
f55bd9d3af Allow for short versions in Deprecation::notification_version() 2013-03-24 17:20:36 +01:00
Simon Welsh
7ce010928d Merge pull request #1327 from ss23/patch-2 
BUG Database config values aren't escaped
 2013-03-23 12:16:13 -07:00
Stephen Shkardoon
9b9f367e93 BUG Database config values aren't escaped 
Causes minor UI issues if you try use database configuration values that happen to have " or other values in them.
 2013-03-24 01:05:33 +13:00
Stephen Shkardoon
f27410c257 Missing closing <a> tag in installer 2013-03-24 00:06:54 +13:00
Ingo Schommer
f7400198d7 Merge pull request #1315 from dhensby/patch-4 
FIX Adding preview method to CsvBulkLoader
 2013-03-20 07:24:52 -07:00
Ingo Schommer
53c84ee1fe Merge remote-tracking branch 'origin/3.0' into 3.1 2013-03-19 14:04:29 +01:00
Ingo Schommer
99ca0471f7 Merge remote-tracking branch 'origin/2.4' into 3.0 
Conflicts:
	control/RequestHandler.php
	core/control/ContentController.php
	dev/CsvBulkLoader.php
	docs/en/changelogs/index.md
	docs/en/reference/execution-pipeline.md
	docs/en/topics/commandline.md
	docs/en/topics/controller.md
	docs/en/topics/form-validation.md
	docs/en/topics/forms.md
	docs/en/topics/security.md
	model/MySQLDatabase.php
	security/Security.php
	tests/control/ControllerTest.php
	tests/control/RequestHandlingTest.php
 2013-03-19 13:56:04 +01:00
Stephen Shkardoon
143317cc86 BUG SQL Injection in CsvBulkLoader (fixes #6227) 
Diff should speak for itself, looks like this will have to be implemented in all supported branches.
 2013-03-20 00:45:05 +13:00
Daniel Hensby
0d57f7b19a FIX processAll method respects $preview flag 
The preview flag is now respected more thoroughly to stop writing of related objects
 2013-03-19 11:23:58 +00:00
Daniel Hensby
3020576f08 FIX Adding preview method to CsvBulkLoader 
Currently the CsvBulkLoader doesn't implement the preview method even though it's processor function has the $preview flag.
 2013-03-19 11:05:10 +00:00
Hamish Friedlander
743a186c32 API Make SSViewer#process return HTMLText not string 
This means that you dont have to worry about casting it
as HTMLText again when using the result in a template or other context

However in some situations code might be assuming it can
check with is_string, in which case you now need to use instanceof HTMLText
 2013-03-14 12:49:03 +13:00
Hamish Friedlander
6b986cb17d Extract statics via code analysis rather than introspection 2013-02-28 09:43:33 +13:00
Ingo Schommer
bea1b9002d Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	control/HTTP.php
 2013-02-26 13:28:35 +01:00