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

Merge pull request #10311 from creative-commoners/pulls/4.11/oembed

Browse Source 
ENH Use guzzle for oembed
This commit is contained in:
Guy Sartorelli 2022-05-12 09:22:31 +12:00 committed by GitHub
commit 62bf312263
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_config/oembed.yml
View File

@ -4,6 +4,11 @@ Name: coreoembed
SilverStripe\Core\Injector\Injector: SilverStripe\Core\Injector\Injector:
SilverStripe\View\Embed\Embeddable: SilverStripe\View\Embed\Embeddable:
class: SilverStripe\View\Embed\EmbedContainer class: SilverStripe\View\Embed\EmbedContainer
Psr\Http\Client\ClientInterface.oembed:
class: GuzzleHttp\Client
Embed\Http\Crawler:
constructor:
- '%$Psr\Http\Client\ClientInterface.oembed'
Embed\Embed: Embed\Embed:
constructor: constructor:
- '%$Embed\Http\Crawler' - '%$Embed\Http\Crawler'

3
composer.json
View File

@ -60,7 +60,8 @@
}, },
"conflict": { "conflict": {
"egulias/email-validator": "^2", "egulias/email-validator": "^2",
"phpunit/phpunit": "^6 || ^7 || ^8" "phpunit/phpunit": "^6 || ^7 || ^8",
"cwp/cwp-core": "<2.11.0"
}, },
"provide": { "provide": {
"psr/container-implementation": "1.0.0" "psr/container-implementation": "1.0.0"

13
docs/en/02_Developer_Guides/03_Forms/Field_types/03_HTMLEditorField.md
View File

@ -265,6 +265,19 @@ SilverStripe\AssetAdmin\Forms\RemoteFileFormFactory:
HtmlEditorConfig::get('cms')->disablePlugins('ssembed'); HtmlEditorConfig::get('cms')->disablePlugins('ssembed');
``` ```
Use the following config if you need to send outbound requests through a proxy:
```yaml
---
Name: myembed
After: coreoembed
---
SilverStripe\Core\Injector\Injector:
Psr\Http\Client\ClientInterface.oembed:
constructor:
- proxy: '111.222.333.444:55'
```
## Limiting oembed URLs ## Limiting oembed URLs
HtmlEditorField can have whitelists set on both the scheme (default http & https) and domains allowed when HtmlEditorField can have whitelists set on both the scheme (default http & https) and domains allowed when

1
docs/en/04_Changelogs/4.11.0.md
View File

@ -102,6 +102,7 @@ This release includes a number of bug fixes to improve a broad range of areas. C
- If `guzzlehttp/guzzle` is required, it must now be at least `7.3.0`. This was done to ensure that v2 of `guzzlehttp/psr7` is installed, which is used by `embed/embed` v4 - If `guzzlehttp/guzzle` is required, it must now be at least `7.3.0`. This was done to ensure that v2 of `guzzlehttp/psr7` is installed, which is used by `embed/embed` v4
- `embed/embed` has been upgraded from v3 to v4. The internal implementation of the internal `Embeddable` interface has been changed from `EmbedResource` to `EmbedContainer` - `embed/embed` has been upgraded from v3 to v4. The internal implementation of the internal `Embeddable` interface has been changed from `EmbedResource` to `EmbedContainer`
- `embed/embed` has been configured to use a guzzle client instead of the default curl client so that a proxy configuration value can be set if required
<!--- Changes below this line will be automatically regenerated --> <!--- Changes below this line will be automatically regenerated -->