Merge pull request #9698 from sminnee/pulls/symfony4

Symfony 4 support

.travis.yml

@@ -86,7 +86,7 @@ before_script:
   - mkdir ./public
   - 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
-  - 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 [[ $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.json

@@ -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": "*",

src/i18n/Messages/YamlWriter.php

@@ -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;
     }

tests/php/ORM/DataObjectTest.yml

@@ -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: