This commit is contained in:
Romain Neutron
2013-12-03 20:59:47 +01:00
parent ae12a88437
commit 1af21b88ef
11 changed files with 9 additions and 22 deletions

View File

@@ -314,7 +314,7 @@ class Application extends SilexApplication
], ],
]); ]);
$this['translator'] = $this->share($this->extend('translator', function(CachedTranslator $translator, $app) { $this['translator'] = $this->share($this->extend('translator', function (CachedTranslator $translator, $app) {
$translator->addResource('xliff', __DIR__.'/../../../resources/locales/messages.fr.xliff', 'fr', 'messages'); $translator->addResource('xliff', __DIR__.'/../../../resources/locales/messages.fr.xliff', 'fr', 'messages');
$translator->addResource('xliff', __DIR__.'/../../../resources/locales/validators.fr.xliff', 'fr', 'validators'); $translator->addResource('xliff', __DIR__.'/../../../resources/locales/validators.fr.xliff', 'fr', 'validators');
$translator->addResource('xliff', __DIR__.'/../../../resources/locales/messages.en.xliff', 'en', 'messages'); $translator->addResource('xliff', __DIR__.'/../../../resources/locales/messages.en.xliff', 'en', 'messages');

View File

@@ -41,7 +41,7 @@ interface CheckerInterface
/** /**
* Get a localized message about the Checker * Get a localized message about the Checker
* *
* @param TranslatorInterface $translator A translator * @param TranslatorInterface $translator A translator
* *
* @return string * @return string
*/ */

View File

@@ -12,7 +12,6 @@
namespace Alchemy\Phrasea\Command\Developer; namespace Alchemy\Phrasea\Command\Developer;
use Alchemy\Phrasea\Command\Command; use Alchemy\Phrasea\Command\Command;
use Doctrine\Common\Annotations\DocParser;
use JMS\TranslationBundle\Translation\ConfigBuilder; use JMS\TranslationBundle\Translation\ConfigBuilder;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;

View File

@@ -12,11 +12,9 @@
namespace Alchemy\Phrasea\Core\CLIProvider; namespace Alchemy\Phrasea\Core\CLIProvider;
use Alchemy\Phrasea\Command\Developer\Utils\ConstraintExtractor; use Alchemy\Phrasea\Command\Developer\Utils\ConstraintExtractor;
use Doctrine\Common\Annotations\AnnotationReader;
use Doctrine\Common\Annotations\DocParser; use Doctrine\Common\Annotations\DocParser;
use Doctrine\Common\Annotations\AnnotationRegistry; use Doctrine\Common\Annotations\AnnotationRegistry;
use Gedmo\SoftDeleteable\Mapping\Driver\Annotation; use Gedmo\SoftDeleteable\Mapping\Driver\Annotation;
use JMS\TranslationBundle\Translation\ConfigBuilder;
use JMS\TranslationBundle\Translation\Dumper\SymfonyDumperAdapter; use JMS\TranslationBundle\Translation\Dumper\SymfonyDumperAdapter;
use JMS\TranslationBundle\Translation\Dumper\XliffDumper; use JMS\TranslationBundle\Translation\Dumper\XliffDumper;
use JMS\TranslationBundle\Translation\Extractor\File\DefaultPhpFileExtractor; use JMS\TranslationBundle\Translation\Extractor\File\DefaultPhpFileExtractor;
@@ -30,12 +28,10 @@ use JMS\TranslationBundle\Translation\Loader\SymfonyLoaderAdapter;
use JMS\TranslationBundle\Translation\Loader\XliffLoader; use JMS\TranslationBundle\Translation\Loader\XliffLoader;
use JMS\TranslationBundle\Translation\LoaderManager; use JMS\TranslationBundle\Translation\LoaderManager;
use JMS\TranslationBundle\Translation\Updater; use JMS\TranslationBundle\Translation\Updater;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Translation\Dumper\PoFileDumper; use Symfony\Component\Translation\Dumper\PoFileDumper;
use Symfony\Component\Translation\Loader\PoFileLoader; use Symfony\Component\Translation\Loader\PoFileLoader;
use Silex\Application; use Silex\Application;
use Silex\ServiceProviderInterface; use Silex\ServiceProviderInterface;
use Symfony\Component\Process\PhpExecutableFinder;
class TranslationExtractorServiceProvider implements ServiceProviderInterface class TranslationExtractorServiceProvider implements ServiceProviderInterface
{ {

View File

@@ -75,9 +75,9 @@ class DisplaySettingService
/** /**
* Return a user setting given a user. * Return a user setting given a user.
* *
* @param User $user * @param User $user
* @param string $name * @param string $name
* @param mixed $default * @param mixed $default
* *
* @return mixed * @return mixed
*/ */
@@ -96,7 +96,7 @@ class DisplaySettingService
* Returns application setting value. * Returns application setting value.
* *
* @param string|array $props * @param string|array $props
* @param mixed $default * @param mixed $default
* *
* @return mixed * @return mixed
*/ */

View File

@@ -12,7 +12,6 @@
namespace Alchemy\Phrasea\Setup\Requirements; namespace Alchemy\Phrasea\Setup\Requirements;
use Alchemy\Phrasea\Setup\RequirementCollection; use Alchemy\Phrasea\Setup\RequirementCollection;
use Alchemy\Phrasea\Application as PhraseaApplication;
class LocalesRequirements extends RequirementCollection implements RequirementInterface class LocalesRequirements extends RequirementCollection implements RequirementInterface
{ {

View File

@@ -9,7 +9,6 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
use Symfony\Component\Routing\Generator\UrlGenerator;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
interface Bridge_Api_Interface interface Bridge_Api_Interface

View File

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

View File

@@ -4,7 +4,6 @@ namespace Alchemy\Tests\Phrasea\Model\Entities;
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Model\Entities\User; use Alchemy\Phrasea\Model\Entities\User;
use Alchemy\Phrasea\Model\Entities\UserSetting;
class UserTest extends \PhraseanetPHPUnitAbstract class UserTest extends \PhraseanetPHPUnitAbstract
{ {

View File

@@ -2,10 +2,6 @@
namespace Alchemy\Tests\Phrasea\Model\Manipulator; namespace Alchemy\Tests\Phrasea\Model\Manipulator;
use Alchemy\Phrasea\Model\Entities\UserNotificationSetting;
use Alchemy\Phrasea\Model\Entities\UserQuery;
use Alchemy\Phrasea\Model\Entities\UserSetting;
class UserManagerTest extends \PhraseanetPHPUnitAbstract class UserManagerTest extends \PhraseanetPHPUnitAbstract
{ {
public function testNewUser() public function testNewUser()

View File

@@ -789,9 +789,9 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
/** /**
* Inserts one user. * Inserts one user.
* *
* @param string $login * @param string $login
* @param null $email * @param null $email
* @param bool $admin * @param bool $admin
* *
* @return User * @return User
*/ */
@@ -806,7 +806,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
* @param string $method The request method * @param string $method The request method
* @param string $uri The URI to fetch * @param string $uri The URI to fetch
* @param array $parameters The Request parameters * @param array $parameters The Request parameters
* @param string $httpAccept Contents of the Accept header * @param string $httpAccept Contents of the Accept header
* *
* @return Crawler * @return Crawler
*/ */