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

NEW: Add Symfony 4 support alongside Symfony 3

Browse Source 
- Remove duplicate key in YML file
 - Remove deprecated yaml dump indentation set (the constructor arg works in both ^3 and ^4)

Fixes #9274
This commit is contained in:
Sam Minnee 2020-09-18 17:55:31 +12:00
parent ae0ece2b02
commit 9247bc8b79
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.json
View File

@ -37,10 +37,10 @@
"silverstripe/vendor-plugin": "^1.4",
"sminnee/callbacklist": "^0.1",
"swiftmailer/swiftmailer": "~5.4",
"symfony/cache": "^3.3@dev",
"symfony/config": "^3.2",
"symfony/translation": "^2.8",
"symfony/yaml": "~3.2",
"symfony/cache": "^3.3 || ^4",
"symfony/config": "^3.2 || ^4",
"symfony/translation": "^2.8 || ^3 || ^4",
"symfony/yaml": "^3.2 || ^4",
"php": ">=7.1.0",
"ext-ctype": "*",
"ext-dom": "*",

3
src/i18n/Messages/YamlWriter.php
View File

@ -29,8 +29,7 @@ class YamlWriter implements Writer
protected function getDumper()
{
if (!$this->dumper) {
$this->dumper = new Dumper();
$this->dumper->setIndentation(2);
$this->dumper = new Dumper(2);
}
return $this->dumper;
}

2
tests/php/ORM/DataObjectTest.yml
View File

@ -143,7 +143,7 @@ SilverStripe\ORM\Tests\DataObjectTest\Company:
company1:
Name: Company corp
Owner: =>SilverStripe\ORM\Tests\DataObjectTest\Player.player1
company1:
company2:
Name: 'Team co.'
Owner: =>SilverStripe\ORM\Tests\DataObjectTest\Player.player2
SilverStripe\ORM\Tests\DataObjectTest\Bracket: