Merge pull request #1369 from meyerbaptiste/fix_travis_deps_low

dunglas · web-flow · commit cdaeec59e41e · 2017-09-13T20:21:55.000+02:00
Fix Travis when deps are low
diff --git a/composer.json b/composer.json
@@ -56,7 +56,7 @@
         "symfony/finder": "^3.3 || ^4.0",
         "symfony/form": "^3.3 || ^4.0",
         "symfony/framework-bundle": "^3.3 || ^4.0",
-        "symfony/phpunit-bridge": "^2.7 || ^3.0 || ^4.0",
+        "symfony/phpunit-bridge": "^3.3 || ^4.0",
         "symfony/routing": "^3.3 || ^4.0",
         "symfony/security": "^3.0 || ^4.0",
         "symfony/security-bundle": "^3.0 || ^4.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,6 +8,7 @@
          colors="true"
 >
     <php>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak_vendors" />
         <ini name="error_reporting" value="-1" />
         <ini name="memory_limit" value="-1" />
         <server name="KERNEL_DIR" value="tests/Fixtures/app/" />
diff --git a/src/Serializer/AbstractItemNormalizer.php b/src/Serializer/AbstractItemNormalizer.php
@@ -357,6 +357,8 @@ protected function getFactoryOptions(array $context): array
      * @param array  $context
      *
      * @return array
+     *
+     * @deprecated since version 2.1, to be removed in 3.0.
      */
     protected function createRelationSerializationContext(string $resourceClass, array $context): array
     {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`colors="true"`
`9`	`9`	`>`
`10`	`10`	`<php>`
	`11`	`+ <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak_vendors" />`
`11`	`12`	`<ini name="error_reporting" value="-1" />`
`12`	`13`	`<ini name="memory_limit" value="-1" />`
`13`	`14`	`<server name="KERNEL_DIR" value="tests/Fixtures/app/" />`
Original file line number	Diff line number	Diff line change
`@@ -357,6 +357,8 @@ protected function getFactoryOptions(array $context): array`
`357`	`357`	`* @param array $context`
`358`	`358`	`*`
`359`	`359`	`* @return array`
	`360`	`+ *`
	`361`	`+ * @deprecated since version 2.1, to be removed in 3.0.`
`360`	`362`	`*/`
`361`	`363`	`protected function createRelationSerializationContext(string $resourceClass, array $context): array`
`362`	`364`	`{`