Merge branch '2.x' into 3.x

* 2.x:
  Fix tests
This commit is contained in:
Fabien Potencier
2019-11-28 15:03:28 +01:00
3 changed files with 3 additions and 4 deletions
+1 -2
View File
@@ -29,8 +29,7 @@
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"symfony/phpunit-bridge": "^4.4@dev|^5.0",
"symfony/debug": "^3.4|^4.2|^5.0",
"symfony/phpunit-bridge": "^4.4|^5.0",
"psr/container": "^1.0"
},
"autoload": {
+1 -2
View File
@@ -18,7 +18,6 @@ source output
wget https://get.symfony.com/cli/installer -O - | bash
export PATH="$HOME/.symfony/bin:$PATH"
symfony server:start -d --no-tls
ENDPOINT=`symfony var:export SYMFONY_DEFAULT_ROUTE_URL`
curl -OLsS https://get.blackfire.io/blackfire-player.phar
chmod +x blackfire-player.phar
@@ -48,5 +47,5 @@ scenario
click link('Structure')
expect status_code() == 200
EOF
./blackfire-player.phar run drupal-tests.bkf --endpoint=$ENDPOINT --variable name=$DRUPAL_Username --variable pass=$DRUPAL_Password
./blackfire-player.phar run drupal-tests.bkf --endpoint=`symfony var:export SYMFONY_DEFAULT_ROUTE_URL` --variable name=$DRUPAL_Username --variable pass=$DRUPAL_Password
symfony server:stop
+1
View File
@@ -19,6 +19,7 @@
<php>
<ini name="error_reporting" value="-1" />
<ini name="xdebug.overload_var_dump" value="0" />
<server name="SYMFONY_PHPUNIT_VERSION" value="7.5" />
</php>
<listeners>