Merge remote-tracking branch 'origin/1.3'

FriendsOfSymfony · Aug 31, 2017 · 9a04b66 · 9a04b66
2 parents f463d8c + b09074f
commit 9a04b66
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -60,7 +60,7 @@ before_script:
   - composer update $COMPOSER_FLAGS
 
 script:
-  - SYMFONY_DEPRECATIONS_HELPER=weak vendor/bin/phpunit ${PHPUNIT_FLAGS}
+  - SYMFONY_DEPRECATIONS_HELPER=weak vendor/bin/simple-phpunit ${PHPUNIT_FLAGS}
   - if [[ "$DOCCHECK" = true ]]; then make -C Resources/doc SPHINXOPTS='-nW' html; fi
   - if [[ "$DOCCHECK" = true ]]; then make -C Resources/doc spelling; fi
 

diff --git a/Resources/doc/conf.py b/Resources/doc/conf.py
@@ -246,7 +246,7 @@
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'foshttpcache': ('http://foshttpcache.readthedocs.org/en/stable/', None)}
+intersphinx_mapping = {'foshttpcache': ('http://foshttpcache.readthedocs.org/en/latest/', None)}
 
 rst_epilog = """
 .. _expressions: http://symfony.com/doc/current/components/expression_language/index.html

diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "monolog/monolog": "*",
         "sensio/framework-extra-bundle": "^3.0",
         "symfony/symfony": "^2.8||^3.0",
-        "symfony/phpunit-bridge": "^2.7||^3.0",
+        "symfony/phpunit-bridge": "^3.2",
         "symfony/expression-language": "^2.4||^3.0",
         "symfony/monolog-bundle": "^2.3||^3.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",