Upgrade 1-11.38

This commit is contained in:
xesmyd
2026-03-30 14:10:30 +02:00
parent f2a7e6d1fc
commit ac648ef29d
24665 changed files with 69682 additions and 2205004 deletions
+26 -26
View File
@@ -30,11 +30,11 @@ class CsrfTokenManagerTest extends TestCase
$storage->expects($this->once())
->method('hasToken')
->with($namespace.'token_id')
->will($this->returnValue(false));
->willReturn(false);
$generator->expects($this->once())
->method('generateToken')
->will($this->returnValue('TOKEN'));
->willReturn('TOKEN');
$storage->expects($this->once())
->method('setToken')
@@ -55,12 +55,12 @@ class CsrfTokenManagerTest extends TestCase
$storage->expects($this->once())
->method('hasToken')
->with($namespace.'token_id')
->will($this->returnValue(true));
->willReturn(true);
$storage->expects($this->once())
->method('getToken')
->with($namespace.'token_id')
->will($this->returnValue('TOKEN'));
->willReturn('TOKEN');
$token = $manager->getToken('token_id');
@@ -79,7 +79,7 @@ class CsrfTokenManagerTest extends TestCase
$generator->expects($this->once())
->method('generateToken')
->will($this->returnValue('TOKEN'));
->willReturn('TOKEN');
$storage->expects($this->once())
->method('setToken')
@@ -100,12 +100,12 @@ class CsrfTokenManagerTest extends TestCase
$storage->expects($this->once())
->method('hasToken')
->with($namespace.'token_id')
->will($this->returnValue(true));
->willReturn(true);
$storage->expects($this->once())
->method('getToken')
->with($namespace.'token_id')
->will($this->returnValue('TOKEN'));
->willReturn('TOKEN');
$this->assertTrue($manager->isTokenValid(new CsrfToken('token_id', 'TOKEN')));
}
@@ -118,12 +118,12 @@ class CsrfTokenManagerTest extends TestCase
$storage->expects($this->once())
->method('hasToken')
->with($namespace.'token_id')
->will($this->returnValue(true));
->willReturn(true);
$storage->expects($this->once())
->method('getToken')
->with($namespace.'token_id')
->will($this->returnValue('TOKEN'));
->willReturn('TOKEN');
$this->assertFalse($manager->isTokenValid(new CsrfToken('token_id', 'FOOBAR')));
}
@@ -136,7 +136,7 @@ class CsrfTokenManagerTest extends TestCase
$storage->expects($this->once())
->method('hasToken')
->with($namespace.'token_id')
->will($this->returnValue(false));
->willReturn(false);
$storage->expects($this->never())
->method('getToken');
@@ -152,7 +152,7 @@ class CsrfTokenManagerTest extends TestCase
$storage->expects($this->once())
->method('removeToken')
->with($namespace.'token_id')
->will($this->returnValue('REMOVED_TOKEN'));
->willReturn('REMOVED_TOKEN');
$this->assertSame('REMOVED_TOKEN', $manager->removeToken('token_id'));
}
@@ -163,9 +163,9 @@ class CsrfTokenManagerTest extends TestCase
$storage = $this->getMockBuilder('Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface')->getMock();
$requestStack = new RequestStack();
$requestStack->push(new Request(array(), array(), array(), array(), array(), array('HTTPS' => 'on')));
$requestStack->push(new Request([], [], [], [], [], ['HTTPS' => 'on']));
$manager = new CsrfTokenManager($generator, $storage, null, $requestStack);
$manager = new CsrfTokenManager($generator, $storage);
$token = $manager->getToken('foo');
$this->assertSame('foo', $token->getId());
@@ -173,49 +173,49 @@ class CsrfTokenManagerTest extends TestCase
public function getManagerGeneratorAndStorage()
{
$data = array();
$data = [];
list($generator, $storage) = $this->getGeneratorAndStorage();
$data[] = array('', new CsrfTokenManager($generator, $storage, ''), $storage, $generator);
$data[] = ['', new CsrfTokenManager($generator, $storage, ''), $storage, $generator];
list($generator, $storage) = $this->getGeneratorAndStorage();
$data[] = array('https-', new CsrfTokenManager($generator, $storage), $storage, $generator);
$data[] = ['https-', new CsrfTokenManager($generator, $storage), $storage, $generator];
list($generator, $storage) = $this->getGeneratorAndStorage();
$data[] = array('aNamespace-', new CsrfTokenManager($generator, $storage, 'aNamespace-'), $storage, $generator);
$data[] = ['aNamespace-', new CsrfTokenManager($generator, $storage, 'aNamespace-'), $storage, $generator];
$requestStack = new RequestStack();
$requestStack->push(new Request(array(), array(), array(), array(), array(), array('HTTPS' => 'on')));
$requestStack->push(new Request([], [], [], [], [], ['HTTPS' => 'on']));
list($generator, $storage) = $this->getGeneratorAndStorage();
$data[] = array('https-', new CsrfTokenManager($generator, $storage, $requestStack), $storage, $generator);
$data[] = ['https-', new CsrfTokenManager($generator, $storage, $requestStack), $storage, $generator];
list($generator, $storage) = $this->getGeneratorAndStorage();
$data[] = array('generated-', new CsrfTokenManager($generator, $storage, function () {
$data[] = ['generated-', new CsrfTokenManager($generator, $storage, function () {
return 'generated-';
}), $storage, $generator);
}), $storage, $generator];
$requestStack = new RequestStack();
$requestStack->push(new Request());
list($generator, $storage) = $this->getGeneratorAndStorage();
$data[] = array('', new CsrfTokenManager($generator, $storage, $requestStack), $storage, $generator);
$data[] = ['', new CsrfTokenManager($generator, $storage, $requestStack), $storage, $generator];
return $data;
}
private function getGeneratorAndStorage()
{
return array(
return [
$this->getMockBuilder('Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface')->getMock(),
$this->getMockBuilder('Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface')->getMock(),
);
];
}
public function setUp()
protected function setUp()
{
$_SERVER['HTTPS'] = 'on';
}
public function tearDown()
protected function tearDown()
{
parent::tearDown();