Damian Mooyman
|
0b1f297873
|
Merge remote-tracking branch 'origin/3.1'
Conflicts:
.travis.yml
README.md
admin/code/LeftAndMain.php
admin/css/screen.css
admin/scss/screen.scss
api/RestfulService.php
conf/ConfigureFromEnv.php
control/injector/ServiceConfigurationLocator.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
core/Object.php
css/AssetUploadField.css
css/ComplexTableField_popup.css
dev/CSSContentParser.php
dev/DevelopmentAdmin.php
docs/en/changelogs/index.md
docs/en/misc/contributing/code.md
docs/en/reference/execution-pipeline.md
filesystem/GD.php
filesystem/ImagickBackend.php
filesystem/Upload.php
forms/Form.php
forms/FormField.php
forms/HtmlEditorConfig.php
forms/gridfield/GridFieldDetailForm.php
forms/gridfield/GridFieldSortableHeader.php
lang/en.yml
model/Aggregate.php
model/DataList.php
model/DataObject.php
model/DataQuery.php
model/Image.php
model/MySQLDatabase.php
model/SQLQuery.php
model/fieldtypes/HTMLText.php
model/fieldtypes/Text.php
scss/AssetUploadField.scss
search/filters/SearchFilter.php
security/Authenticator.php
security/LoginForm.php
security/Member.php
security/MemberAuthenticator.php
security/MemberLoginForm.php
security/Security.php
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
tests/control/HTTPTest.php
tests/control/RequestHandlingTest.php
tests/filesystem/UploadTest.php
tests/forms/FormTest.php
tests/forms/NumericFieldTest.php
tests/model/DataListTest.php
tests/model/DataObjectTest.php
tests/model/TextTest.php
tests/security/MemberAuthenticatorTest.php
tests/security/SecurityDefaultAdminTest.php
tests/view/SSViewerCacheBlockTest.php
tests/view/SSViewerTest.php
|
2014-11-18 12:45:54 +13:00 |
|
AntonyThorpe
|
2d0fe7a4aa
|
Update PhpUnitWrapper.php & TestRunner.php to recommend PHPUnit installation via Composer rather than PEAR
Using the PEAR Installer to install PHPUnit is no longer supported. See https://github.com/sebastianbergmann/phpunit/wiki/End-of-Life-for-PEAR-Installation-Method.
Replace PEAR in a comment and die output message with Composer.
Signed-off-by: AntonyThorpe <antony.thorpe@budget12.com>
|
2014-09-08 17:46:09 +12:00 |
|
Damian Mooyman
|
eb069e605d
|
Remove all redundant whitespace
|
2014-08-19 09:17:15 +12:00 |
|
Will Morgan
|
bec8927a08
|
BUG Allow PHPUnit installation with composer / Fix travis
|
2014-05-02 18:22:04 +12:00 |
|
Simon Welsh
|
b0121b541c
|
Add codesniffer that ensures indentation is with tabs.
|
2012-12-12 17:33:31 +13:00 |
|
Ingo Schommer
|
e2f073f38a
|
Method visibility according to coding conventions
|
2012-09-20 10:46:59 +02: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 |
|
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 |
|
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
|
cb283acb9b
|
MINOR: added phpdoc to the new PHPUnitWrapper classes. (from r111042)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112880 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-19 03:35:14 +00:00 |
|
Sam Minnee
|
eeb9e36e7a
|
ENHANCEMENT: Created a phpunit wrapper class to ensure that Sapphire's test framework is capable of running unit tests, coverage report and retrieve clover-statistics for PHPUnit 3.4 and PHPUnit 3.5 (from r111039)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112871 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-19 03:06:55 +00:00 |
|