diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php index 1e4fcb1764..f586a4f93a 100644 --- a/lib/Alchemy/Phrasea/Application.php +++ b/lib/Alchemy/Phrasea/Application.php @@ -256,7 +256,6 @@ class Application extends SilexApplication $this->register(new OrderServiceProvider()); $this->register(new WebhookServiceProvider()); - $this['monolog'] = $this->share( $this->extend('monolog', function (LoggerInterface $logger, Application $app) { @@ -274,7 +273,6 @@ class Application extends SilexApplication }) ); - $this['phraseanet.exception_handler'] = $this->share(function ($app) { /** @var PhraseaExceptionHandler $handler */ $handler = PhraseaExceptionHandler::register($app['debug']); diff --git a/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php index b99c41a979..fa816c9ef7 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php @@ -43,6 +43,7 @@ class LocaleServiceProvider implements ServiceProviderInterface if (0 === count($enabledLanguages)) { $app['monolog']->error('Wrong language configuration, no language activated'); + return $availableLanguages; } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php index 7245f53776..65832cf4dc 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php @@ -106,7 +106,6 @@ class UploadTest extends \PhraseanetAuthenticatedWebTestCase $record = new \record_adapter(self::$DI['app'], $id[0], $id[1]); $this->assertTrue($record->get_thumbnail()->is_physically_present()); - $zzz = $record->get_caption()->get_fields(); $fields = $record->get_caption()->get_fields(['FileName']); $field = array_pop($fields); $this->assertEquals('KIKOO.JPG', $field->get_serialized_values()); diff --git a/tests/classes/PhraseanetTestCase.php b/tests/classes/PhraseanetTestCase.php index 4b4e3bc37c..10a121af87 100644 --- a/tests/classes/PhraseanetTestCase.php +++ b/tests/classes/PhraseanetTestCase.php @@ -273,7 +273,6 @@ abstract class PhraseanetTestCase extends WebTestCase static $decodedFixtureIds; if (is_null($decodedFixtureIds)) { - $p = sys_get_temp_dir().'/fixtures.json'; $decodedFixtureIds = json_decode(file_get_contents(sys_get_temp_dir().'/fixtures.json'), true); } self::$fixtureIds = $decodedFixtureIds;