Commit Graph

16831 Commits

Author SHA1 Message Date
Joe Chenevey
02e31932f8
Update Object.php
Check to ensure `self::$extra_methods[$this->class][$method]` exists before trying to retrieve it. Prevents a bunch of notices from being generated.
2019-01-08 15:02:22 -05:00
Robbie Averill
214c6ddb8e Merge branch '3.6' into 3.7 2018-11-15 14:15:08 +02:00
Robbie Averill
b9c29e7e8f
Merge pull request #8611 from kinglozzer/redirect-loop-3
FIX: Redirect loop with multiple URL tokens (fixes #8607)
2018-11-15 14:13:36 +02:00
Loz Calver
86701b8cd0 FIX: Redirect loop with multiple URL tokens (fixes #8607) 2018-11-15 11:15:41 +00:00
Aaron Carlino
bd0141eb72 Added 3.7.2 changelog 2018-11-07 23:22:05 +13:00
Aaron Carlino
a7d511e739 Merge branch '3.6' into 3.7 2018-11-07 11:36:17 +13:00
Loz Calver
598edd9134 [SS-2018-019] Add confirmation token to dev/build 2018-11-07 11:35:31 +13:00
Robbie Averill
144194600c [SS-2018-018] Ignore arguments in mysqli::real_connect backtrace calls 2018-10-17 14:36:08 +02:00
Loz Calver
8061e72bb4
Merge pull request #8435 from sminnee/faster-cleartable-ss3
FIX: Use DELETE FROM instead of TRUNCATE for clearTable
2018-10-11 12:32:33 +02:00
Robbie Averill
726fc3b06b
Merge pull request #8403 from sminnee/php73-test
NEW: Add test for PHP 7.3 support
2018-10-03 13:20:45 +02:00
Sam Minnee
ae9ab22a8f FIX: Use DELETE FROM instead of TRUNCATE for clearTable
clearTable is mainly used for clearing data between tests. In this case,
there are very few or zero records, and DELETE FROM is quicker than
TRUNCATE, which works by deleting and recreating the table.

This materially speeds up test execution, at least on MySQL.
2018-10-03 13:19:31 +13:00
Sam Minnee
c5201dc01a FIX: Allow DataObjectTest to be run by itself 2018-10-03 13:19:29 +13:00
Sam Minnee
518b6514cd NEW: Add test for PHP 7.3 support
Also added a SQLite 7.1 test as it’s very fast now, reordered the
tests with some commentary, and pushed the PGSQL test to 5.4 as they
are both “edge-cases”

Note that MySQL test speed is very problematic and has been addressed
in https://github.com/silverstripe/silverstripe-framework/pull/8435
2018-10-02 18:51:57 +13:00
Sam Minnee
d6117630bd FIX: Stricter regex syntax for PHP7.3 support. 2018-10-02 18:48:12 +13:00
Ingo Schommer
46d8aad91a
Merge pull request #8318 from dhensby/pulls/3.7/fix-http-caching
3.7 HTTP Caching fixes
2018-09-05 09:38:04 +12:00
Daniel Hensby
362c2f3b64
Make sure that CMS requests disable caching 2018-08-13 14:39:55 +01:00
Loz Calver
fac6e6a929
Merge pull request #8317 from silverstripe/pulls/3.7/application-json-plz
FIX txt/json is not a valid content type
2018-08-13 14:34:45 +01:00
Daniel Hensby
5f48b3e5d2
FIX txt/json is not a valid content type 2018-08-13 12:16:42 +01:00
Ingo Schommer
a6cab8850d
Merge pull request #8270 from sminnee/fix-afterCallActionHandler
FIX: Correct afterCallActionHandler arguments to match SS4.
2018-07-18 23:13:24 +12:00
Sam Minnee
a4bf2cd1f3 FIX: Correct afterCallActionHandler arguments to match SS4.
The extension point RequestHandler::afterCallActionHandler was missing a critical
argument that has since been added to SS4. This patch backports the change to 3.x.
2018-07-18 17:25:50 +12:00
Daniel Hensby
d430763a87
Merge remote-tracking branch 'upstream/3.7.1' into 3.7 2018-07-17 20:52:12 +01:00
Daniel Hensby
d096a37f32
Added 3.7.1 changelog 2018-07-17 16:53:27 +00:00
Daniel Hensby
259a0a50ad
Merge pull request #8268 from dhensby/pulls/3.7.1/fix-installer-error
FIX sizeof doesnt work with null types
2018-07-17 16:24:02 +01:00
Daniel Hensby
e38c30ff0d
FIX sizeof doesnt work with null types 2018-07-17 15:53:38 +01:00
Ingo Schommer
13e8b155ec
Merge pull request #8242 from sminnee/simpler-vary-header
FIX: Remove X-Requested-With from default Vary header.
2018-07-05 13:32:46 +12:00
Daniel Hensby
6f833aa0de
Merge pull request #8239 from alex-dna/patch-2
Make column work
2018-07-04 14:54:25 +01:00
Daniel Hensby
5a5de201c5
Merge pull request #8238 from alex-dna/patch-1
Make column work
2018-07-04 14:54:09 +01:00
Sam Minnee
fa7f1954be Fix test to match 2018-07-04 15:56:47 +12:00
Sam Minnee
72ce2b422d Update docs for Vary: X-Requested-With 2018-07-04 15:55:52 +12:00
Sam Minnee
9c9872ebac FIX: Remove X-Requested-With from default Vary header.
The X-Requested-With header does modify the result of Director::is_ajax
and so this should strictly be in there. In practise, this can cause
issues with CDNs such as Incapsula, and LeftAndMain adds this vary
header itself, which is the principle place where Director::is_ajax
is used.
2018-07-04 13:35:47 +12:00
Alex Saelens
fd7efba7d9
Make column work
The ColumnCount is set on the CompositeField class, and not on its FieldList. So to get the ColumnCount, we need to use $Top to get out of the loop.
2018-07-04 09:48:39 +12:00
Alex Saelens
ed3c0b8d4e
Make column work
The ColumnCount is set on the CompositeField class, and not on its FieldList. So to get the ColumnCount, we need to use $Top to get out of the loop.
2018-07-04 09:46:31 +12:00
Loz Calver
00a263092e
Merge pull request #8226 from botzkobg/3.7
Add 'updateComponents' extend in DataObject->getComponents()
2018-06-28 13:53:40 +01:00
botzkobg
d247027d0f
Add 'updateComponents' extend in DataObject->getComponents() 2018-06-28 11:07:20 +01:00
Aaron Carlino
ef09092450 Added 3.7.1-rc1 changelog 2018-06-25 11:44:14 +12:00
Robbie Averill
81b2d84171
Merge pull request #8196 from open-sausages/pulls/3.7/reverse-performance-breakage
Reverse 5b6a39e71a
2018-06-20 11:26:37 +12:00
Daniel Hensby
677d28b044
Merge pull request #8198 from creative-commoners/pulls/3.7/remove-precise
FIX Switch to Trusty in Travis
2018-06-19 14:04:07 +01:00
Robbie Averill
4de82ae828 Remove duplicate localhost hostname (fixed Selenium bug) 2018-06-19 23:13:45 +12:00
Robbie Averill
58bd6c2248 FIX Switch to Trusty in Travis 2018-06-19 21:41:46 +12:00
Robbie Averill
ce4186dcaf
Merge pull request #8161 from open-sausages/pulls/3.7/cleanup-travis-builds
Simplify travis builds
2018-06-19 21:30:56 +12:00
Damian Mooyman
4035b3ff87
Reverse 5b6a39e71a 2018-06-19 11:06:13 +12:00
Damian Mooyman
95f6ed9017
Simplify travis builds
3 framework phpunit
1 framework behat
1 cms phpunit
1 cmsbehat
2018-06-18 13:25:54 +12:00
Daniel Hensby
936fd775c5
DOCS Fix bad usage of HTTPCacheControl::inst() 2018-06-13 14:23:05 +01:00
Damian Mooyman
1acb80851c
Merge pull request #8154 from xini/patch-4
fix Versioned::choose_site_stage() if no request given
2018-06-13 13:45:00 +12:00
Robbie Averill
520138f081
Merge pull request #8160 from open-sausages/pulls/3.7/validate-by-stage
BUG Error if invalid stage specified for get_by_stage
2018-06-12 11:51:34 +12:00
Florian Thoma
c9005b2a70 add check for currentl controller 2018-06-11 08:07:37 +02:00
Damian Mooyman
02cd32acb3
BUG Error if invalid stage specified for get_by_stage 2018-06-11 15:04:43 +12:00
Florian Thoma
42e799bc43
fix Versioned::choose_site_stage() if no request given
Load request from curent controller as a fallback
2018-06-09 20:37:52 +02:00
Damian Mooyman
d9261af1f3 Added 3.7.0 changelog 2018-06-08 12:19:40 +12:00
Damian Mooyman
f88d2a9a27 Remove obsolete branch-alias 2018-06-08 12:19:35 +12:00