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

Fix CS

Browse Source
This commit is contained in:
Romain Neutron
2013-11-18 13:07:40 +01:00
parent aeac80a52f
commit d40b1d4fb1
22 changed files with 26 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Controller/Lightbox.php
View File

@@ -331,7 +331,6 @@ class Lightbox implements ControllerProviderInterface
->assert('entry_id', '\d+'); ->assert('entry_id', '\d+');
$controllers->get('/ajax/LOAD_REPORT/{basket}/', function (SilexApplication $app, Basket $basket) { $controllers->get('/ajax/LOAD_REPORT/{basket}/', function (SilexApplication $app, Basket $basket) {
return new Response($app['twig']->render('lightbox/basket_content_report.html.twig', array('basket' => $basket))); return new Response($app['twig']->render('lightbox/basket_content_report.html.twig', array('basket' => $basket)));
}) })
->bind('lightbox_ajax_report') ->bind('lightbox_ajax_report')

1
lib/Alchemy/Phrasea/Core/Provider/CacheServiceProvider.php
View File

@@ -15,7 +15,6 @@ use Alchemy\Phrasea\Cache\Manager as CacheManager;
use Silex\Application; use Silex\Application;
use Silex\ServiceProviderInterface; use Silex\ServiceProviderInterface;
use Alchemy\Phrasea\Core\Configuration\Compiler; use Alchemy\Phrasea\Core\Configuration\Compiler;
use Alchemy\Phrasea\Cache\ConnectionFactory;
use Alchemy\Phrasea\Cache\Factory; use Alchemy\Phrasea\Cache\Factory;
class CacheServiceProvider implements ServiceProviderInterface class CacheServiceProvider implements ServiceProviderInterface

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

@@ -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 Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManager;
use Alchemy\Phrasea\Model\Entities\AggregateToken; use Alchemy\Phrasea\Model\Entities\AggregateToken;

3
lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
View File

@@ -11,11 +11,8 @@
namespace Alchemy\Phrasea\Model\Repositories; namespace Alchemy\Phrasea\Model\Repositories;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\Basket; use Alchemy\Phrasea\Model\Entities\Basket;
use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityRepository;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* *

2
lib/Alchemy/Phrasea/TaskManager/Log/LogFileFactory.php
View File

@@ -13,7 +13,7 @@ namespace Alchemy\Phrasea\TaskManager\Log;
use Alchemy\Phrasea\Model\Entities\Task; use Alchemy\Phrasea\Model\Entities\Task;
class LogFilefactory class LogFileFactory
{ {
private $root; private $root;

14
lib/classes/module/console/checkExtension.php
View File

@@ -202,11 +202,9 @@ class module_console_checkExtension extends Command
return 1; return 1;
} }
// test disconnected mode if available // test disconnected mode if available
// prepare the test before closing session // prepare the test before closing session
if(function_exists("phrasea_public_query")) if (function_exists("phrasea_public_query")) {
{
// fill an array for each sbas to query // fill an array for each sbas to query
$tbases = array(); $tbases = array();
foreach ($phSession["bases"] as $phbase) { foreach ($phSession["bases"] as $phbase) {
@@ -231,7 +229,6 @@ class module_console_checkExtension extends Command
} }
} }
$output->writeln("\n-- phrasea_close_session --"); $output->writeln("\n-- phrasea_close_session --");
$rs = phrasea_close_session($sessid); $rs = phrasea_close_session($sessid);
@@ -244,11 +241,8 @@ class module_console_checkExtension extends Command
return 1; return 1;
} }
// session is closed, test disconnected mode if available // session is closed, test disconnected mode if available
if(function_exists("phrasea_public_query")) if (function_exists("phrasea_public_query")) {
{
$output->writeln("\n-- phrasea_public_query(...0, 5,...) --"); $output->writeln("\n-- phrasea_public_query(...0, 5,...) --");
$ret = phrasea_public_query( $ret = phrasea_public_query(
@@ -270,9 +264,7 @@ class module_console_checkExtension extends Command
return 1; return 1;
} }
foreach ($ret['results'] as $result) {
foreach($ret['results'] as $result)
{
$sbid = $result["sbid"]; $sbid = $result["sbid"];
$rid = $result["rid"]; $rid = $result["rid"];
$q = $tbases["S".$sbid]["arrayq"]; // query tree $q = $tbases["S".$sbid]["arrayq"]; // query tree

3
tests/Alchemy/Tests/Phrasea/Authentication/ACLProviderTest.php
View File

@@ -2,9 +2,6 @@
namespace Alchemy\Tests\Phrasea\Authentication; namespace Alchemy\Tests\Phrasea\Authentication;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Authentication\ACLProvider;
class ACLProviderTest extends \PhraseanetPHPUnitAbstract class ACLProviderTest extends \PhraseanetPHPUnitAbstract
{ {
public function testGetACL() public function testGetACL()

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/ShareTest.php
View File

@@ -40,7 +40,6 @@ class ShareTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
->method('has_access_to_subdef') ->method('has_access_to_subdef')
->will($this->returnValue(true)); ->will($this->returnValue(true));
$aclProvider = $this->getMockBuilder('Alchemy\Phrasea\Authentication\ACLProvider') $aclProvider = $this->getMockBuilder('Alchemy\Phrasea\Authentication\ACLProvider')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
@@ -82,7 +81,6 @@ class ShareTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
->method('has_access_to_subdef') ->method('has_access_to_subdef')
->will($this->returnValue(false)); ->will($this->returnValue(false));
$aclProvider = $this->getMockBuilder('Alchemy\Phrasea\Authentication\ACLProvider') $aclProvider = $this->getMockBuilder('Alchemy\Phrasea\Authentication\ACLProvider')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();

1
tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
View File

@@ -113,7 +113,6 @@ class SetupTest extends \PhraseanetWebTestCaseAbstract
->method('get_granted_sbas') ->method('get_granted_sbas')
->will($this->returnValue(array())); ->will($this->returnValue(array()));
$aclProvider = $this->getMockBuilder('Alchemy\Phrasea\Authentication\ACLProvider') $aclProvider = $this->getMockBuilder('Alchemy\Phrasea\Authentication\ACLProvider')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();

3
tests/Alchemy/Tests/Phrasea/Core/Middleware/MiddlewareProviderTestCase.php
View File

@@ -2,9 +2,6 @@
namespace Alchemy\Tests\Phrasea\Core\Middleware; namespace Alchemy\Tests\Phrasea\Core\Middleware;
use Alchemy\Phrasea\Application;
use Symfony\Component\HttpFoundation\Request;
abstract class MiddlewareProviderTestCase extends \PhraseanetPHPUnitAbstract abstract class MiddlewareProviderTestCase extends \PhraseanetPHPUnitAbstract
{ {
/** /**

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

@@ -2,12 +2,6 @@
namespace Alchemy\Tests\Phrasea\Core\Provider; namespace Alchemy\Tests\Phrasea\Core\Provider;
use Alchemy\Phrasea\Application as PhraseaApplication;
use Alchemy\Phrasea\Core\Provider\TokensServiceProvider;
use Alchemy\Phrasea\Core\Provider\AuthenticationManagerServiceProvider;
use Alchemy\Phrasea\Core\Provider\ConfigurationServiceProvider;
use Silex\Application;
class ACLServiceProvidertest extends ServiceProviderTestCase class ACLServiceProvidertest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()

1
tests/Alchemy/Tests/Phrasea/Model/Converter/BasketConverterTest.php
View File

@@ -3,7 +3,6 @@
namespace Alchemy\Phrasea\Model\Converter; namespace Alchemy\Phrasea\Model\Converter;
use Alchemy\Phrasea\Model\Converter\BasketConverter; use Alchemy\Phrasea\Model\Converter\BasketConverter;
use Alchemy\Phrasea\Model\Entities\Task;
class BasketConverterTest extends \PhraseanetPHPUnitAbstract class BasketConverterTest extends \PhraseanetPHPUnitAbstract
{ {

2
tests/Alchemy/Tests/Phrasea/Model/Manipulator/ACLManipulatorTest.php
View File

@@ -11,8 +11,6 @@
namespace Alchemy\Tests\Phrasea\Model\Manipulator; namespace Alchemy\Tests\Phrasea\Model\Manipulator;
use Alchemy\Phrasea\Exception\InvalidArgumentException;
class ACLManipulatorTest extends \PhraseanetPHPUnitAbstract class ACLManipulatorTest extends \PhraseanetPHPUnitAbstract
{ {
public function testResetAdminRights() public function testResetAdminRights()

1
tests/classes/api/v1/api_v1_adapterTest.php
View File

@@ -2,7 +2,6 @@
use Alchemy\Phrasea\Border\File as BorderFile; use Alchemy\Phrasea\Border\File as BorderFile;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
{ {