Browse code

Merge branch '2.x' into 3.x

* 2.x:
Fix tests

Fabien Potencier authored on 28/11/2019 14:03:28
Showing 3 changed files
... ...
@@ -29,8 +29,7 @@
29 29
         "symfony/polyfill-ctype": "^1.8"
30 30
     },
31 31
     "require-dev": {
32
-        "symfony/phpunit-bridge": "^4.4@dev|^5.0",
33
-        "symfony/debug": "^3.4|^4.2|^5.0",
32
+        "symfony/phpunit-bridge": "^4.4|^5.0",
34 33
         "psr/container": "^1.0"
35 34
     },
36 35
     "autoload": {
... ...
@@ -18,7 +18,6 @@ source output
18 18
 wget https://get.symfony.com/cli/installer -O - | bash
19 19
 export PATH="$HOME/.symfony/bin:$PATH"
20 20
 symfony server:start -d --no-tls
21
-ENDPOINT=`symfony var:export SYMFONY_DEFAULT_ROUTE_URL`
22 21
 
23 22
 curl -OLsS https://get.blackfire.io/blackfire-player.phar
24 23
 chmod +x blackfire-player.phar
... ...
@@ -48,5 +47,5 @@ scenario
48 47
     click link('Structure')
49 48
         expect status_code() == 200
50 49
 EOF
51
-./blackfire-player.phar run drupal-tests.bkf --endpoint=$ENDPOINT --variable name=$DRUPAL_Username --variable pass=$DRUPAL_Password
50
+./blackfire-player.phar run drupal-tests.bkf --endpoint=`symfony var:export SYMFONY_DEFAULT_ROUTE_URL` --variable name=$DRUPAL_Username --variable pass=$DRUPAL_Password
52 51
 symfony server:stop
... ...
@@ -19,6 +19,7 @@
19 19
   <php>
20 20
     <ini name="error_reporting" value="-1" />
21 21
     <ini name="xdebug.overload_var_dump" value="0" />
22
+    <server name="SYMFONY_PHPUNIT_VERSION" value="7.5" />
22 23
   </php>
23 24
 
24 25
   <listeners>