hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 03:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CS

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-12-24 15:18:34 +01:00
parent 5635553f71
commit 3b0fe2eb75
48 changed files with 66 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Authentication/Authenticator.php
View File

@@ -18,7 +18,6 @@ use Browser;
use Doctrine\ORM\EntityManager;
use Alchemy\Phrasea\Model\Entities\Session;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class Authenticator
{

2
lib/Alchemy/Phrasea/Controller/Admin/Dashboard.php
View File

@@ -152,7 +152,7 @@ class Dashboard implements ControllerProviderInterface
}
if ($admins > 0) {
$app['manipulator.user']->promote(array_filter(array_map(function($id) use ($app) {
$app['manipulator.user']->promote(array_filter(array_map(function ($id) use ($app) {
return $app['manipulator.user']->getRepository()->find($id);
}, $admins)));
$app['manipulator.acl']->resetAdminRights($app['manipulator.user']->getRepository()->findAdmins());

1
lib/Alchemy/Phrasea/Controller/Prod/Query.php
View File

@@ -12,7 +12,6 @@
namespace Alchemy\Phrasea\Controller\Prod;
use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
use Alchemy\Phrasea\Model\Entities\UserQuery;
use Silex\Application;
use Silex\ControllerProviderInterface;
use Symfony\Component\HttpFoundation\JsonResponse;

2
lib/Alchemy/Phrasea/Core/Configuration/DisplaySettingService.php
View File

@@ -91,7 +91,6 @@ class DisplaySettingService
return $user->getSettings()->get($name)->getValue();
}
/**
* Return a user notification setting given a user.
*
@@ -104,7 +103,6 @@ class DisplaySettingService
public function getUserNotificationSetting(User $user, $name, $default = true)
{
if (false === $user->getNotificationSettings()->containsKey($name)) {
return $default;
}

1
lib/Alchemy/Phrasea/Feed/Aggregate.php
View File

@@ -12,7 +12,6 @@
namespace Alchemy\Phrasea\Feed;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Authentication\ACLProvider;
use Alchemy\Phrasea\Exception\LogicException;
use Alchemy\Phrasea\Model\Entities\User;
use Doctrine\Common\Collections\ArrayCollection;

1
lib/Alchemy/Phrasea/Model/Entities/FeedPublisher.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Model\Entities;
use Alchemy\Phrasea\Application;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;

1
lib/Alchemy/Phrasea/Model/Entities/FtpExport.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Model\Entities;
use Alchemy\Phrasea\Application;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;

1
lib/Alchemy/Phrasea/Model/Entities/LazaretSession.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Model\Entities;
use Alchemy\Phrasea\Application;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;

1
lib/Alchemy/Phrasea/Model/Entities/Order.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Model\Entities;
use Alchemy\Phrasea\Application;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;

1
lib/Alchemy/Phrasea/Model/Entities/Session.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Model\Entities;
use Alchemy\Phrasea\Application;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;

1
lib/Alchemy/Phrasea/Model/Entities/UsrAuthProvider.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Model\Entities;
use Alchemy\Phrasea\Application;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;

1
lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Model\Entities;
use Alchemy\Phrasea\Application;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;

1
lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Model\Entities;
use Alchemy\Phrasea\Application;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;

1
lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Model\Entities;
use Alchemy\Phrasea\Application;
use Doctrine\ORM\Mapping as ORM;
/**

2
lib/Alchemy/Phrasea/Model/Manipulator/ACLManipulator.php
View File

@@ -46,7 +46,7 @@ class ACLManipulator implements ManipulatorInterface
*/
public function resetAdminRights($users)
{
foreach($this->makeTraversable($users) as $user) {
foreach ($this->makeTraversable($users) as $user) {
$this->doResetAdminRights($user);
}
}

1
lib/Alchemy/Phrasea/Model/NativeQueryProvider.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Model;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\ORM\Query\ResultSetMappingBuilder;
use Alchemy\Phrasea\Model\Entities\User;

1
lib/Alchemy/Phrasea/Model/Repositories/SessionRepository.php
View File

@@ -12,7 +12,6 @@
namespace Alchemy\Phrasea\Model\Repositories;
use Doctrine\ORM\EntityRepository;
use Alchemy\Phrasea\Model\Entities\User;
/**
* SessionRepository

1
lib/Alchemy/Phrasea/Model/Repositories/UsrListRepository.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Model\Repositories;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\User;
use Alchemy\Phrasea\Model\Entities\UsrList;
use Doctrine\ORM\EntityRepository;

1
lib/classes/patch/381alpha3a.php
View File

@@ -10,7 +10,6 @@
*/
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\User;
class patch_381alpha3a implements patchInterface
{

1
tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
View File

@@ -244,7 +244,6 @@ class AuthenticatorTest extends \PhraseanetTestCase
$session->set('usr_id', self::$DI['user']->getId());
$session->set('session_id', 1);
$authenticator = new Authenticator($app, $browser, $session, $app['EM']);
$this->assertTrue($authenticator->isAuthenticated());
$this->assertEquals(self::$DI['user'], $authenticator->getUser());

2
tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminDashboardTest.php
View File

@@ -110,7 +110,7 @@ class AdminDashboardTest extends \PhraseanetAuthenticatedWebTestCase
{
$this->setAdmin(true);
$admins = array_map(function(User $user) {
$admins = array_map(function (User $user) {
return $user->getId();
}, self::$DI['app']['manipulator.user']->getRepository()->findAdmins());

1
tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php
View File

@@ -4,7 +4,6 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;
use Alchemy\Phrasea\Model\Entities\Order;
use Alchemy\Phrasea\Model\Entities\OrderElement;
use Alchemy\Phrasea\Application as SilexApplication;
class OrderTest extends \PhraseanetAuthenticatedWebTestCase
{

2
tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php
View File

@@ -214,7 +214,7 @@ class RecordsRequestTest extends \PhraseanetAuthenticatedTestCase
$serialized = $records->serializedList();
$exploded = explode(';', $serialized);
$expected = '';
foreach($story->getRecord(self::$DI['app'])->get_children() as $record) {
foreach ($story->getRecord(self::$DI['app'])->get_children() as $record) {
$expected .= $expected === '' ? $record->get_serialize_key() : ';' . $record->get_serialize_key();
}
$this->assertEquals($expected, $serialized);

4
tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
View File

@@ -1800,7 +1800,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
self::$termsOfUse[$databox->get_sbas_id()] = $databox->get_cgus();
foreach( self::$termsOfUse[$databox->get_sbas_id()]as $lng => $tou) {
foreach ( self::$termsOfUse[$databox->get_sbas_id()]as $lng => $tou) {
$databox->update_cgus($lng, '', false);
}
}
@@ -1814,7 +1814,7 @@ class LoginTest extends \PhraseanetAuthenticatedWebTestCase
foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
self::$termsOfUse[$databox->get_sbas_id()] = $databox->get_cgus();
foreach( self::$termsOfUse[$databox->get_sbas_id()]as $lng => $tou) {
foreach ( self::$termsOfUse[$databox->get_sbas_id()]as $lng => $tou) {
$databox->update_cgus($lng, 'something', false);
}
}

6
tests/Alchemy/Tests/Phrasea/Core/Provider/AuthenticationManagerServiceProviderTest.php
View File

@@ -2,13 +2,9 @@
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\AuthenticationManagerServiceProvider;
use Alchemy\Phrasea\Core\Provider\ConfigurationServiceProvider;
use Silex\Application;
/**
* @covers Alchemy\Phrasea\Core\Provider\AuthenticationManagerServiceProvider
@@ -156,7 +152,7 @@ class AuthenticationManagerServiceProviderTest extends ServiceProviderTestCase
self::$DI['app']['conf']->set(['authentication', 'auto-create'], ['templates' => [$template1->getId(), $template2->getId()]]);
$this->assertEquals([$template1->getLogin(), $template2->getLogin()], array_map(function($u) {
$this->assertEquals([$template1->getLogin(), $template2->getLogin()], array_map(function ($u) {
return $u->getLogin();
}, self::$DI['app']['authentication.providers.account-creator']->getTemplates()));

3
tests/classes/ACLTest.php
View File

@@ -1,8 +1,5 @@
<?php
use Alchemy\Phrasea\Application;
use Doctrine\ORM\UnitOfWork;
class ACLTest extends \PhraseanetAuthenticatedTestCase
{
/**

2
tests/classes/Bridge/AccountTest.php
View File

@@ -1,7 +1,5 @@
<?php
use Alchemy\Phrasea\Application;
require_once __DIR__ . '/Bridge_datas.inc';
class Bridge_AccountTest extends \PhraseanetAuthenticatedTestCase

1
tests/classes/PhraseanetAuthenticatedWebTestCase.php
View File

@@ -1,7 +1,6 @@
<?php
use Silex\Application;
use Symfony\Component\HttpKernel\Client;
use Symfony\Component\DomCrawler\Crawler;
abstract class PhraseanetAuthenticatedWebTestCase extends \PhraseanetAuthenticatedTestCase

4
tests/classes/PhraseanetTestCase.php
View File

@@ -289,7 +289,7 @@ abstract class PhraseanetTestCase extends WebTestCase
$app['translator'] = $this->createTranslatorMock();
$app['EM'] = $app->share(function($app) {
$app['EM'] = $app->share(function ($app) {
return $app['EM.test'];
});
@@ -305,7 +305,7 @@ abstract class PhraseanetTestCase extends WebTestCase
return $em;
});
$app['EM.prod'] = $app->share(function($app){
$app['EM.prod'] = $app->share(function ($app) {
try {
$em = EntityManager::create($app['conf']->get(['main', 'database']), $app['EM.config'], $app['EM.events-manager']);
} catch (\Exception $e) {