mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-11 12:03:14 +00:00
Fix CS
This commit is contained in:
@@ -18,7 +18,6 @@ use Browser;
|
|||||||
use Doctrine\ORM\EntityManager;
|
use Doctrine\ORM\EntityManager;
|
||||||
use Alchemy\Phrasea\Model\Entities\Session;
|
use Alchemy\Phrasea\Model\Entities\Session;
|
||||||
use Symfony\Component\HttpFoundation\Session\SessionInterface;
|
use Symfony\Component\HttpFoundation\Session\SessionInterface;
|
||||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
|
||||||
|
|
||||||
class Authenticator
|
class Authenticator
|
||||||
{
|
{
|
||||||
|
@@ -12,7 +12,6 @@
|
|||||||
namespace Alchemy\Phrasea\Controller\Prod;
|
namespace Alchemy\Phrasea\Controller\Prod;
|
||||||
|
|
||||||
use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
|
use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
|
||||||
use Alchemy\Phrasea\Model\Entities\UserQuery;
|
|
||||||
use Silex\Application;
|
use Silex\Application;
|
||||||
use Silex\ControllerProviderInterface;
|
use Silex\ControllerProviderInterface;
|
||||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
|
@@ -91,7 +91,6 @@ class DisplaySettingService
|
|||||||
return $user->getSettings()->get($name)->getValue();
|
return $user->getSettings()->get($name)->getValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a user notification setting given a user.
|
* Return a user notification setting given a user.
|
||||||
*
|
*
|
||||||
@@ -104,7 +103,6 @@ class DisplaySettingService
|
|||||||
public function getUserNotificationSetting(User $user, $name, $default = true)
|
public function getUserNotificationSetting(User $user, $name, $default = true)
|
||||||
{
|
{
|
||||||
if (false === $user->getNotificationSettings()->containsKey($name)) {
|
if (false === $user->getNotificationSettings()->containsKey($name)) {
|
||||||
|
|
||||||
return $default;
|
return $default;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -12,7 +12,6 @@
|
|||||||
namespace Alchemy\Phrasea\Feed;
|
namespace Alchemy\Phrasea\Feed;
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
use Alchemy\Phrasea\Authentication\ACLProvider;
|
|
||||||
use Alchemy\Phrasea\Exception\LogicException;
|
use Alchemy\Phrasea\Exception\LogicException;
|
||||||
use Alchemy\Phrasea\Model\Entities\User;
|
use Alchemy\Phrasea\Model\Entities\User;
|
||||||
use Doctrine\Common\Collections\ArrayCollection;
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Alchemy\Phrasea\Model\Entities;
|
namespace Alchemy\Phrasea\Model\Entities;
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Gedmo\Mapping\Annotation as Gedmo;
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Alchemy\Phrasea\Model\Entities;
|
namespace Alchemy\Phrasea\Model\Entities;
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
use Doctrine\Common\Collections\ArrayCollection;
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Gedmo\Mapping\Annotation as Gedmo;
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Alchemy\Phrasea\Model\Entities;
|
namespace Alchemy\Phrasea\Model\Entities;
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Gedmo\Mapping\Annotation as Gedmo;
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Alchemy\Phrasea\Model\Entities;
|
namespace Alchemy\Phrasea\Model\Entities;
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Gedmo\Mapping\Annotation as Gedmo;
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Alchemy\Phrasea\Model\Entities;
|
namespace Alchemy\Phrasea\Model\Entities;
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Gedmo\Mapping\Annotation as Gedmo;
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Alchemy\Phrasea\Model\Entities;
|
namespace Alchemy\Phrasea\Model\Entities;
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Gedmo\Mapping\Annotation as Gedmo;
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Alchemy\Phrasea\Model\Entities;
|
namespace Alchemy\Phrasea\Model\Entities;
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Gedmo\Mapping\Annotation as Gedmo;
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Alchemy\Phrasea\Model\Entities;
|
namespace Alchemy\Phrasea\Model\Entities;
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Gedmo\Mapping\Annotation as Gedmo;
|
use Gedmo\Mapping\Annotation as Gedmo;
|
||||||
|
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Alchemy\Phrasea\Model\Entities;
|
namespace Alchemy\Phrasea\Model\Entities;
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
namespace Alchemy\Phrasea\Model;
|
namespace Alchemy\Phrasea\Model;
|
||||||
|
|
||||||
use Doctrine\ORM\EntityManager;
|
use Doctrine\ORM\EntityManager;
|
||||||
use Doctrine\ORM\Query\ResultSetMapping;
|
|
||||||
use Doctrine\ORM\Query\ResultSetMappingBuilder;
|
use Doctrine\ORM\Query\ResultSetMappingBuilder;
|
||||||
use Alchemy\Phrasea\Model\Entities\User;
|
use Alchemy\Phrasea\Model\Entities\User;
|
||||||
|
|
||||||
|
@@ -12,7 +12,6 @@
|
|||||||
namespace Alchemy\Phrasea\Model\Repositories;
|
namespace Alchemy\Phrasea\Model\Repositories;
|
||||||
|
|
||||||
use Doctrine\ORM\EntityRepository;
|
use Doctrine\ORM\EntityRepository;
|
||||||
use Alchemy\Phrasea\Model\Entities\User;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SessionRepository
|
* SessionRepository
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Alchemy\Phrasea\Model\Repositories;
|
namespace Alchemy\Phrasea\Model\Repositories;
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
use Alchemy\Phrasea\Model\Entities\User;
|
use Alchemy\Phrasea\Model\Entities\User;
|
||||||
use Alchemy\Phrasea\Model\Entities\UsrList;
|
use Alchemy\Phrasea\Model\Entities\UsrList;
|
||||||
use Doctrine\ORM\EntityRepository;
|
use Doctrine\ORM\EntityRepository;
|
||||||
|
@@ -10,7 +10,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
use Alchemy\Phrasea\Model\Entities\User;
|
|
||||||
|
|
||||||
class patch_381alpha3a implements patchInterface
|
class patch_381alpha3a implements patchInterface
|
||||||
{
|
{
|
||||||
|
@@ -244,7 +244,6 @@ class AuthenticatorTest extends \PhraseanetTestCase
|
|||||||
$session->set('usr_id', self::$DI['user']->getId());
|
$session->set('usr_id', self::$DI['user']->getId());
|
||||||
$session->set('session_id', 1);
|
$session->set('session_id', 1);
|
||||||
|
|
||||||
|
|
||||||
$authenticator = new Authenticator($app, $browser, $session, $app['EM']);
|
$authenticator = new Authenticator($app, $browser, $session, $app['EM']);
|
||||||
$this->assertTrue($authenticator->isAuthenticated());
|
$this->assertTrue($authenticator->isAuthenticated());
|
||||||
$this->assertEquals(self::$DI['user'], $authenticator->getUser());
|
$this->assertEquals(self::$DI['user'], $authenticator->getUser());
|
||||||
|
@@ -4,7 +4,6 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;
|
|||||||
|
|
||||||
use Alchemy\Phrasea\Model\Entities\Order;
|
use Alchemy\Phrasea\Model\Entities\Order;
|
||||||
use Alchemy\Phrasea\Model\Entities\OrderElement;
|
use Alchemy\Phrasea\Model\Entities\OrderElement;
|
||||||
use Alchemy\Phrasea\Application as SilexApplication;
|
|
||||||
|
|
||||||
class OrderTest extends \PhraseanetAuthenticatedWebTestCase
|
class OrderTest extends \PhraseanetAuthenticatedWebTestCase
|
||||||
{
|
{
|
||||||
|
@@ -2,13 +2,9 @@
|
|||||||
|
|
||||||
namespace Alchemy\Tests\Phrasea\Core\Provider;
|
namespace Alchemy\Tests\Phrasea\Core\Provider;
|
||||||
|
|
||||||
use Alchemy\Geonames\GeonamesServiceProvider;
|
|
||||||
use Alchemy\Phrasea\Application as PhraseaApplication;
|
|
||||||
use Alchemy\Phrasea\Core\Provider\ManipulatorServiceProvider;
|
|
||||||
use Alchemy\Phrasea\Core\Provider\TokensServiceProvider;
|
use Alchemy\Phrasea\Core\Provider\TokensServiceProvider;
|
||||||
use Alchemy\Phrasea\Core\Provider\AuthenticationManagerServiceProvider;
|
use Alchemy\Phrasea\Core\Provider\AuthenticationManagerServiceProvider;
|
||||||
use Alchemy\Phrasea\Core\Provider\ConfigurationServiceProvider;
|
use Alchemy\Phrasea\Core\Provider\ConfigurationServiceProvider;
|
||||||
use Silex\Application;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @covers Alchemy\Phrasea\Core\Provider\AuthenticationManagerServiceProvider
|
* @covers Alchemy\Phrasea\Core\Provider\AuthenticationManagerServiceProvider
|
||||||
|
@@ -1,8 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
use Doctrine\ORM\UnitOfWork;
|
|
||||||
|
|
||||||
class ACLTest extends \PhraseanetAuthenticatedTestCase
|
class ACLTest extends \PhraseanetAuthenticatedTestCase
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
@@ -1,7 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
|
||||||
|
|
||||||
require_once __DIR__ . '/Bridge_datas.inc';
|
require_once __DIR__ . '/Bridge_datas.inc';
|
||||||
|
|
||||||
class Bridge_AccountTest extends \PhraseanetAuthenticatedTestCase
|
class Bridge_AccountTest extends \PhraseanetAuthenticatedTestCase
|
||||||
|
@@ -1,7 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Silex\Application;
|
use Silex\Application;
|
||||||
use Symfony\Component\HttpKernel\Client;
|
|
||||||
use Symfony\Component\DomCrawler\Crawler;
|
use Symfony\Component\DomCrawler\Crawler;
|
||||||
|
|
||||||
abstract class PhraseanetAuthenticatedWebTestCase extends \PhraseanetAuthenticatedTestCase
|
abstract class PhraseanetAuthenticatedWebTestCase extends \PhraseanetAuthenticatedTestCase
|
||||||
|
Reference in New Issue
Block a user