diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index d0e5acebc..67e3bc3c9 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -18,7 +18,7 @@ $finder ->notPath('tests/app') ->ignoreDotFiles(true) ->name('**.php') - ; +; $config = new PhpCsFixer\Config(); $config diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php index b7d5fcbd2..798ae77b4 100644 --- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php +++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php @@ -651,8 +651,8 @@ final class ActivityController extends AbstractController throw $this->createNotFoundException('Accompanying Period not found'); } - // TODO Add permission - // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person); + // TODO Add permission + // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person); } else { throw $this->createNotFoundException('Person or Accompanying Period not found'); } diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php index dbbeb2715..b4b23dc0b 100644 --- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php +++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php @@ -58,7 +58,8 @@ class DateAggregator implements AggregatorInterface break; case 'year': - $fmt = 'YYYY'; $order = 'DESC'; + $fmt = 'YYYY'; + $order = 'DESC'; break; // order DESC does not works ! diff --git a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php index 77444e414..6d25b4e22 100644 --- a/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php +++ b/src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/ListActivity.php @@ -73,7 +73,7 @@ class ListActivity implements ListInterface, GroupedExportInterface }; case 'scopesNames': - return $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY . 'course circles'); + return $this->translatableStringExportLabelHelper->getLabelMulti($key, $values, ListActivityHelper::MSG_KEY . 'course circles'); default: return $this->helper->getLabels($key, $values, $data); diff --git a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php index 03af9e083..27985eed1 100644 --- a/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php +++ b/src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php @@ -53,6 +53,11 @@ class ResourceKindRepository implements ObjectRepository ->getResult(); } + public function findOneByKind(string $kind): ?ResourceKind + { + return $this->repository->findOneBy(['kind' => $kind]) ; + } + /** * @return ResourceType[] */ diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php index 0f112cf36..56373ca17 100644 --- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php +++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php @@ -512,7 +512,9 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente */ public function getUsers(): Collection { - return $this->getInvites()->map(static function (Invite $i) { return $i->getUser(); }); + return $this->getInvites()->map(static function (Invite $i) { + return $i->getUser(); + }); } public function hasCalendarRange(): bool @@ -597,7 +599,9 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente } $invite = $this->invites - ->filter(static function (Invite $invite) use ($user) { return $invite->getUser() === $user; }) + ->filter(static function (Invite $invite) use ($user) { + return $invite->getUser() === $user; + }) ->first(); $this->removeInvite($invite); diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php index 361fd33c2..9bcc0c434 100644 --- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php +++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarToRemoteHandler.php @@ -89,10 +89,14 @@ class CalendarToRemoteHandler implements MessageHandlerInterface $newInvites = array_filter( array_map( - function ($id) { return $this->inviteRepository->find($id); }, + function ($id) { + return $this->inviteRepository->find($id); + }, $calendarMessage->getNewInvitesIds(), ), - static function (?Invite $invite) { return null !== $invite; } + static function (?Invite $invite) { + return null !== $invite; + } ); $this->calendarConnector->syncCalendar( diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php index c376f9680..df996b7ad 100644 --- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php +++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php @@ -167,7 +167,9 @@ class MSGraphRemoteCalendarConnector implements RemoteCalendarConnectorInterface ] )->toArray(); - $ids = array_map(static function ($item) { return $item['id']; }, $bareEvents['value']); + $ids = array_map(static function ($item) { + return $item['id']; + }, $bareEvents['value']); $existingIdsInRange = $this->calendarRangeRepository->findRemoteIdsPresent($ids); $existingIdsInCalendar = $this->calendarRepository->findRemoteIdsPresent($ids); diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php index 6861df341..7c6ef4e13 100644 --- a/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php +++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarACLAwareRepository.php @@ -215,7 +215,7 @@ class CalendarACLAwareRepository implements CalendarACLAwareRepositoryInterface $qb ->where( $qb->expr()->orX( - // the calendar where the person is the main person: + // the calendar where the person is the main person: $qb->expr()->eq('c.person', ':person'), // when the calendar is in a reachable period, and contains person $qb->expr()->andX( diff --git a/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php b/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php index 3ddc2e836..80b2f8c45 100644 --- a/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php +++ b/src/Bundle/ChillCalendarBundle/Tests/Form/CalendarTypeTest.php @@ -96,7 +96,7 @@ final class CalendarTypeTest extends TypeTestCase ]; $calendar = new Calendar(); - $calendar->setMainUser(new class() extends User { + $calendar->setMainUser(new class () extends User { public function getId() { return '1'; @@ -114,8 +114,12 @@ final class CalendarTypeTest extends TypeTestCase $this->assertEquals(8, $calendar->getCalendarRange()->getId()); $this->assertEquals(9, $calendar->getLocation()->getId()); $this->assertEquals(true, $calendar->getSendSMS()); - $this->assertContains(2, $calendar->getUsers()->map(static function (User $u) { return $u->getId(); })); - $this->assertContains(3, $calendar->getUsers()->map(static function (User $u) { return $u->getId(); })); + $this->assertContains(2, $calendar->getUsers()->map(static function (User $u) { + return $u->getId(); + })); + $this->assertContains(3, $calendar->getUsers()->map(static function (User $u) { + return $u->getId(); + })); } protected function getExtensions() @@ -147,7 +151,9 @@ final class CalendarTypeTest extends TypeTestCase ->will(static function ($args) { return implode( ',', - array_map(static function ($p) { return $p->getId(); }, $args[0]) + array_map(static function ($p) { + return $p->getId(); + }, $args[0]) ); }); $transformer->transform(Argument::exact(null)) @@ -156,7 +162,9 @@ final class CalendarTypeTest extends TypeTestCase ->will(static function ($args) { return implode( ',', - array_map(static function ($p) { return $p->getId(); }, $args[0]->toArray()) + array_map(static function ($p) { + return $p->getId(); + }, $args[0]->toArray()) ); }); $transformer->reverseTransform(Argument::type('string')) diff --git a/src/Bundle/ChillEventBundle/Search/EventSearch.php b/src/Bundle/ChillEventBundle/Search/EventSearch.php index 8f72cc4ed..90eca34bc 100644 --- a/src/Bundle/ChillEventBundle/Search/EventSearch.php +++ b/src/Bundle/ChillEventBundle/Search/EventSearch.php @@ -174,8 +174,8 @@ class EventSearch extends AbstractSearch } if ( - (isset($terms['name']) || isset($terms['_default'])) - && (!empty($terms['name']) || !empty($terms['_default'])) + (isset($terms['name']) || isset($terms['_default'])) + && (!empty($terms['name']) || !empty($terms['_default'])) ) { // the form with name:"xyz" has precedence $name = $terms['name'] ?? $terms['_default']; diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php index f2876eefb..88a4869cc 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php @@ -50,8 +50,8 @@ class LoadLanguages extends AbstractFixture implements ContainerAwareInterface, foreach (Intl::getLanguageBundle()->getLanguageNames() as $code => $language) { if ( - !in_array($code, $this->regionalVersionToInclude, true) - && !in_array($code, $this->ancientToExclude, true) + !in_array($code, $this->regionalVersionToInclude, true) + && !in_array($code, $this->ancientToExclude, true) ) { $lang = (new Language()) ->setId($code) diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php index 2f622878a..9631900ab 100644 --- a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php @@ -274,7 +274,7 @@ class Configuration implements ConfigurationInterface ->end() ->end() // end of root/children ->end() // end of root -; + ; $rootNode->children() ->arrayNode('add_address')->addDefaultsIfNotSet()->children() diff --git a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php index 5cc50f185..cc215e7aa 100644 --- a/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php +++ b/src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php @@ -42,7 +42,9 @@ class IdToEntityDataTransformer implements DataTransformerInterface { $this->repository = $repository; $this->multiple = $multiple; - $this->getId = $getId ?? static function (object $o) { return $o->getId(); }; + $this->getId = $getId ?? static function (object $o) { + return $o->getId(); + }; } /** diff --git a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php index e01c7d4b6..a82c61fdc 100644 --- a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php +++ b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php @@ -137,8 +137,8 @@ class WorkflowStepType extends AbstractType $meta = $workflow->getMetadataStore()->getPlaceMetadata($to); if ( - !array_key_exists('isFinal', $meta) || false === $meta['isFinal'] - ) { + !array_key_exists('isFinal', $meta) || false === $meta['isFinal'] + ) { $toFinal = false; } } diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php index 6e1c077cf..e6e0863a2 100644 --- a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php +++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php @@ -124,12 +124,12 @@ class PaginatorFactory return array_merge( $this->router->getContext()->getParameters(), // get the route parameters - $this->requestStack - ->getCurrentRequest() - ->attributes->get('_route_params'), + $this->requestStack + ->getCurrentRequest() + ->attributes->get('_route_params'), // get the query parameters - $this->requestStack - ->getCurrentRequest()->query->all() + $this->requestStack + ->getCurrentRequest()->query->all() ); } } diff --git a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php index 701b3d14e..77f5aa1e1 100644 --- a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php @@ -267,15 +267,15 @@ final class ExportManagerTest extends KernelTestCase ) ->willReturn(static function ($value) { switch ($value) { - case 0: - case 1: - return $value; + case 0: + case 1: + return $value; - case '_header': - return 'export'; + case '_header': + return 'export'; - default: throw new RuntimeException(sprintf('The value %s is not valid', $value)); - } + default: throw new RuntimeException(sprintf('The value %s is not valid', $value)); + } }); $export->getQueryKeys(Argument::Type('array'))->willReturn(['export']); @@ -307,15 +307,15 @@ final class ExportManagerTest extends KernelTestCase ) ->willReturn(static function ($value) { switch ($value) { - case '_header': return 'foo_header'; + case '_header': return 'foo_header'; - case 'cat a': return 'label cat a'; + case 'cat a': return 'label cat a'; - case 'cat b': return 'label cat b'; + case 'cat b': return 'label cat b'; - default: - throw new RuntimeException(sprintf('This value (%s) is not valid', $value)); - } + default: + throw new RuntimeException(sprintf('This value (%s) is not valid', $value)); + } }); $aggregator->addRole()->willReturn(null); //$aggregator->addRole()->shouldBeCalled(); diff --git a/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php b/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php index 2d2cb8e95..99815d130 100644 --- a/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Form/DataTransformer/IdToEntityDataTransformerTest.php @@ -77,13 +77,13 @@ final class IdToEntityDataTransformerTest extends TestCase public function testTransformMulti() { - $o1 = new class() { + $o1 = new class () { public function getId() { return 1; } }; - $o2 = new class() { + $o2 = new class () { public function getId() { return 2; @@ -104,7 +104,7 @@ final class IdToEntityDataTransformerTest extends TestCase public function testTransformSingle() { - $o = new class() { + $o = new class () { public function getId() { return 1; diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php index 7e6710a20..30d50fca5 100644 --- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/DefaultScopeResolverTest.php @@ -33,7 +33,7 @@ final class DefaultScopeResolverTest extends TestCase public function testHasScopeInterface() { $scope = new Scope(); - $entity = new class($scope) implements HasScopeInterface { + $entity = new class ($scope) implements HasScopeInterface { public function __construct(Scope $scope) { $this->scope = $scope; @@ -52,7 +52,7 @@ final class DefaultScopeResolverTest extends TestCase public function testHasScopesInterface() { - $entity = new class($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface { + $entity = new class ($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface { public function __construct(Scope $scopeA, Scope $scopeB) { $this->scopes = [$scopeA, $scopeB]; diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php index e2c5d3879..31e5229bb 100644 --- a/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Security/Resolver/ScopeResolverDispatcherTest.php @@ -34,7 +34,7 @@ final class ScopeResolverDispatcherTest extends TestCase public function testHasScopeInterface() { $scope = new Scope(); - $entity = new class($scope) implements HasScopeInterface { + $entity = new class ($scope) implements HasScopeInterface { public function __construct(Scope $scope) { $this->scope = $scope; @@ -52,7 +52,7 @@ final class ScopeResolverDispatcherTest extends TestCase public function testHasScopesInterface() { - $entity = new class($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface { + $entity = new class ($scopeA = new Scope(), $scopeB = new Scope()) implements HasScopesInterface { public function __construct(Scope $scopeA, Scope $scopeB) { $this->scopes = [$scopeA, $scopeB]; diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php b/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php index 8f783ff8f..09620d2a9 100644 --- a/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php +++ b/src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php @@ -63,18 +63,18 @@ class RoleScopeScopePresence extends ConstraintValidator //if the role scope should have a scope if ( - !in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true) - && $value->getScope() === null - ) { + !in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true) + && $value->getScope() === null + ) { $this->context->buildViolation($constraint->messagePresenceRequired) ->setParameter('%role%', $this->translator->trans($value->getRole())) ->addViolation(); $this->logger->debug('the role scope should have a scope, but scope is null. Violation build.'); } elseif // if the scope should be null - ( - in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true) - && null !== $value->getScope() - ) { + ( + in_array($value->getRole(), $this->roleProvider->getRolesWithoutScopes(), true) + && null !== $value->getScope() + ) { $this->context->buildViolation($constraint->messageNullRequired) ->setParameter('%role%', $this->translator->trans($value->getRole())) ->addViolation(); diff --git a/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php b/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php index fe548cd80..e0c22293b 100644 --- a/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php +++ b/src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php @@ -343,7 +343,7 @@ final class ImportPeopleFromCSVCommand extends Command $person->setMobilenumber($value); break; - // we just keep the column number for those data + // we just keep the column number for those data case 'postalcode': $postalCodeValue = $value; diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php index 86993a1bd..f9686c900 100644 --- a/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php @@ -129,7 +129,7 @@ class Configuration implements ConfigurationInterface ->defaultValue(false) ->end() ->end() // children of 'root', parent = root -; + ; return $treeBuilder; } diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index 4e2bd4e89..57fe904f1 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person.php @@ -746,7 +746,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI foreach ($this->getAccompanyingPeriodParticipations() ->map(fn (AccompanyingPeriodParticipation $app) => $app->getAccompanyingPeriod()) as $period - ) { + ) { if (!$result->contains($period)) { $result->add($period); } diff --git a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php index ab40c253c..f6bf4962e 100644 --- a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php +++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php @@ -65,9 +65,9 @@ class AccompanyingPeriodType extends AbstractType $accompanyingPeriod = $options['data']; if ( - ('close' === $options['period_action']) - || ('create' === $options['period_action']) - || ('update' === $options['period_action'] && !$accompanyingPeriod->isOpen()) + ('close' === $options['period_action']) + || ('create' === $options['period_action']) + || ('update' === $options['period_action'] && !$accompanyingPeriod->isOpen()) ) { $builder->add('closingDate', DateType::class, [ 'required' => true, diff --git a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php index 0c8c3e0c3..8ac092647 100644 --- a/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php @@ -114,7 +114,7 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends T protected function generateClass(AccompanyingPeriod $period, Collection $socialIssues): AccompanyingPeriodLinkedWithSocialIssuesEntityInterface { - return new class($period, $socialIssues) implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface { + return new class ($period, $socialIssues) implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface { public Collection $socialIssues; public AccompanyingPeriod $period; diff --git a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php index c2e7bbaf1..e6289c626 100644 --- a/src/Bundle/ChillReportBundle/Export/Export/ReportList.php +++ b/src/Bundle/ChillReportBundle/Export/Export/ReportList.php @@ -248,7 +248,7 @@ class ReportList implements ExportElementValidatedInterface, ListInterface ->getRepository(\Chill\MainBundle\Entity\Country::class); // load all countries in a single query - $countryRepository->findBy(['countryCode' => $values]); + $countryRepository->findBy(['countryCode' => $values]); return function ($value) use ($key, $countryRepository) { if ('_header' === $value) { diff --git a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php index 6091c51a8..5705a839e 100644 --- a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php +++ b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php @@ -92,7 +92,7 @@ final class TimelineProviderTest extends WebTestCase { //static::$em->refresh($this->person); //static::$em->refresh($this->report); - // static::$em->remove($this->person); + // static::$em->remove($this->person); //static::$em->remove($this->report); } diff --git a/src/Bundle/ChillWopiBundle/src/Controller/Convert.php b/src/Bundle/ChillWopiBundle/src/Controller/Convert.php index 3d136495b..c7b8b77c3 100644 --- a/src/Bundle/ChillWopiBundle/src/Controller/Convert.php +++ b/src/Bundle/ChillWopiBundle/src/Controller/Convert.php @@ -69,15 +69,15 @@ class Convert $content = $this->storedObjectManager->read($storedObject); - $url = sprintf('%s/cool/convert-to/pdf', $this->collaboraDomain); - $form = new FormDataPart([ - 'data' => new DataPart($content, $storedObject->getUuid()->toString(), $storedObject->getType()), - ]); - $response = $this->httpClient->request('POST', $url, [ - 'headers' => $form->getPreparedHeaders()->toArray(), - 'body' => $form->bodyToString(), - 'timeout' => 10, - ]); + $url = sprintf('%s/cool/convert-to/pdf', $this->collaboraDomain); + $form = new FormDataPart([ + 'data' => new DataPart($content, $storedObject->getUuid()->toString(), $storedObject->getType()), + ]); + $response = $this->httpClient->request('POST', $url, [ + 'headers' => $form->getPreparedHeaders()->toArray(), + 'body' => $form->bodyToString(), + 'timeout' => 10, + ]); try { return new Response($response->getContent(), Response::HTTP_OK, [