Fix merge
This commit is contained in:
parent
eb179f9032
commit
b4fc321912
|
@ -123,7 +123,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
|
|||
->getMock();
|
||||
$role->expects($this->any())->method('getSource')->willReturn($originalToken);
|
||||
$this
|
||||
->securityContext
|
||||
->tokenStorage
|
||||
->expects($this->any())
|
||||
->method('getToken')
|
||||
->willReturn($this->getToken(array($role)));
|
||||
|
@ -154,7 +154,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
|
|||
}))
|
||||
;
|
||||
|
||||
$listener = new SwitchUserListener($this->securityContext, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager, null, '_switch_user', 'ROLE_ALLOWED_TO_SWITCH', $dispatcher);
|
||||
$listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager, null, '_switch_user', 'ROLE_ALLOWED_TO_SWITCH', $dispatcher);
|
||||
$listener->handle($this->event);
|
||||
}
|
||||
|
||||
|
|
|
@ -28,36 +28,31 @@ class ReflectionCasterTest extends VarDumperTestCase
|
|||
<<<'EOTXT'
|
||||
ReflectionClass {
|
||||
+name: "ReflectionClass"
|
||||
implements: array:1 [
|
||||
%Aimplements: array:%d [
|
||||
0 => "Reflector"
|
||||
]
|
||||
%A]
|
||||
constants: array:3 [
|
||||
"IS_IMPLICIT_ABSTRACT" => 16
|
||||
"IS_EXPLICIT_ABSTRACT" => 32
|
||||
"IS_FINAL" => 64
|
||||
]
|
||||
properties: array:1 [
|
||||
properties: array:%d [
|
||||
"name" => ReflectionProperty {
|
||||
+name: "name"
|
||||
%A +name: "name"
|
||||
+class: "ReflectionClass"
|
||||
modifiers: "public"
|
||||
%A modifiers: "public"
|
||||
extra: null
|
||||
}
|
||||
]
|
||||
%A]
|
||||
methods: array:%d [
|
||||
%A
|
||||
"export" => ReflectionMethod {
|
||||
+name: "export"
|
||||
+class: "ReflectionClass"
|
||||
parameters: array:2 [
|
||||
"$argument" => ReflectionParameter {
|
||||
+name: "argument"
|
||||
position: 0
|
||||
}
|
||||
"$return" => ReflectionParameter {
|
||||
+name: "return"
|
||||
position: 1
|
||||
}
|
||||
"$%s" => ReflectionParameter {
|
||||
%A position: 0
|
||||
%A }
|
||||
]
|
||||
modifiers: "public static"
|
||||
}
|
||||
|
|
|
@ -43,16 +43,16 @@ class CliDumperTest extends VarDumperTestCase
|
|||
$intMax = PHP_INT_MAX;
|
||||
$res = (int) $var['res'];
|
||||
$closure54 = '';
|
||||
$r = defined('HHVM_VERSION') ? '' : '#%d';
|
||||
|
||||
if (PHP_VERSION_ID >= 50400) {
|
||||
$closure54 = <<<EOTXT
|
||||
|
||||
class: "Symfony\Component\VarDumper\Tests\CliDumperTest"
|
||||
this: Symfony\Component\VarDumper\Tests\CliDumperTest {#%d …}
|
||||
this: Symfony\Component\VarDumper\Tests\CliDumperTest {{$r} …}
|
||||
EOTXT;
|
||||
}
|
||||
|
||||
$r = defined('HHVM_VERSION') ? '' : '#%d';
|
||||
$this->assertStringMatchesFormat(
|
||||
<<<EOTXT
|
||||
array:24 [
|
||||
|
@ -123,11 +123,11 @@ EOTXT
|
|||
|
||||
$var = xml_parser_create();
|
||||
|
||||
$this->assertDumpEquals(
|
||||
$this->assertDumpMatchesFormat(
|
||||
<<<EOTXT
|
||||
xml resource {
|
||||
current_byte_index: 0
|
||||
current_column_number: 1
|
||||
current_byte_index: %i
|
||||
current_column_number: %i
|
||||
current_line_number: 1
|
||||
error_code: XML_ERROR_NONE
|
||||
}
|
||||
|
|
|
@ -46,16 +46,16 @@ class HtmlDumperTest extends \PHPUnit_Framework_TestCase
|
|||
$dumpId = $dumpId[0];
|
||||
$res = (int) $var['res'];
|
||||
$closure54 = '';
|
||||
$r = defined('HHVM_VERSION') ? '' : '<a class=sf-dump-ref>#%d</a>';
|
||||
|
||||
if (PHP_VERSION_ID >= 50400) {
|
||||
$closure54 = <<<EOTXT
|
||||
|
||||
<span class=sf-dump-meta>class</span>: "<span class=sf-dump-str title="48 characters">Symfony\Component\VarDumper\Tests\HtmlDumperTest</span>"
|
||||
<span class=sf-dump-meta>this</span>: <abbr title="Symfony\Component\VarDumper\Tests\HtmlDumperTest" class=sf-dump-note>HtmlDumperTest</abbr> {<a class=sf-dump-ref>#%d</a> …}
|
||||
<span class=sf-dump-meta>this</span>: <abbr title="Symfony\Component\VarDumper\Tests\HtmlDumperTest" class=sf-dump-note>HtmlDumperTest</abbr> {{$r} …}
|
||||
EOTXT;
|
||||
}
|
||||
|
||||
$r = defined('HHVM_VERSION') ? '' : '<a class=sf-dump-ref>#%d</a>';
|
||||
$this->assertStringMatchesFormat(
|
||||
<<<EOTXT
|
||||
<foo></foo><bar><span class=sf-dump-note>array:24</span> [<samp>
|
||||
|
|
|
@ -162,7 +162,7 @@ Symfony\Component\VarDumper\Cloner\Data Object
|
|||
[class] => %s
|
||||
[value] =>
|
||||
[cut] => 0
|
||||
[handle] => %d
|
||||
[handle] => %i
|
||||
[refCount] => 0
|
||||
[position] => 1
|
||||
)
|
||||
|
|
Reference in New Issue