Commit Graph

4780 Commits

Author SHA1 Message Date
github-actions
f3262c3c1e Merge branch '5' into 6 2024-07-22 21:57:06 +00:00
Guy Sartorelli
d14ec2831a
Merge pull request #11299 from Cheddam/pulls/5/session-token-renewal-configuration
API Make token regeneration optional during autologin session renewal
2024-07-22 12:11:18 +12:00
Steve Boyd
ac319fb7ec Merge branch '5' into 6 2024-07-17 12:03:20 +12:00
Steve Boyd
db665a8dd8 Merge branch '5.2' into 5 2024-07-17 12:02:37 +12:00
Guy Sartorelli
b8d20dc9d5 [CVE-2024-32981] Disallow data:text/html in data attributes 2024-07-17 11:04:27 +12:00
Garion Herman
724e813b8f API Make token regeneration optional during autologin session renewal
Resolves #11281. Renewing the token/hash during an active session
can trigger a logout in the event of request failures or simultaneous
requests.

This also marks the renew method as deprecated, to be removed
entirely in 6.0.
2024-07-16 09:08:04 +09:00
github-actions
cfbf1ea90a Merge branch '5' into 6 2024-07-14 08:42:46 +00:00
Steve Boyd
386ff5a1cc
Merge pull request #11300 from creative-commoners/pulls/6/in-memory-cache
FIX Ensure cache is shared between CLI and webserver
2024-07-12 12:28:42 +12:00
Guy Sartorelli
68d8cfcd4b
Merge pull request #11301 from creative-commoners/pulls/5/toasts-behat
MNT Support assert toasts if there are mutliple toasts
2024-07-12 11:44:13 +12:00
Guy Sartorelli
ed321f8ce7
MNT Test with all cache factories in CI 2024-07-12 09:29:47 +12:00
Steve Boyd
92ffbe03fb MNT Support assert toasts if there are mutliple toasts 2024-07-11 12:10:28 +12:00
github-actions
b405c4dbb6 Merge branch '5' into 6 2024-07-09 22:05:48 +00:00
Guy Sartorelli
3829160151
Merge branch '5.2' into 5 2024-07-10 10:04:52 +12:00
Guy Sartorelli
c13ec34113
FIX Don't strip <header> tag from HTMLValue (#11302) 2024-07-09 13:18:29 +12:00
Guy Sartorelli
232173753a
FIX Ensure cache is shared between CLI and webserver 2024-07-09 12:58:13 +12:00
Steve Boyd
98dc238d2a ENH Do not require _config dir or _config.php for modules 2024-07-01 16:32:54 +12:00
Maxime Rainville
dbc0288038
MNT ALter order of expected attribute on image test (#11286) 2024-07-01 10:36:37 +12:00
github-actions
cbc984eaf7 Merge branch '5' into 6 2024-06-20 03:09:22 +00:00
Guy Sartorelli
dcace43183
Merge branch '5.2' into 5
# Conflicts:
#	src/Core/ClassInfo.php
#	src/ORM/FieldType/DBForeignKey.php
2024-06-20 14:51:48 +12:00
Guy Sartorelli
27873939f4
Merge pull request #11270 from creative-commoners/pulls/5.2/remove-self
ENH Use class name instead of self
2024-06-18 14:40:44 +12:00
Steve Boyd
620c1b0469 ENH Use class name instead of self 2024-06-18 09:37:39 +12:00
github-actions
4fee1a3f8e Merge branch '5' into 6 2024-06-17 01:15:59 +00:00
github-actions
b7e2a6ecf8 Merge branch '5.2' into 5 2024-06-17 01:15:58 +00:00
Guy Sartorelli
1e0b9056f5
FIX Don't load data up front for lazy-loaded searchable dropdown (#11278) 2024-06-17 11:59:59 +12:00
Guy Sartorelli
be6ca2a91d
API Remove references to non-existent installation tool (#11274) 2024-06-13 14:45:58 +12:00
Guy Sartorelli
b53cda8de0
FIX Respect explicit casting before casting arrays (#11271) 2024-06-11 16:49:27 +12:00
Guy Sartorelli
e7d05aa524
Merge branch '5' into 6 2024-06-11 13:30:15 +12:00
Guy Sartorelli
be0eab2bae
NEW Allow DataObject classes to define scaffolded relation formfields (#11269) 2024-06-07 17:06:01 +12:00
github-actions
f561102430 Merge branch '5' into 6 2024-06-04 23:33:37 +00:00
Maxime Rainville
e35f12c66f
ENH Update AttributesHTML to output alt attribute even if it's empty (#11217) 2024-05-29 09:30:04 +12:00
Guy Sartorelli
3f30da5155
ENH Looping through arrays in templates (#11244) 2024-05-24 12:51:14 +12:00
github-actions
57886b76f5 Merge branch '5' into 6 2024-05-22 22:41:41 +00:00
github-actions
8886a3a93d Merge branch '5.2' into 5 2024-05-22 22:41:40 +00:00
Sabina Talipova
f0aaba5504
FIX HTMLEditorField is not able to show html or xml code examples (#11243) 2024-05-22 09:39:36 +12:00
Steve Boyd
3e70cfed1e API Set extension hook implementation visibility to protected 2024-05-21 09:51:51 +12:00
Guy Sartorelli
699a8bf2da
FIX Loop over current scope when no argument passed to loop block 2024-05-17 15:17:02 +12:00
Guy Sartorelli
56625081b4
ENH Use allowed view button for readonly GridField (#11228) 2024-05-17 10:28:47 +12:00
Guy Sartorelli
3b1d859baf
Merge pull request #11235 from creative-commoners/pulls/6/fieldlist-strongly-type
API Strongly type Fieldlist
2024-05-17 08:59:11 +12:00
Steve Boyd
7b847f8d7e API Strongly type Fieldlist 2024-05-16 18:16:08 +12:00
github-actions
c6aee6c5c7 Merge branch '5' into 6 2024-05-16 01:13:13 +00:00
github-actions
f60e1bc236 Merge branch '5.2' into 5 2024-05-16 01:13:12 +00:00
Guy Sartorelli
8afe1adc57
Merge pull request #11238 from creative-commoners/pulls/5/viewable-scalar
ENH Rendering scalars in ArrayList in templates
2024-05-15 17:33:13 +12:00
Steve Boyd
12a741feee ENH Rendering scalars in ArrayList in templates 2024-05-15 16:31:39 +12:00
Guy Sartorelli
50a0018363
FIX many_many through should allow subclasses (#11230)
```php
class HomePage extends Page
{
    private static $many_many = [
        'HeroImages' => [
            'through' => PageImageLink::class,
            'from' => 'Page',
            'to' => 'Image',
        ]
    ];

}
```

```php
class PageImageLink extends DataObject
{
    private static $has_one = [
        'Page' => SiteTree::class,
        'Image' => Image::class,
    ];
}

This fails because the linking object's relation class doesn't exactly match the owner. Sharing the linking objects across various entries in the ancestry should be a supported use case.

Co-authored-by: Aaron Carlino <unclecheese@leftandmain.com>
2024-05-13 14:15:37 +12:00
github-actions
3c8f8b99e7 Merge branch '5' into 6 2024-05-11 14:24:49 +00:00
github-actions
4429a4999d Merge branch '5.2' into 5 2024-05-11 14:24:47 +00:00
Dominik Beerbohm
0f6d210602
FIX Correctly eagerload polymorphic has_one relations (#11204) 2024-05-08 11:12:51 +12:00
Guy Sartorelli
a198c91628
FIX Don't throw exception for empty eagerloaded relation (#11220) 2024-05-06 18:06:54 +12:00
Guy Sartorelli
a92baeaf6f
FIX Allow double dots in path when not attempting directory traversal (#11219) 2024-05-06 13:15:26 +12:00
Steve Boyd
b8f0b8ca4f FIX Handle getting HasOneRelationFieldInterface passed as an array 2024-05-02 12:06:43 +12:00
github-actions
d37c871883 Merge branch '5' into 6 2024-04-20 14:23:55 +00:00
github-actions
19ea32ebfa Merge branch '5.2' into 5 2024-04-20 14:23:53 +00:00
Guy Sartorelli
dcc6863401
NEW Allow skipping validation on write (#11202) 2024-04-19 10:35:36 +12:00
Guy Sartorelli
a4adad60e9
FIX Don't skip sanitisation when no valid elements are defined 2024-04-18 14:28:02 +12:00
Guy Sartorelli
584968e80c
MNT Update tests to use a dataprovider
Also explicitly test both valid_elements and extended_valid_elements
2024-04-18 14:27:25 +12:00
Bernie Hamlin
99e965b5d7
FIX Use field editorconfig when sanitising content 2024-04-18 14:16:53 +12:00
Dominik Beerbohm
135f9c6d30
FIX Ensure eagerLoading don't load has_one twice (#11170) 2024-04-18 13:27:50 +12:00
Loz Calver
a53301f673 FIX: OutOfBoundsException when recipe-core isn't installed (fixes #11197) 2024-04-15 16:59:59 +01:00
github-actions
f63862df83 Merge branch '5.2' into 5 2024-03-19 23:26:26 +00:00
github-actions
90298002a4 Merge branch '5.1' into 5.2 2024-03-19 23:26:25 +00:00
Guy Sartorelli
e68af4de40
Merge branch '4' into 5.1 2024-03-20 12:15:22 +13:00
Guy Sartorelli
6ede0316bf
Revert "Use field editorconfig when sanitising content" (#11180)
This reverts commit e5eb98cc34.
2024-03-20 12:02:54 +13:00
Guy Sartorelli
25f61141cb
Enhancements required for linkfield migration (#11171)
* ENH Add lightweight test override for Environment::isCli()

* NEW Allow JOIN with SQL UPDATE.
2024-03-20 11:49:57 +13:00
Guy Sartorelli
dcd33319c7
Merge branch '5.1' into 5.2 2024-03-18 15:33:54 +13:00
github-actions
c25922fedb Merge branch '4' into 5.1 2024-03-16 14:24:08 +00:00
Thomas Portelange
fcf5e324dd FIX Handle non-breakable spaces
Fixes issue https://github.com/silverstripe/silverstripe-framework/issues/11162
2024-03-12 11:01:09 +13:00
Steve Boyd
a18fb1bcb7 MNT Ensure composer/semver installed or skip test 2024-03-04 12:52:17 +13:00
Guy Sartorelli
4f3282bf2a
Merge pull request #11157 from lekoala/patch-46
FIX use composer runtime api
2024-02-28 09:16:25 +13:00
Thomas Portelange
59177dd315
Delete tests/php/Core/Manifest/fixtures/VersionProviderTest directory 2024-02-27 10:42:25 +01:00
Thomas Portelange
a06ce0493a
use VersionParser instead of comparator 2024-02-26 11:44:11 +01:00
Thomas Portelange
80e197fe4f
make error message more readable 2024-02-26 10:21:23 +01:00
Thomas Portelange
a1d1e977c5
use composer/semver 2024-02-26 10:13:34 +01:00
Thomas Portelange
2b64e98afc
Update VersionProviderTest.php 2024-02-26 09:48:15 +01:00
Guy Sartorelli
c2b606c24c
Merge pull request #11150 from beerbohmdo/allow_override_moneyfield
Allow better subclassing of MoneyField
2024-02-26 11:20:11 +13:00
Dominik Beerbohm
a3ce922f1d
ENH Allow better subclassing of MoneyField
Move generation of NumberField from constructor to method to allow override in subclass.
Addded test for MoneyField
2024-02-20 11:42:45 +01:00
Guy Sartorelli
528344d1b0
NEW Allow manipulating eagerloading queries (#11140) 2024-02-20 16:17:31 +13:00
github-actions
7e30e38ae6 Merge branch '5.1' into 5 2024-02-14 22:58:30 +00:00
Guy Sartorelli
d33332cb9e
FIX Add eagerloaded data to ALL relevant lists (#11139) 2024-02-15 11:57:22 +13:00
Steve Boyd
51fd1d6b7e FIX Handle __TRAIT__ in i18nTextCollector 2024-02-13 16:33:24 -07:00
github-actions
5f355fbb75 Merge branch '5.1' into 5 2024-02-13 20:47:47 +00:00
Guy Sartorelli
c493485281
MNT Remove unexpected coupling with admin for test (#11136) 2024-02-13 17:35:03 +13:00
Guy Sartorelli
5e53dbcdbc
NEW Add a trace comment for queries in dev mode (#11065) 2024-02-08 16:29:55 +13:00
github-actions
e696e70dc4 Merge branch '5.1' into 5 2024-02-03 14:24:00 +00:00
github-actions
4d96674752 Merge branch '4' into 5.1 2024-02-03 14:23:59 +00:00
Steve Boyd
2e4bc95157 NEW Add UrlField 2024-02-02 13:43:26 +13:00
Guy Sartorelli
7f71695335
NEW Wire up symfony/validator (#11123) 2024-02-02 13:15:32 +13:00
Steve Boyd
00276373b7 MNT Fix unit test when running without silverstripe/admin installed 2024-01-31 15:02:44 +13:00
github-actions
1eadc84a22 Merge branch '5.1' into 5 2024-01-27 14:24:02 +00:00
Sabina Talipova
afd53d1d6a FIX HTMLEditorField::setRows with Elemental 2024-01-25 12:07:10 +13:00
Guy Sartorelli
98951c088e
Merge branch '5.1' into 5 2024-01-23 12:04:23 +13:00
github-actions
312ee58292 Merge branch '4' into 5.1 2024-01-22 22:58:52 +00:00
Guy Sartorelli
90a57c2aa4
Merge branch '5.1' into 5 2024-01-23 11:58:17 +13:00
Guy Sartorelli
4b1b487041
[CVE-2023-49783] Allow permission checks in BulkLoader 2024-01-23 11:01:25 +13:00
github-actions
96241b2db8 Merge branch '4' into 5.1 2024-01-20 14:24:40 +00:00
Guy Sartorelli
b979ce5896
MNT Fix test for required password fields in kitchen sink (#11111) 2024-01-19 13:27:32 +13:00
Guy Sartorelli
357ed7ad7e
ENH Add generic types (#11108)
There are also a few general corrections to PHPDocs that I noticed along
the way (e.g. adding `|null` when the method is returning a null value.

There are some cases where either the return type or the whole PHPDoc
was duplicated from the parent class - in those cases I've simply
removed the duplication.
2024-01-17 17:08:26 +13:00
Guy Sartorelli
b1a1d4b951
Merge pull request #11100 from creative-commoners/pulls/5/split-summary-by-punctuation
ENH Split sentences by configurable punctuation for summary
2024-01-09 09:01:44 +13:00
Nick
e456de11b0
Fix clobbering of the upload size validation (#10059)
* Fix clobbering of the upload size validation

When the validation is set here like this, it overrides validation which has already been setup with a simple '*' rule for the size based on PHP.

If you've defined in the sites yml config something like

    SilverStripe\Assets\Upload_Validator:
      default_max_file_size:
        '[image]': '2m'
        '*' : '1m'

then it will not be respected.

If you review SilverStripe\Assets\Upload_Validator and check the getAllowedMaxFileSize method, you'll see the sizing will be populated (if it hasn't been done before).

You can see it fail by;
- Setup a new SilverStripe site.
- Set your PHP to allow max post / max upload size of 10mb.
- Add the above config to your sites yml file and flush.
- In the CMS you'll be able to upload a 5MB file, when you shouldn't.

* Test that FileField will use size validation if defined

Couple of tests which prove a fix so the FileField and others will use the default_max_file_size setting

* Fix variable name in last commit

This is what happens when you refactor in the github window.
Fix the variable names. This will get squashed once merged.

* Updates the pr - white space and non deprecated method for byte conversion

Remove extra white space to appease the CS. Use the non deprecated method for memstring2bytes

* White space fixes for the phpcs

White space fixes for the phpcs

* Ensure that "memstring2bytes" can handle if an empty or value with no number is passed in

* DEP Bump assets constraint to ensure that change is also pulled in

---------

Co-authored-by: Guy Sartorelli <guy.sartorelli@silverstripe.com>
2024-01-08 15:49:41 +13:00
Finlay Metcalfe
2487c4085d
ENH Create Requirements::customScriptWithAttributes (#11076)
* ENH Create Requirements::customScriptWithAttributes

* MNT PHP Lint failures corrected

* ENH Refactored attribute handling to avoid API changes, auto lowercase, strong typing

* FIX Updated default value handling for type in customScriptWithAttributes

* DOC Removed white space

* MNT PHP Lint Failures Corrected

* Update src/View/Requirements_Backend.php

Co-authored-by: Steve Boyd <emteknetnz@gmail.com>

* Update src/View/Requirements_Backend.php

Co-authored-by: Steve Boyd <emteknetnz@gmail.com>

* Update tests/php/View/RequirementsTest.php

Co-authored-by: Steve Boyd <emteknetnz@gmail.com>

* FIX Removed extra closing brace in customScriptWithAttributes

* Update src/View/Requirements_Backend.php

Co-authored-by: Steve Boyd <emteknetnz@gmail.com>

* Update src/View/Requirements.php

Co-authored-by: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>

* MNT Fixed left over content definition and created tests for uniquenessIDs

* MNT Fixed PHP Lint Error

* MNT Fix PHP Lint Error

* FIX Remove attribute when calling customScript with the same uniquenessID

---------

Co-authored-by: Steve Boyd <emteknetnz@gmail.com>
Co-authored-by: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
2023-12-22 12:00:33 +13:00
Guy Sartorelli
bf629dfabd
ENH Split sentences by configurable punctuation for summary
Co-authored-by: Lukas Erni <le@kraftausdruck.ch>
2023-12-20 15:08:01 +13:00