mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-23 08:06:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7136 from yguedidi/fix-deprecation

Browse source 
Fix deprecation
This commit is contained in:
Yassine Guedidi 2023-12-27 19:09:55 +01:00 committed by GitHub
commit 4846dd00c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/ConfigController.php
View file

@ -668,7 +668,7 @@ class ConfigController extends AbstractController
*/
public function setLocaleAction(Request $request, ValidatorInterface $validator, $language = null)
{
$errors = $validator->validate($language, (new LocaleConstraint()));
$errors = $validator->validate($language, (new LocaleConstraint(['canonicalize' => true])));
if (0 === \count($errors)) {
$request->getSession()->set('_locale', $language);

2
src/Wallabag/CoreBundle/Helper/ContentProxy.php
View file

@ -98,7 +98,7 @@ class ContentProxy
$errors = $this->validator->validate(
$value,
(new LocaleConstraint())
(new LocaleConstraint(['canonicalize' => true]))
);
if (0 === \count($errors)) {

2
tests/Wallabag/ApiBundle/Controller/ConfigRestControllerTest.php
View file

@ -31,7 +31,7 @@ class ConfigRestControllerTest extends WallabagApiTestCase
public function testGetConfigWithoutAuthentication()
{
$client = static::createClient();
$client = $this->createUnauthorizedClient();
$client->request('GET', '/api/config.json');
$this->assertSame(401, $client->getResponse()->getStatusCode());

10
tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php
View file

@ -30,7 +30,7 @@ class UserRestControllerTest extends WallabagApiTestCase
public function testGetUserWithoutAuthentication()
{
$client = static::createClient();
$client = $this->createUnauthorizedClient();
$client->request('GET', '/api/user.json');
$this->assertSame(401, $client->getResponse()->getStatusCode());
@ -80,7 +80,7 @@ class UserRestControllerTest extends WallabagApiTestCase
public function testCreateNewUserWithoutAuthentication()
{
// create a new client instead of using $this->client to be sure client isn't authenticated
$client = static::createClient();
$client = $this->createUnauthorizedClient();
$client->getContainer()->get(Config::class)->set('api_user_registration', 1);
$client->request('PUT', '/api/user.json', [
'username' => 'google',
@ -115,7 +115,7 @@ class UserRestControllerTest extends WallabagApiTestCase
public function testCreateNewUserWithExistingEmail()
{
$client = static::createClient();
$client = $this->createUnauthorizedClient();
$client->getContainer()->get(Config::class)->set('api_user_registration', 1);
$client->request('PUT', '/api/user.json', [
'username' => 'admin',
@ -144,7 +144,7 @@ class UserRestControllerTest extends WallabagApiTestCase
public function testCreateNewUserWithTooShortPassword()
{
$client = static::createClient();
$client = $this->createUnauthorizedClient();
$client->getContainer()->get(Config::class)->set('api_user_registration', 1);
$client->request('PUT', '/api/user.json', [
'username' => 'facebook',
@ -168,7 +168,7 @@ class UserRestControllerTest extends WallabagApiTestCase
public function testCreateNewUserWhenRegistrationIsDisabled()
{
$client = static::createClient();
$client = $this->createUnauthorizedClient();
$client->request('PUT', '/api/user.json', [
'username' => 'facebook',
'password' => 'face',

6
tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php
View file

@ -10,7 +10,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
public function testGetVersion()
{
// create a new client instead of using $this->client to be sure client isn't authenticated
$client = static::createClient();
$client = $this->createUnauthorizedClient();
$client->request('GET', '/api/version');
$this->assertSame(200, $client->getResponse()->getStatusCode());
@ -23,7 +23,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
public function testGetInfo()
{
// create a new client instead of using $this->client to be sure client isn't authenticated
$client = static::createClient();
$client = $this->createUnauthorizedClient();
$client->request('GET', '/api/info');
$this->assertSame(200, $client->getResponse()->getStatusCode());
@ -40,7 +40,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
public function testAllowedRegistration()
{
// create a new client instead of using $this->client to be sure client isn't authenticated
$client = static::createClient();
$client = $this->createUnauthorizedClient();
if (!$client->getContainer()->getParameter('fosuser_registration')) {
$this->markTestSkipped('fosuser_registration is not enabled.');

12
tests/Wallabag/ApiBundle/WallabagApiTestCase.php
View file

@ -31,12 +31,22 @@ abstract class WallabagApiTestCase extends WebTestCase
$this->client = $this->createAuthorizedClient();
}
/**
* @return KernelBrowser
*/
protected function createUnauthorizedClient()
{
static::ensureKernelShutdown();
return static::createClient();
}
/**
* @return KernelBrowser
*/
protected function createAuthorizedClient()
{
$client = static::createClient();
$client = $this->createUnauthorizedClient();
$container = $client->getContainer();
/** @var UserManager $userManager */

2
tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
View file

@ -76,7 +76,7 @@ class InstallCommandTest extends WallabagCoreTestCase
} else {
// Create a new client to avoid the error:
// Transaction commit failed because the transaction has been marked for rollback only.
$client = static::createClient();
$client = $this->getNewClient();
$this->resetDatabase($client);
}

2
tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
View file

@ -71,7 +71,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
* [Doctrine\DBAL\ConnectionException]
* Transaction commit failed because the transaction has been marked for rollback only.
*/
$this->client = static::createClient();
$this->client = $this->getNewClient();
}
public function getEntityManager()