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 #9698 from sminnee/pulls/symfony4

Browse Source 
Symfony 4 support
This commit is contained in:
Daniel Hensby 2020-09-30 23:22:51 +01:00 committed by GitHub
commit fe45655a2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -86,7 +86,7 @@ before_script:
- mkdir ./public - mkdir ./public
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --no-update; fi - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --no-update; fi
- if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.x-dev --no-update; fi - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.x-dev --no-update; fi
- composer require silverstripe/recipe-testing:^1 silverstripe/recipe-core:4.x-dev silverstripe/admin:1.x-dev silverstripe/versioned:1.x-dev --no-update - composer require silverstripe/recipe-core:4.x-dev silverstripe/admin:1.x-dev silverstripe/versioned:1.x-dev --no-update
- if [[ $PHPUNIT_TEST == cms ]]; then composer require silverstripe/recipe-cms:4.x-dev --no-update; fi - if [[ $PHPUNIT_TEST == cms ]]; then composer require silverstripe/recipe-cms:4.x-dev --no-update; fi
- if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
- composer update --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile $COMPOSER_INSTALL_ARG - composer update --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile $COMPOSER_INSTALL_ARG

8
composer.json
View File

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

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

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

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

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