diff --git a/docs/source/_static/code/exports/BirthdateFilter.php b/docs/source/_static/code/exports/BirthdateFilter.php index e25d8b42f..fca768ab3 100644 --- a/docs/source/_static/code/exports/BirthdateFilter.php +++ b/docs/source/_static/code/exports/BirthdateFilter.php @@ -21,7 +21,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface; class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface { // add specific role for this filter - public function addRole() + public function addRole(): ?string { // we do not need any new role for this filter, so we return null return null; diff --git a/rector.php b/rector.php index 6a6bf88ce..0b4f5b1fe 100644 --- a/rector.php +++ b/rector.php @@ -28,6 +28,9 @@ return static function (RectorConfig $rectorConfig): void { // register a single rule $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class); + $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeFromPropertyTypeRector::class); + $rectorConfig->rule(Rector\TypeDeclaration\Rector\Class_\MergeDateTimePropertyTypeDeclarationRector::class); + $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationBasedOnParentClassMethodRector::class); // part of the symfony 54 rules $rectorConfig->rule(\Rector\Symfony\Symfony53\Rector\StaticPropertyFetch\KernelTestCaseContainerPropertyDeprecationRector::class); diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php index 5c6576497..bf3542630 100644 --- a/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php +++ b/src/Bundle/ChillActivityBundle/Entity/ActivityReason.php @@ -79,11 +79,10 @@ class ActivityReason /** * Set active. * - * @param bool $active * * @return ActivityReason */ - public function setActive($active) + public function setActive(bool $active) { $this->active = $active; @@ -110,11 +109,10 @@ class ActivityReason /** * Set name. * - * @param array $name * * @return ActivityReason */ - public function setName($name) + public function setName(array $name) { $this->name = $name; diff --git a/src/Bundle/ChillBudgetBundle/Entity/Charge.php b/src/Bundle/ChillBudgetBundle/Entity/Charge.php index 5857b8b67..b4b2918c9 100644 --- a/src/Bundle/ChillBudgetBundle/Entity/Charge.php +++ b/src/Bundle/ChillBudgetBundle/Entity/Charge.php @@ -100,7 +100,7 @@ class Charge extends AbstractElement implements HasCentersInterface return $this; } - public function setHelp($help) + public function setHelp(?string $help) { $this->help = $help; diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php index 9fddc10b3..169d2ad46 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php +++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php @@ -172,11 +172,10 @@ class CustomField /** * Set active. * - * @param bool $active * * @return CustomField */ - public function setActive($active) + public function setActive(bool $active) { $this->active = $active; @@ -228,14 +227,14 @@ class CustomField * * @return CustomField */ - public function setOrdering($order) + public function setOrdering(?float $order) { $this->ordering = $order; return $this; } - public function setRequired($required) + public function setRequired(bool $required) { $this->required = $required; @@ -245,7 +244,7 @@ class CustomField /** * @return $this */ - public function setSlug($slug) + public function setSlug(?string $slug) { $this->slug = $slug; @@ -259,7 +258,7 @@ class CustomField * * @return CustomField */ - public function setType($type) + public function setType(?string $type) { $this->type = $type; diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php index 497cf7150..f57c6f253 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php +++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php @@ -129,7 +129,7 @@ class Option /** * @return $this */ - public function setActive($active) + public function setActive(bool $active) { $this->active = $active; @@ -139,7 +139,7 @@ class Option /** * @return $this */ - public function setInternalKey($internal_key) + public function setInternalKey(string $internal_key) { $this->internalKey = $internal_key; @@ -149,7 +149,7 @@ class Option /** * @return $this */ - public function setKey($key) + public function setKey(?string $key) { $this->key = $key; diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php index 918872860..6f7c7a930 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php +++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php @@ -69,7 +69,7 @@ class CustomFieldsDefaultGroup * * @return CustomFieldsDefaultGroup */ - public function setCustomFieldsGroup($customFieldsGroup) + public function setCustomFieldsGroup(?\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup $customFieldsGroup) { $this->customFieldsGroup = $customFieldsGroup; @@ -83,7 +83,7 @@ class CustomFieldsDefaultGroup * * @return CustomFieldsDefaultGroup */ - public function setEntity($entity) + public function setEntity(?string $entity) { $this->entity = $entity; diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php index 25040ec5f..4ec64f6b6 100644 --- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php +++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php @@ -169,7 +169,7 @@ class CustomFieldsGroup * * @return CustomFieldsGroup */ - public function setEntity($entity) + public function setEntity(?string $entity) { $this->entity = $entity; diff --git a/src/Bundle/ChillDocStoreBundle/Entity/Document.php b/src/Bundle/ChillDocStoreBundle/Entity/Document.php index b8c15c27c..1970d1127 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/Document.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/Document.php @@ -129,7 +129,7 @@ class Document implements TrackCreationInterface, TrackUpdateInterface return $this; } - public function setUser($user): self + public function setUser(?\Chill\MainBundle\Entity\User $user): self { $this->user = $user; diff --git a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php index 452f463f8..bac09414a 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php @@ -86,7 +86,7 @@ class DocumentCategory return $this; } - public function setDocumentClass($documentClass): self + public function setDocumentClass(?string $documentClass): self { $this->documentClass = $documentClass; diff --git a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php index dfc5b72a9..437695b9d 100644 --- a/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php +++ b/src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php @@ -55,14 +55,14 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt return $this->scope; } - public function setPerson($person): self + public function setPerson(\Chill\PersonBundle\Entity\Person $person): self { $this->person = $person; return $this; } - public function setScope($scope): self + public function setScope(?\Chill\MainBundle\Entity\Scope $scope): self { $this->scope = $scope; diff --git a/src/Bundle/ChillEventBundle/Entity/Event.php b/src/Bundle/ChillEventBundle/Entity/Event.php index 2f323d11a..55b152132 100644 --- a/src/Bundle/ChillEventBundle/Entity/Event.php +++ b/src/Bundle/ChillEventBundle/Entity/Event.php @@ -269,7 +269,7 @@ class Event implements HasCenterInterface, HasScopeInterface, TrackCreationInter * * @return Event */ - public function setName($label) + public function setName(?string $label) { $this->name = $label; diff --git a/src/Bundle/ChillEventBundle/Entity/EventType.php b/src/Bundle/ChillEventBundle/Entity/EventType.php index 5aa257ee9..b0448325a 100644 --- a/src/Bundle/ChillEventBundle/Entity/EventType.php +++ b/src/Bundle/ChillEventBundle/Entity/EventType.php @@ -146,11 +146,10 @@ class EventType /** * Set active. * - * @param bool $active * * @return EventType */ - public function setActive($active) + public function setActive(bool $active) { $this->active = $active; diff --git a/src/Bundle/ChillEventBundle/Entity/Role.php b/src/Bundle/ChillEventBundle/Entity/Role.php index 90f3c43e6..968e52353 100644 --- a/src/Bundle/ChillEventBundle/Entity/Role.php +++ b/src/Bundle/ChillEventBundle/Entity/Role.php @@ -81,11 +81,10 @@ class Role /** * Set active. * - * @param bool $active * * @return Role */ - public function setActive($active) + public function setActive(bool $active) { $this->active = $active; diff --git a/src/Bundle/ChillEventBundle/Entity/Status.php b/src/Bundle/ChillEventBundle/Entity/Status.php index 4153967af..99dd84451 100644 --- a/src/Bundle/ChillEventBundle/Entity/Status.php +++ b/src/Bundle/ChillEventBundle/Entity/Status.php @@ -81,11 +81,10 @@ class Status /** * Set active. * - * @param bool $active * * @return Status */ - public function setActive($active) + public function setActive(bool $active) { $this->active = $active; diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php b/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php index 7fe43bae1..35879fb2f 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php +++ b/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillFranceTravailApiBundle\ApiHelper; +namespace Chill\FranceTravailApiBundle\ApiHelper; use Chill\MainBundle\Redis\ChillRedis; use GuzzleHttp\Client; @@ -33,7 +33,7 @@ class ApiWrapper */ public const UNPERSONAL_BEARER = 'api_pemploi_bear_'; - public function __construct(private $clientId, private $clientSecret, private readonly ChillRedis $redis) + public function __construct(private $clientId, private $clientSecret, private ChillRedis $redis) { $this->client = new Client([ 'base_uri' => 'https://entreprise.pole-emploi.fr/connexion/oauth2/access_token', @@ -66,8 +66,7 @@ class ApiWrapper // ]); ]); } catch (ClientException $e) { - dump(Psr7\str($e->getRequest())); - dump(Psr7\str($e->getResponse())); + dump($e->getResponse()); } $data = \json_decode((string) $response->getBody()); diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php b/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php index 27679a61d..4a30432c9 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php +++ b/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php @@ -9,10 +9,11 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillFranceTravailApiBundle\ApiHelper; +namespace Chill\FranceTravailApiBundle\ApiHelper; use GuzzleHttp\Client; use GuzzleHttp\Psr7\Request; +use GuzzleHttp\Utils; use Psr\Log\LoggerInterface; /** @@ -79,7 +80,7 @@ class PartenaireRomeAppellation $this->logger ); - return \GuzzleHttp\json_decode((string) $response->getBody()); + return Utils::jsonDecode((string) $response->getBody()); } public function getAppellation($code) @@ -103,6 +104,6 @@ class PartenaireRomeAppellation $this->logger ); - return \GuzzleHttp\json_decode((string) $response->getBody()); + return Utils::jsonDecode((string) $response->getBody()); } } diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ProcessRequestTrait.php b/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ProcessRequestTrait.php index 6284f5fe6..b7078861c 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ProcessRequestTrait.php +++ b/src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ProcessRequestTrait.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillFranceTravailApiBundle\ApiHelper; +namespace Chill\FranceTravailApiBundle\ApiHelper; use GuzzleHttp\Client; use GuzzleHttp\Psr7\Request; @@ -30,7 +30,6 @@ trait ProcessRequestTrait * @param Request $request the request * @param array $parameters the requests parameters * - * @return type */ protected function handleRequest( Request $request, @@ -49,10 +48,6 @@ trait ProcessRequestTrait /** * internal method to handle recursive requests. * - * @param type $counter - * - * @return type - * * @throws BadResponseException */ private function handleRequestRecursive( diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/ChillFranceTravailApiBundle.php b/src/Bundle/ChillFranceTravailApiBundle/src/ChillFranceTravailApiBundle.php index 6ebf66d2a..c235fc2c5 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/ChillFranceTravailApiBundle.php +++ b/src/Bundle/ChillFranceTravailApiBundle/src/ChillFranceTravailApiBundle.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillFranceTravailApiBundle; +namespace Chill\FranceTravailApiBundle; use Symfony\Component\HttpKernel\Bundle\Bundle; diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/Controller/RomeController.php b/src/Bundle/ChillFranceTravailApiBundle/src/Controller/RomeController.php index 4c3670412..ef7a0619f 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/Controller/RomeController.php +++ b/src/Bundle/ChillFranceTravailApiBundle/src/Controller/RomeController.php @@ -9,15 +9,15 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillFranceTravailApiBundle\Controller; +namespace Chill\FranceTravailApiBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; -use Chill\ChillFranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation; +use Chill\FranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation; use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\Routing\Annotation\Route; -class RomeController extends Controller +class RomeController extends AbstractController { /** * @var PartenaireRomeAppellation @@ -29,12 +29,7 @@ class RomeController extends Controller $this->apiAppellation = $apiAppellation; } - /** - * @Route("/{_locale}/pole-emploi/appellation/search.{_format}", - * name="chill_pole_emploi_api_appellation_search", - * requirements={ "_format" = "json" } - * ) - */ + #[Route(path: '/{_locale}/france-travail/appellation/search.{_format}', name: 'chill_france_travail_api_appellation_search')] public function appellationSearchAction(Request $request) { if (false === $request->query->has('q')) { diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/ChillFranceTravailApiExtension.php b/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/ChillFranceTravailApiExtension.php index 1e7f3f45d..1f69b80c2 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/ChillFranceTravailApiExtension.php +++ b/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/ChillFranceTravailApiExtension.php @@ -9,10 +9,11 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillFranceTravailApiBundle\DependencyInjection; +namespace Chill\FranceTravailApiBundle\DependencyInjection; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; +use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\DependencyInjection\Loader; @@ -21,7 +22,7 @@ use Symfony\Component\DependencyInjection\Loader; * * @see http://symfony.com/doc/current/cookbook/bundles/extension.html */ -class ChillFranceTravailApiExtension extends Extension +class ChillFranceTravailApiExtension extends Extension implements PrependExtensionInterface { public function load(array $configs, ContainerBuilder $container) { @@ -31,4 +32,21 @@ class ChillFranceTravailApiExtension extends Extension $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('services.yml'); } + + public function prepend(ContainerBuilder $container): void + { + $this->prependRoute($container); + } + + protected function prependRoute(ContainerBuilder $container): void + { + // declare routes for france travail api bundle + $container->prependExtensionConfig('chill_main', [ + 'routing' => [ + 'resources' => [ + '@ChillFranceTravailApiBundle/Resources/config/routing.yml', + ], + ], + ]); + } } diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/Configuration.php index 38198c906..2d94678d4 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillFranceTravailApiBundle/src/DependencyInjection/Configuration.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillFranceTravailApiBundle\DependencyInjection; +namespace Chill\FranceTravailApiBundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; @@ -23,9 +23,8 @@ class Configuration implements ConfigurationInterface { public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('chill_pole_emploi_api'); - + $treeBuilder = new TreeBuilder('chill_france_travail_api'); + $rootNode = $treeBuilder->getRootNode(); // Here you should define the parameters that are allowed to // configure your bundle. See the documentation linked above for // more information on that topic. diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/routing.yml b/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/routing.yml index 6d0204b6e..fdb34eb87 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/routing.yml +++ b/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/routing.yml @@ -1,3 +1,3 @@ -chill_poleemploi_api_controllers: - resource: "@ChillPoleEmploiApiBundle/Controller" - type: annotation \ No newline at end of file +chill_france_travail_api_controllers: + resource: "@ChillFranceTravailApiBundle/Controller" + type: annotation diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/services.yml b/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/services.yml index ff2352d7a..cc41a540c 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/services.yml +++ b/src/Bundle/ChillFranceTravailApiBundle/src/Resources/config/services.yml @@ -1,14 +1,14 @@ services: - Chill\ChillFranceTravailApiBundle\ApiHelper\ApiWrapper: - $clientId: '%pole_emploi_dev_client_id%' - $clientSecret: '%pole_emploi_dev_client_secret%' + Chill\FranceTravailApiBundle\ApiHelper\ApiWrapper: +# $clientId: '%pole_emploi_dev_client_id%' +# $clientSecret: '%pole_emploi_dev_client_secret%' $redis: '@Chill\MainBundle\Redis\ChillRedis' - Chill\ChillFranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation: - $wrapper: '@Chill\ChillFranceTravailApiBundle\ApiHelper\ApiWrapper' + Chill\FranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation: + $wrapper: '@Chill\FranceTravailApiBundle\ApiHelper\ApiWrapper' $logger: '@Psr\Log\LoggerInterface' - Chill\ChillFranceTravailApiBundle\Controller\RomeController: + Chill\FranceTravailApiBundle\Controller\RomeController: arguments: - $apiAppellation: '@Chill\ChillFranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation' + $apiAppellation: '@Chill\FranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation' tags: ['controller.service_arguments'] diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/Tests/ApiHelper/PartenaireRomeAppellationTest.php b/src/Bundle/ChillFranceTravailApiBundle/src/Tests/ApiHelper/PartenaireRomeAppellationTest.php index 8f5cde9a7..4096d5e94 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/Tests/ApiHelper/PartenaireRomeAppellationTest.php +++ b/src/Bundle/ChillFranceTravailApiBundle/src/Tests/ApiHelper/PartenaireRomeAppellationTest.php @@ -9,10 +9,10 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillFranceTravailApiBundle\Tests\ApiHelper; +namespace Chill\FranceTravailApiBundle\Tests\ApiHelper; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; -use Chill\ChillFranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation; +use Chill\FranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation; /** * @author Julien Fastré @@ -23,7 +23,7 @@ use Chill\ChillFranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation; */ class PartenaireRomeAppellationTest extends KernelTestCase { - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/src/Bundle/ChillFranceTravailApiBundle/src/Tests/Controller/RomeControllerTest.php b/src/Bundle/ChillFranceTravailApiBundle/src/Tests/Controller/RomeControllerTest.php index a64ce5ae5..ef88ccf75 100644 --- a/src/Bundle/ChillFranceTravailApiBundle/src/Tests/Controller/RomeControllerTest.php +++ b/src/Bundle/ChillFranceTravailApiBundle/src/Tests/Controller/RomeControllerTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillFranceTravailApiBundle\Tests\Controller; +namespace Chill\FranceTravailApiBundle\Tests\Controller; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; diff --git a/src/Bundle/ChillJobBundle/src/ChillJobBundle.php b/src/Bundle/ChillJobBundle/src/ChillJobBundle.php index e583a271b..b8b4a2146 100644 --- a/src/Bundle/ChillJobBundle/src/ChillJobBundle.php +++ b/src/Bundle/ChillJobBundle/src/ChillJobBundle.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle; +namespace Chill\JobBundle; use Symfony\Component\HttpKernel\Bundle\Bundle; diff --git a/src/Bundle/ChillJobBundle/src/Controller/CSCrudReportController.php b/src/Bundle/ChillJobBundle/src/Controller/CSCrudReportController.php index 44f98074a..3e6abfebb 100644 --- a/src/Bundle/ChillJobBundle/src/Controller/CSCrudReportController.php +++ b/src/Bundle/ChillJobBundle/src/Controller/CSCrudReportController.php @@ -9,12 +9,13 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Controller; +namespace Chill\JobBundle\Controller; use Chill\PersonBundle\CRUD\Controller\EntityPersonCRUDController; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; -use Chill\ChillJobBundle\Entity\Immersion; +use Chill\JobBundle\Entity\Immersion; +use Symfony\Component\HttpFoundation\Response; /** * CRUD Controller for reports (Frein, ...). @@ -23,12 +24,12 @@ class CSCrudReportController extends EntityPersonCRUDController { public function __construct(private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry) {} - protected function onBeforeRedirectAfterSubmission(string $action, $entity, FormInterface $form, Request $request) + protected function onBeforeRedirectAfterSubmission(string $action, $entity, FormInterface $form, Request $request): ?Response { $next = $request->request->get('submit', 'save-and-close'); return match ($next) { - 'save-and-close', 'delete-and-close' => $this->redirectToRoute('chill_csconnectes_csreport_index', [ + 'save-and-close', 'delete-and-close' => $this->redirectToRoute('chill_job_report_index', [ 'person' => $entity->getPerson()->getId(), ]), default => parent::onBeforeRedirectAfterSubmission($action, $entity, $form, $request), @@ -39,7 +40,7 @@ class CSCrudReportController extends EntityPersonCRUDController { if ('cscv' === $this->getCrudName()) { $id = $request->query->get('duplicate_id', 0); - /** @var \Chill\ChillJobBundle\Entity\CV $cv */ + /** @var \Chill\JobBundle\Entity\CV $cv */ $cv = $this->getEntity($action, $id, $request); $em = $this->managerRegistry->getManager(); @@ -60,7 +61,7 @@ class CSCrudReportController extends EntityPersonCRUDController } if ('projet_prof' === $this->getCrudName()) { $id = $request->query->get('duplicate_id', 0); - /** @var \Chill\ChillJobBundle\Entity\ProjetProfessionnel $original */ + /** @var \Chill\JobBundle\Entity\ProjetProfessionnel $original */ $original = $this->getEntity($action, $id, $request); $new = parent::duplicateEntity($action, $request); @@ -115,7 +116,7 @@ class CSCrudReportController extends EntityPersonCRUDController /** * Edit immersion bilan. * - * @param type $id + * @param int $id */ public function editBilan(Request $request, $id): \Symfony\Component\HttpFoundation\Response { diff --git a/src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php b/src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php index 102817702..a85188216 100644 --- a/src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php +++ b/src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php @@ -9,15 +9,16 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Controller; +namespace Chill\JobBundle\Controller; use Chill\PersonBundle\CRUD\Controller\OneToOneEntityPersonCRUDController; use Chill\PersonBundle\Security\Authorization\PersonVoter; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\Request; -use Chill\ChillJobBundle\Form\CSPersonPersonalSituationType; -use Chill\ChillJobBundle\Form\CSPersonDispositifsType; +use Chill\JobBundle\Form\CSPersonPersonalSituationType; +use Chill\JobBundle\Form\CSPersonDispositifsType; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Routing\Annotation\Route; class CSPersonController extends OneToOneEntityPersonCRUDController { @@ -41,18 +42,22 @@ class CSPersonController extends OneToOneEntityPersonCRUDController ); } - public function personalSituationView(Request $request, $id): Response + #[Route(path: '{_locale}/person/job/{person}/personal_situation', name: 'chill_job_personal_situation_view')] + public function personalSituationView(Request $request, $person): Response { - return $this->viewAction('ps_situation_view', $request, $id); + return $this->viewAction('ps_situation_view', $request, $person); } - public function dispositifsView(Request $request, $id): Response + #[Route(path: '{_locale}/person/job/{person}/dispositifs', name: 'chill_job_dispositifs_view')] + public function dispositifsView(Request $request, $person): Response { - return $this->viewAction('dispositifs_view', $request, $id); + return $this->viewAction('dispositifs_view', $request, $person); } - protected function generateRedirectOnCreateRoute($action, Request $request, $entity) + protected function generateRedirectOnCreateRoute($action, Request $request, $entity): string { + $route = ''; + switch ($action) { case 'ps_situation_view': $route = 'chill_crud_csperson_personal_situation_edit'; @@ -82,7 +87,7 @@ class CSPersonController extends OneToOneEntityPersonCRUDController }; } - protected function onBeforeRedirectAfterSubmission(string $action, $entity, FormInterface $form, Request $request) + protected function onBeforeRedirectAfterSubmission(string $action, $entity, FormInterface $form, Request $request): ?Response { return match ($action) { 'ps_situation_edit' => $this->redirectToRoute( @@ -101,13 +106,13 @@ class CSPersonController extends OneToOneEntityPersonCRUDController { switch ($action) { case 'ps_situation_edit': - return '@CSConnectesSP/CSPerson/personal_situation_edit.html.twig'; + return '@ChillJob/CSPerson/personal_situation_edit.html.twig'; case 'dispositifs_edit': - return '@CSConnectesSP/CSPerson/dispositifs_edit.html.twig'; + return '@ChillJob/CSPerson/dispositifs_edit.html.twig'; case 'ps_situation_view': - return '@CSConnectesSP/CSPerson/personal_situation_view.html.twig'; + return '@ChillJob/CSPerson/personal_situation_view.html.twig'; case 'dispositifs_view': - return '@CSConnectesSP/CSPerson/dispositifs_view.html.twig'; + return '@ChillJob/CSPerson/dispositifs_view.html.twig'; default: parent::getTemplateFor($action, $entity, $request); } @@ -150,7 +155,7 @@ class CSPersonController extends OneToOneEntityPersonCRUDController throw new \LogicException("this formName is not supported: {$formName}"); break; default: - return parent::generateLabelForButton($action, $formName, $form); + return 'Enregistrer'; } } } diff --git a/src/Bundle/ChillJobBundle/src/Controller/CSReportController.php b/src/Bundle/ChillJobBundle/src/Controller/CSReportController.php index 6d4d61fc2..c3dbf472f 100644 --- a/src/Bundle/ChillJobBundle/src/Controller/CSReportController.php +++ b/src/Bundle/ChillJobBundle/src/Controller/CSReportController.php @@ -9,26 +9,26 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Controller; +namespace Chill\JobBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Symfony\Component\Routing\Annotation\Route; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Chill\PersonBundle\Entity\Person; use Symfony\Component\HttpFoundation\Response; -use Chill\ChillJobBundle\Entity\Frein; -use Chill\ChillJobBundle\Entity\CV; -use Chill\ChillJobBundle\Entity\Immersion; -use Chill\ChillJobBundle\Entity\ProjetProfessionnel; +use Chill\JobBundle\Entity\Frein; +use Chill\JobBundle\Entity\CV; +use Chill\JobBundle\Entity\Immersion; +use Chill\JobBundle\Entity\ProjetProfessionnel; use Chill\PersonBundle\Security\Authorization\PersonVoter; -use Chill\ChillJobBundle\Security\Authorization\CSConnectesVoter; +use Chill\JobBundle\Security\Authorization\CSConnectesVoter; -class CSReportController extends Controller +class CSReportController extends AbstractController { - /** - * @Route("{_locale}/csconnectes/person/{person}/report", - * name="chill_csconnectes_csreport_index" - * ) - */ + public function __construct(private \Doctrine\Persistence\ManagerRegistry $managerRegistry) + { + } + + #[Route(path: '{_locale}/person/job/{person}/report', name: 'chill_job_report_index')] public function index(Person $person): Response { $this->denyAccessUnlessGranted(PersonVoter::SEE, $person, 'The access to ' @@ -36,12 +36,12 @@ class CSReportController extends Controller $reports = $this->getReports($person); - return $this->render('@CSConnectesSP/Report/index.html.twig', \array_merge([ + return $this->render('@ChillJob/Report/index.html.twig', \array_merge([ 'person' => $person, ], $reports)); } - protected function getReports(Person $person) + protected function getReports(Person $person): array { $results = []; @@ -65,7 +65,7 @@ class CSReportController extends Controller 'immersions' => ['debutDate' => 'DESC'], default => ['reportDate' => 'DESC'], }; - $results[$key] = $this->getDoctrine()->getManager() + $results[$key] = $this->managerRegistry->getManager() ->getRepository($className) ->findByPerson($person, $ordering); } diff --git a/src/Bundle/ChillJobBundle/src/DependencyInjection/ChillJobExtension.php b/src/Bundle/ChillJobBundle/src/DependencyInjection/ChillJobExtension.php index de01124bf..ffc760768 100644 --- a/src/Bundle/ChillJobBundle/src/DependencyInjection/ChillJobExtension.php +++ b/src/Bundle/ChillJobBundle/src/DependencyInjection/ChillJobExtension.php @@ -9,10 +9,14 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\DependencyInjection; +namespace Chill\JobBundle\DependencyInjection; +use Chill\JobBundle\Controller\CSPersonController; +use Chill\JobBundle\Entity\CSPerson; +use Chill\JobBundle\Form\CSPersonPersonalSituationType; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; +use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\DependencyInjection\Loader; @@ -21,17 +25,70 @@ use Symfony\Component\DependencyInjection\Loader; * * @see http://symfony.com/doc/current/cookbook/bundles/extension.html */ -class ChillJobExtension extends Extension +class ChillJobExtension extends Extension implements PrependExtensionInterface { - public function load(array $configs, ContainerBuilder $container) + public function load(array $configs, ContainerBuilder $container): void { $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $configs); $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('services.yml'); + $loader->load('services/3party_type.yml'); + $loader->load('services/controller.yml'); + $loader->load('services/form.yml'); + $loader->load('services/export.yml'); + $loader->load('services/menu.yml'); + $loader->load('services/security.yml'); // exports: list_CSperson override list_person - $container->setAlias('chill.person.export.list_person', \Chill\ChillJobBundle\Export\ListCSPerson::class); + $container->setAlias('chill.person.export.list_person', \Chill\JobBundle\Export\ListCSPerson::class); + } + + public function prepend(ContainerBuilder $container): void + { + $this->prependRoute($container); + } + +/* protected function prependCruds(ContainerBuilder $container) + { + $container->prependExtensionConfig('chill_main', [ + 'cruds' => [ + [ + 'class' => CSPerson::class, + 'controller' => CSPersonController::class, + 'name' => 'admin_personal_situation', +// 'base_path' => '/admin/main/personal_situation', + 'base_role' => 'ROLE_USER', + 'form_class' => CSPersonPersonalSituationType::class, + 'actions' => [ + 'index' => [ + 'role' => 'ROLE_USER', + 'template' => '@ChillPerson/CRUD/index.html.twig', + ], + 'new' => [ + 'role' => 'ROLE_USER', + 'template' => '@ChillPerson/CRUD/new.html.twig', + ], + 'edit' => [ + 'role' => 'ROLE_USER', + 'template' => '@ChillPerson/CRUD/edit.html.twig', + ], + ], + ] + ], + ]); + }*/ + + protected function prependRoute(ContainerBuilder $container): void + { + // declare routes for job bundle + $container->prependExtensionConfig('chill_main', [ + 'routing' => [ + 'resources' => [ + '@ChillJobBundle/Resources/config/routing.yml', + ], + ], + ]); } } diff --git a/src/Bundle/ChillJobBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillJobBundle/src/DependencyInjection/Configuration.php index b11c109fc..f4140defa 100644 --- a/src/Bundle/ChillJobBundle/src/DependencyInjection/Configuration.php +++ b/src/Bundle/ChillJobBundle/src/DependencyInjection/Configuration.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\DependencyInjection; +namespace Chill\JobBundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; @@ -23,8 +23,8 @@ class Configuration implements ConfigurationInterface { public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('cs_connectes_sp'); + $treeBuilder = new TreeBuilder('chill_job'); + $rootNode = $treeBuilder->getRootNode(); // Here you should define the parameters that are allowed to // configure your bundle. See the documentation linked above for diff --git a/src/Bundle/ChillJobBundle/src/Entity/CSPerson.php b/src/Bundle/ChillJobBundle/src/Entity/CSPerson.php index f832c8fe1..65f7c9b3b 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/CSPerson.php +++ b/src/Bundle/ChillJobBundle/src/Entity/CSPerson.php @@ -1,6 +1,6 @@ situationLogement = $situationLogement; @@ -503,11 +502,10 @@ class CSPerson /** * Set enfantACharge. * - * @param int|null $enfantACharge * * @return CSPerson */ - public function setEnfantACharge($enfantACharge = null) + public function setEnfantACharge(?int $enfantACharge = null) { $this->enfantACharge = $enfantACharge; @@ -527,8 +525,6 @@ class CSPerson /** * Set niveauMaitriseLangue. * - * @param json $niveauMaitriseLangue - * * @return CSPerson */ public function setNiveauMaitriseLangue($niveauMaitriseLangue) @@ -583,7 +579,7 @@ class CSPerson * * @return CSPerson */ - public function setVehiculePersonnel($vehiculePersonnel) + public function setVehiculePersonnel(?bool $vehiculePersonnel) { $this->vehiculePersonnel = $vehiculePersonnel; @@ -603,8 +599,6 @@ class CSPerson /** * Set permisConduire. * - * @param json $permisConduire - * * @return CSPerson */ public function setPermisConduire($permisConduire) @@ -617,7 +611,6 @@ class CSPerson /** * Get permisConduire. * - * @return json */ public function getPermisConduire() { @@ -631,7 +624,7 @@ class CSPerson * * @return CSPerson */ - public function setSituationProfessionnelle($situationProfessionnelle) + public function setSituationProfessionnelle(?string $situationProfessionnelle) { $this->situationProfessionnelle = $situationProfessionnelle; @@ -655,7 +648,7 @@ class CSPerson * * @return CSPerson */ - public function setDateFinDernierEmploi($dateFinDernierEmploi) + public function setDateFinDernierEmploi(?\DateTimeInterface $dateFinDernierEmploi) { $this->dateFinDernierEmploi = $dateFinDernierEmploi; @@ -675,7 +668,6 @@ class CSPerson /** * Set typeContrat. * - * @param json $typeContrat * * @return CSPerson */ @@ -689,7 +681,6 @@ class CSPerson /** * Get typeContrat. * - * @return json */ public function getTypeContrat() { @@ -699,8 +690,6 @@ class CSPerson /** * Set ressources. * - * @param json $ressources - * * @return CSPerson */ public function setRessources($ressources) @@ -713,7 +702,6 @@ class CSPerson /** * Get ressources. * - * @return json */ public function getRessources() { @@ -727,7 +715,7 @@ class CSPerson * * @return CSPerson */ - public function setRessourcesComment($ressourcesComment) + public function setRessourcesComment(?string $ressourcesComment) { $this->ressourcesComment = $ressourcesComment; @@ -751,7 +739,7 @@ class CSPerson * * @return CSPerson */ - public function setRessourceDate1Versement($ressourceDate1Versement) + public function setRessourceDate1Versement(?\DateTimeInterface $ressourceDate1Versement) { $this->ressourceDate1Versement = $ressourceDate1Versement; @@ -761,7 +749,7 @@ class CSPerson /** * Get ressourceDate1Versement. * - * @return \DateTime + * @return \DateTimeInterface */ public function getRessourceDate1Versement() { @@ -773,7 +761,7 @@ class CSPerson return $this->cPFMontant; } - function setCPFMontant($cPFMontant) + function setCPFMontant(?float $cPFMontant) { $this->cPFMontant = $cPFMontant; @@ -783,8 +771,6 @@ class CSPerson /** * Set accompagnement. * - * @param json $accompagnement - * * @return CSPerson */ public function setAccompagnement($accompagnement) @@ -797,7 +783,6 @@ class CSPerson /** * Get accompagnement. * - * @return json */ public function getAccompagnement() { @@ -811,7 +796,7 @@ class CSPerson * * @return CSPerson */ - public function setAccompagnementRQTHDate($accompagnementRQTHDate) + public function setAccompagnementRQTHDate(?\DateTimeInterface $accompagnementRQTHDate) { $this->accompagnementRQTHDate = $accompagnementRQTHDate; @@ -821,7 +806,7 @@ class CSPerson /** * Get accompagnementRQTHDate. * - * @return \DateTime + * @return \DateTimeInterface */ public function getAccompagnementRQTHDate() { @@ -835,7 +820,7 @@ class CSPerson * * @return CSPerson */ - public function setAccompagnementComment($accompagnementComment) + public function setAccompagnementComment(?string $accompagnementComment) { $this->accompagnementComment = $accompagnementComment; @@ -859,7 +844,7 @@ class CSPerson * * @return CSPerson */ - public function setPoleEmploiId($poleEmploiId) + public function setPoleEmploiId(?string $poleEmploiId) { $this->poleEmploiId = $poleEmploiId; @@ -883,7 +868,7 @@ class CSPerson * * @return CSPerson */ - public function setPoleEmploiInscriptionDate($poleEmploiInscriptionDate) + public function setPoleEmploiInscriptionDate(?\DateTimeInterface $poleEmploiInscriptionDate) { $this->poleEmploiInscriptionDate = $poleEmploiInscriptionDate; @@ -893,7 +878,7 @@ class CSPerson /** * Get poleEmploiInscriptionDate. * - * @return \DateTime + * @return \DateTimeInterface */ public function getPoleEmploiInscriptionDate() { @@ -907,7 +892,7 @@ class CSPerson * * @return CSPerson */ - public function setCafId($cafId) + public function setCafId(?string $cafId) { $this->cafId = $cafId; @@ -931,7 +916,7 @@ class CSPerson * * @return CSPerson */ - public function setCafInscriptionDate($cafInscriptionDate) + public function setCafInscriptionDate(?\DateTimeInterface $cafInscriptionDate) { $this->cafInscriptionDate = $cafInscriptionDate; @@ -941,7 +926,7 @@ class CSPerson /** * Get cafInscriptionDate. * - * @return \DateTime + * @return \DateTimeInterface */ public function getCafInscriptionDate() { @@ -955,7 +940,7 @@ class CSPerson * * @return CSPerson */ - public function setCERInscriptionDate($cERInscriptionDate) + public function setCERInscriptionDate(?\DateTimeInterface $cERInscriptionDate) { $this->cERInscriptionDate = $cERInscriptionDate; @@ -965,7 +950,7 @@ class CSPerson /** * Get cERInscriptionDate. * - * @return \DateTime + * @return \DateTimeInterface */ public function getCERInscriptionDate() { @@ -979,7 +964,7 @@ class CSPerson * * @return CSPerson */ - public function setPPAEInscriptionDate($pPAEInscriptionDate) + public function setPPAEInscriptionDate(?\DateTimeInterface $pPAEInscriptionDate) { $this->pPAEInscriptionDate = $pPAEInscriptionDate; @@ -989,7 +974,7 @@ class CSPerson /** * Get pPAEInscriptionDate. * - * @return \DateTime + * @return \DateTimeInterface */ public function getPPAEInscriptionDate() { @@ -1006,12 +991,12 @@ class CSPerson return $this->pPAESignataire; } - public function setCERSignataire($cERSignataire) + public function setCERSignataire(?string $cERSignataire) { $this->cERSignataire = $cERSignataire; } - public function setPPAESignataire($pPAESignataire) + public function setPPAESignataire(?string $pPAESignataire) { $this->pPAESignataire = $pPAESignataire; } @@ -1024,7 +1009,7 @@ class CSPerson * * @return CSPerson */ - public function setNEETEligibilite($nEETEligibilite) + public function setNEETEligibilite(?bool $nEETEligibilite) { $this->nEETEligibilite = $nEETEligibilite; @@ -1048,7 +1033,7 @@ class CSPerson * * @return CSPerson */ - public function setNEETCommissionDate($nEETCommissionDate) + public function setNEETCommissionDate(?\DateTimeInterface $nEETCommissionDate) { $this->nEETCommissionDate = $nEETCommissionDate; @@ -1058,7 +1043,7 @@ class CSPerson /** * Get nEETCommissionDate. * - * @return \DateTime + * @return \DateTimeInterface */ public function getNEETCommissionDate() { @@ -1072,7 +1057,7 @@ class CSPerson * * @return CSPerson */ - public function setFSEMaDemarcheCode($fSEMaDemarcheCode) + public function setFSEMaDemarcheCode(?string $fSEMaDemarcheCode) { $this->fSEMaDemarcheCode = $fSEMaDemarcheCode; @@ -1094,7 +1079,7 @@ class CSPerson return $this->dispositifsNotes; } - function setDispositifsNotes($dispositifsNotes) + function setDispositifsNotes(?string $dispositifsNotes) { $this->dispositifsNotes = $dispositifsNotes; } @@ -1305,7 +1290,7 @@ class CSPerson return $this; } - public function setMobiliteNotes($mobiliteNotes) + public function setMobiliteNotes(?string $mobiliteNotes) { $this->mobiliteNotes = $mobiliteNotes; @@ -1322,31 +1307,31 @@ class CSPerson return $this->documentAttestationSecuriteSociale; } - public function setSituationLogementPrecision($situationLogementPrecision) + public function setSituationLogementPrecision(?string $situationLogementPrecision) { $this->situationLogementPrecision = $situationLogementPrecision; return $this; } - public function setAcompteDIF($acompteDIF) + public function setAcompteDIF(?float $acompteDIF) { $this->acompteDIF = $acompteDIF; return $this; } - public function setHandicapIs($handicapIs) + public function setHandicapIs(?bool $handicapIs) { $this->handicapIs = $handicapIs; return $this; } - public function setHandicapNotes($handicapNotes) + public function setHandicapNotes(?string $handicapNotes) { $this->handicapNotes = $handicapNotes; return $this; } - public function setHandicapRecommandation($handicapRecommandation) + public function setHandicapRecommandation(?string $handicapRecommandation) { $this->handicapRecommandation = $handicapRecommandation; return $this; @@ -1364,7 +1349,7 @@ class CSPerson return $this; } - public function getDateContratIEJ(): ?\DateTime + public function getDateContratIEJ(): \DateTimeInterface { return $this->dateContratIEJ; } @@ -1380,13 +1365,13 @@ class CSPerson return $this->typeContratAide; } - public function setTypeContratAide($typeContratAide) + public function setTypeContratAide(?string $typeContratAide) { $this->typeContratAide = $typeContratAide; return $this; } - public function getDateAvenantIEJ(): ?\DateTime + public function getDateAvenantIEJ(): \DateTimeInterface { return $this->dateAvenantIEJ; } diff --git a/src/Bundle/ChillJobBundle/src/Entity/CV.php b/src/Bundle/ChillJobBundle/src/Entity/CV.php index 7783dc40e..90a8e772e 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/CV.php +++ b/src/Bundle/ChillJobBundle/src/Entity/CV.php @@ -9,8 +9,9 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Entity; +namespace Chill\JobBundle\Entity; +use Doctrine\Common\Collections\Order; use Doctrine\ORM\Mapping as ORM; use Chill\PersonBundle\Entity\Person; use Doctrine\Common\Collections\ArrayCollection; @@ -21,7 +22,7 @@ use Symfony\Component\Validator\Constraints as Assert; * CV. */ #[ORM\Table(name: 'chill_csconnectes.cv')] -#[ORM\Entity(repositoryClass: \Chill\ChillJobBundle\Repository\CVRepository::class)] +#[ORM\Entity(repositoryClass: \Chill\JobBundle\Repository\CVRepository::class)] class CV implements \Stringable { #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)] @@ -71,18 +72,18 @@ class CV implements \Stringable /** * @Assert\Valid(traverse=true) - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection */ #[ORM\OneToMany(targetEntity: CV\Formation::class, mappedBy: 'CV', cascade: ['persist', 'remove', 'detach'], orphanRemoval: true)] - #[ORM\OrderBy(['startDate' => \Doctrine\Common\Collections\Criteria::DESC, 'endDate' => 'DESC'])] + #[ORM\OrderBy(['startDate' => Order::Descending, 'endDate' => 'DESC'])] private Collection $formations; /** * @Assert\Valid(traverse=true) - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection */ #[ORM\OneToMany(targetEntity: CV\Experience::class, mappedBy: 'CV', cascade: ['persist', 'remove', 'detach'], orphanRemoval: true)] - #[ORM\OrderBy(['startDate' => \Doctrine\Common\Collections\Criteria::DESC, 'endDate' => 'DESC'])] + #[ORM\OrderBy(['startDate' => Order::Descending, 'endDate' => 'DESC'])] private Collection $experiences; #[ORM\ManyToOne(targetEntity: Person::class)] @@ -108,11 +109,10 @@ class CV implements \Stringable /** * Set reportDate. * - * @param \DateTime $reportDate * * @return CV */ - public function setReportDate($reportDate) + public function setReportDate(\DateTime $reportDate): self { $this->reportDate = $reportDate; @@ -122,9 +122,8 @@ class CV implements \Stringable /** * Get reportDate. * - * @return \DateTime */ - public function getReportDate() + public function getReportDate(): \DateTimeInterface|null { return $this->reportDate; } @@ -136,7 +135,7 @@ class CV implements \Stringable * * @return CV */ - public function setFormationLevel($formationLevel = null) + public function setFormationLevel(string $formationLevel = null): self { $this->formationLevel = $formationLevel; @@ -156,11 +155,10 @@ class CV implements \Stringable /** * Set formationType. * - * @param string $formationType * * @return CV */ - public function setFormationType($formationType) + public function setFormationType(string $formationType): self { $this->formationType = $formationType; @@ -172,7 +170,7 @@ class CV implements \Stringable * * @return string */ - public function getFormationType() + public function getFormationType(): ?string { return $this->formationType; } @@ -180,11 +178,9 @@ class CV implements \Stringable /** * Set spokenLanguages. * - * @param json|null $spokenLanguages - * * @return CV */ - public function setSpokenLanguages($spokenLanguages = null) + public function setSpokenLanguages($spokenLanguages = null): self { $this->spokenLanguages = $spokenLanguages; @@ -194,9 +190,8 @@ class CV implements \Stringable /** * Get spokenLanguages. * - * @return json|null */ - public function getSpokenLanguages() + public function getSpokenLanguages(): array { return $this->spokenLanguages ?? []; } @@ -208,7 +203,7 @@ class CV implements \Stringable * * @return CV */ - public function setNotes($notes = null) + public function setNotes(string $notes = null): self { $this->notes = $notes; @@ -220,7 +215,7 @@ class CV implements \Stringable * * @return string|null */ - public function getNotes() + public function getNotes(): ?string { return $this->notes; } @@ -235,7 +230,7 @@ class CV implements \Stringable return $this->experiences; } - public function setFormations(Collection $formations) + public function setFormations(Collection $formations): self { foreach ($formations as $formation) { /* @var CV\Formation $formation */ @@ -246,7 +241,7 @@ class CV implements \Stringable return $this; } - public function addFormation(CV\Formation $formation) + public function addFormation(CV\Formation $formation): self { if ($this->formations->contains($formation)) { return $this; @@ -258,7 +253,7 @@ class CV implements \Stringable return $this; } - public function removeFormation(CV\Formation $formation) + public function removeFormation(CV\Formation $formation): self { if (false === $this->formations->contains($formation)) { return $this; @@ -270,7 +265,7 @@ class CV implements \Stringable return $this; } - public function setExperiences(Collection $experiences) + public function setExperiences(Collection $experiences): self { foreach ($experiences as $experience) { /* @var CV\Experience $experience */ @@ -282,7 +277,7 @@ class CV implements \Stringable return $this; } - public function addExperience(CV\Experience $experience) + public function addExperience(CV\Experience $experience): self { if ($this->experiences->contains($experience)) { return $this; @@ -294,7 +289,7 @@ class CV implements \Stringable return $this; } - public function removeExperience(CV\Experience $experience) + public function removeExperience(CV\Experience $experience): self { if (false === $this->experiences->contains($experience)) { return $this; diff --git a/src/Bundle/ChillJobBundle/src/Entity/CV/Experience.php b/src/Bundle/ChillJobBundle/src/Entity/CV/Experience.php index 4bcd2e94f..f0978e139 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/CV/Experience.php +++ b/src/Bundle/ChillJobBundle/src/Entity/CV/Experience.php @@ -9,17 +9,17 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Entity\CV; +namespace Chill\JobBundle\Entity\CV; use Doctrine\ORM\Mapping as ORM; -use Chill\ChillJobBundle\Entity\CV; +use Chill\JobBundle\Entity\CV; use Symfony\Component\Validator\Constraints as Assert; /** * Experience. */ #[ORM\Table(name: 'chill_csconnectes.cv_experience')] -#[ORM\Entity(repositoryClass: \Chill\ChillJobBundle\Repository\CV\ExperienceRepository::class)] +#[ORM\Entity(repositoryClass: \Chill\JobBundle\Repository\CV\ExperienceRepository::class)] class Experience { #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)] @@ -72,7 +72,7 @@ class Experience * * @return int */ - public function getId() + public function getId(): ?int { return $this->id; } @@ -80,11 +80,10 @@ class Experience /** * Set poste. * - * @param string|null $poste * * @return Experience */ - public function setPoste($poste = null) + public function setPoste(?string $poste = null): self { $this->poste = $poste; @@ -96,7 +95,7 @@ class Experience * * @return string|null */ - public function getPoste() + public function getPoste(): ?string { return $this->poste; } @@ -104,11 +103,10 @@ class Experience /** * Set structure. * - * @param string|null $structure * * @return Experience */ - public function setStructure($structure = null) + public function setStructure(?string $structure = null): self { $this->structure = $structure; @@ -120,7 +118,7 @@ class Experience * * @return string|null */ - public function getStructure() + public function getStructure(): ?string { return $this->structure; } @@ -132,7 +130,7 @@ class Experience * * @return Experience */ - public function setStartDate($startDate = null) + public function setStartDate(?\DateTimeInterface $startDate = null): self { $this->startDate = $startDate; @@ -142,7 +140,7 @@ class Experience /** * Get startDate. * - * @return \DateTime|null + * @return \DateTimeInterface */ public function getStartDate() { @@ -156,7 +154,7 @@ class Experience * * @return Experience */ - public function setEndDate($endDate = null) + public function setEndDate(?\DateTimeInterface $endDate = null): self { $this->endDate = $endDate; @@ -166,7 +164,7 @@ class Experience /** * Get endDate. * - * @return \DateTime|null + * @return \DateTimeInterface */ public function getEndDate() { @@ -180,7 +178,7 @@ class Experience * * @return Experience */ - public function setContratType($contratType) + public function setContratType(?string $contratType): self { $this->contratType = $contratType; @@ -192,7 +190,7 @@ class Experience * * @return string */ - public function getContratType() + public function getContratType(): ?string { return $this->contratType; } @@ -204,7 +202,7 @@ class Experience * * @return Experience */ - public function setNotes($notes) + public function setNotes(?string $notes): self { $this->notes = $notes; @@ -216,7 +214,7 @@ class Experience * * @return string */ - public function getNotes() + public function getNotes(): ?string { return $this->notes; } @@ -226,7 +224,7 @@ class Experience return $this->CV; } - public function setCV(?CV $CV = null) + public function setCV(?CV $CV = null): self { $this->CV = $CV; diff --git a/src/Bundle/ChillJobBundle/src/Entity/CV/Formation.php b/src/Bundle/ChillJobBundle/src/Entity/CV/Formation.php index e9ac3f7ea..1c4343e3d 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/CV/Formation.php +++ b/src/Bundle/ChillJobBundle/src/Entity/CV/Formation.php @@ -9,17 +9,17 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Entity\CV; +namespace Chill\JobBundle\Entity\CV; use Doctrine\ORM\Mapping as ORM; -use Chill\ChillJobBundle\Entity\CV; +use Chill\JobBundle\Entity\CV; use Symfony\Component\Validator\Constraints as Assert; /** * Formation. */ #[ORM\Table(name: 'chill_csconnectes.cv_formation')] -#[ORM\Entity(repositoryClass: \Chill\ChillJobBundle\Repository\CV\FormationRepository::class)] +#[ORM\Entity(repositoryClass: \Chill\JobBundle\Repository\CV\FormationRepository::class)] class Formation { #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)] @@ -81,7 +81,7 @@ class Formation * * @return Formation */ - public function setTitle($title) + public function setTitle(?string $title) { $this->title = $title; @@ -105,7 +105,7 @@ class Formation * * @return Formation */ - public function setStartDate($startDate = null) + public function setStartDate(?\DateTimeInterface $startDate = null) { $this->startDate = $startDate; @@ -115,7 +115,7 @@ class Formation /** * Get startDate. * - * @return \DateTime|null + * @return \DateTimeInterface */ public function getStartDate() { @@ -129,7 +129,7 @@ class Formation * * @return Formation */ - public function setEndDate($endDate = null) + public function setEndDate(?\DateTimeInterface $endDate = null) { $this->endDate = $endDate; @@ -139,7 +139,7 @@ class Formation /** * Get endDate. * - * @return \DateTime|null + * @return \DateTimeInterface */ public function getEndDate() { @@ -149,11 +149,9 @@ class Formation /** * Set diplomaObtained. * - * @param json|null $diplomaObtained - * * @return Formation */ - public function setDiplomaObtained($diplomaObtained = null) + public function setDiplomaObtained(?string $diplomaObtained = null) { $this->diplomaObtained = $diplomaObtained; @@ -162,8 +160,6 @@ class Formation /** * Get diplomaObtained. - * - * @return json|null */ public function getDiplomaObtained() { @@ -173,11 +169,10 @@ class Formation /** * Set diplomaReconnue. * - * @param string|null $diplomaReconnue * * @return Formation */ - public function setDiplomaReconnue($diplomaReconnue = null) + public function setDiplomaReconnue(?string $diplomaReconnue = null): self { $this->diplomaReconnue = $diplomaReconnue; @@ -189,7 +184,7 @@ class Formation * * @return string|null */ - public function getDiplomaReconnue() + public function getDiplomaReconnue(): ?string { return $this->diplomaReconnue; } @@ -201,7 +196,7 @@ class Formation * * @return Formation */ - public function setOrganisme($organisme) + public function setOrganisme(?string $organisme): self { $this->organisme = $organisme; @@ -213,7 +208,7 @@ class Formation * * @return string */ - public function getOrganisme() + public function getOrganisme(): ?string { return $this->organisme; } @@ -223,7 +218,7 @@ class Formation return $this->CV; } - public function setCV(?CV $CV = null) + public function setCV(?CV $CV = null): self { $this->CV = $CV; diff --git a/src/Bundle/ChillJobBundle/src/Entity/Frein.php b/src/Bundle/ChillJobBundle/src/Entity/Frein.php index a7a19d8d5..437df44fe 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/Frein.php +++ b/src/Bundle/ChillJobBundle/src/Entity/Frein.php @@ -9,8 +9,9 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Entity; +namespace Chill\JobBundle\Entity; +use Chill\PersonBundle\Entity\Person; use Doctrine\ORM\Mapping as ORM; use Chill\PersonBundle\Entity\HasPerson; use Symfony\Component\Validator\Constraints as Assert; @@ -20,7 +21,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface; * Frein. */ #[ORM\Table(name: 'chill_csconnectes.frein')] -#[ORM\Entity(repositoryClass: \Chill\ChillJobBundle\Repository\FreinRepository::class)] +#[ORM\Entity(repositoryClass: \Chill\JobBundle\Repository\FreinRepository::class)] class Frein implements HasPerson, \Stringable { #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)] @@ -78,152 +79,92 @@ class Frein implements HasPerson, \Stringable private ?string $notesEmploi = ''; /** - * @var Person * * @ORM\ManytoOne( * targetEntity="Chill\PersonBundle\Entity\Person") * * @Assert\NotNull() */ - private $person; + private Person $person; public function __construct() { $this->reportDate = new \DateTime('today'); } - /** - * Get id. - * - * @return int - */ - public function getId() + public function getId(): ?int { return $this->id; } - /** - * Set reportDate. - * - * @param \DateTime $reportDate - * - * @return Frein - */ - public function setReportDate($reportDate) + + public function setReportDate(?\DateTimeInterface $reportDate): self { $this->reportDate = $reportDate; return $this; } - /** - * Get reportDate. - * - * @return \DateTime - */ - public function getReportDate() + + public function getReportDate(): ?\DateTimeInterface { return $this->reportDate; } - /** - * Set freinsPerso. - * - * @param string[] $freinsPerso - * - * @return Frein - */ - public function setFreinsPerso(array $freinsPerso = []) + public function setFreinsPerso(array $freinsPerso = []): self { $this->freinsPerso = $freinsPerso; return $this; } - /** - * Get freinsPerso. - * - * @return json - */ - public function getFreinsPerso() + public function getFreinsPerso(): array { return $this->freinsPerso; } - /** - * Set notesPerso. - * - * @return Frein - */ - public function setNotesPerso(?string $notesPerso = null) + public function setNotesPerso(?string $notesPerso = null): self { $this->notesPerso = (string) $notesPerso; return $this; } - /** - * Get notesPerso. - * - * @return string - */ - public function getNotesPerso() + public function getNotesPerso(): ?string { return $this->notesPerso; } - /** - * Set freinsEmploi. - * - * @param json $freinsEmploi - * - * @return Frein - */ - public function setFreinsEmploi(array $freinsEmploi = []) + public function setFreinsEmploi(array $freinsEmploi = []): self { $this->freinsEmploi = $freinsEmploi; return $this; } - /** - * Get freinsEmploi. - * - * @return json - */ - public function getFreinsEmploi() + public function getFreinsEmploi(): array { return $this->freinsEmploi; } - /** - * Set notesEmploi. - * - * @return Frein - */ - public function setNotesEmploi(?string $notesEmploi = null) + public function setNotesEmploi(?string $notesEmploi = null): self { $this->notesEmploi = (string) $notesEmploi; return $this; } - /** - * Get notesEmploi. - * - * @return string - */ - public function getNotesEmploi() + public function getNotesEmploi(): ?string { return $this->notesEmploi; } - public function getPerson(): ?\Chill\PersonBundle\Entity\Person + public function getPerson(): ?Person { return $this->person; } - public function setPerson(?\Chill\PersonBundle\Entity\Person $person = null): HasPerson + public function setPerson(?Person $person = null): HasPerson { $this->person = $person; @@ -231,13 +172,9 @@ class Frein implements HasPerson, \Stringable } /** - * Vérifie qu'au moins un frein a été coché parmi les freins perso + emploi. - * - * @param array $payload - * * @Assert\Callback() */ - public function validateFreinsCount(ExecutionContextInterface $context, $payload) + public function validateFreinsCount(ExecutionContextInterface $context, $payload): void { $nb = count($this->getFreinsEmploi()) + count($this->getFreinsPerso()); diff --git a/src/Bundle/ChillJobBundle/src/Entity/Immersion.php b/src/Bundle/ChillJobBundle/src/Entity/Immersion.php index 320ffb9d8..f789bbad7 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/Immersion.php +++ b/src/Bundle/ChillJobBundle/src/Entity/Immersion.php @@ -1,8 +1,8 @@ domaineActivite = $domaineActivite; @@ -463,11 +462,10 @@ class Immersion implements \Stringable /** * Set tuteurName. * - * @param string|null $tuteurName * * @return Immersion */ - public function setTuteurName($tuteurName = null) + public function setTuteurName(?string $tuteurName = null) { $this->tuteurName = $tuteurName; @@ -487,11 +485,10 @@ class Immersion implements \Stringable /** * Set tuteurFonction. * - * @param string|null $tuteurFonction * * @return Immersion */ - public function setTuteurFonction($tuteurFonction = null) + public function setTuteurFonction(?string $tuteurFonction = null) { $this->tuteurFonction = $tuteurFonction; @@ -511,11 +508,10 @@ class Immersion implements \Stringable /** * Set tuteurPhoneNumber. * - * @param string|null $tuteurPhoneNumber * * @return Immersion */ - public function setTuteurPhoneNumber($tuteurPhoneNumber = null) + public function setTuteurPhoneNumber(?string $tuteurPhoneNumber = null) { $this->tuteurPhoneNumber = $tuteurPhoneNumber; @@ -535,11 +531,10 @@ class Immersion implements \Stringable /** * Set structureAccName. * - * @param string|null $structureAccName * * @return Immersion */ - public function setStructureAccName($structureAccName = null) + public function setStructureAccName(?string $structureAccName = null) { $this->structureAccName = $structureAccName; @@ -563,7 +558,7 @@ class Immersion implements \Stringable * * @return Immersion */ - public function setStructureAccPhonenumber($structureAccPhonenumber) + public function setStructureAccPhonenumber(?string $structureAccPhonenumber) { $this->structureAccPhonenumber = $structureAccPhonenumber; @@ -583,11 +578,10 @@ class Immersion implements \Stringable /** * Set posteDescriptif. * - * @param string|null $posteDescriptif * * @return Immersion */ - public function setPosteDescriptif($posteDescriptif = null) + public function setPosteDescriptif(?string $posteDescriptif = null) { $this->posteDescriptif = $posteDescriptif; @@ -607,11 +601,10 @@ class Immersion implements \Stringable /** * Set posteTitle. * - * @param string|null $posteTitle * * @return Immersion */ - public function setPosteTitle($posteTitle = null) + public function setPosteTitle(?string $posteTitle = null) { $this->posteTitle = $posteTitle; @@ -631,11 +624,10 @@ class Immersion implements \Stringable /** * Set posteLieu. * - * @param string|null $posteLieu * * @return Immersion */ - public function setPosteLieu($posteLieu = null) + public function setPosteLieu(?string $posteLieu = null) { $this->posteLieu = $posteLieu; @@ -659,7 +651,7 @@ class Immersion implements \Stringable * * @return Immersion */ - public function setDebutDate($debutDate = null) + public function setDebutDate(?\DateTimeInterface $debutDate = null) { $this->debutDate = $debutDate; @@ -710,11 +702,10 @@ class Immersion implements \Stringable /** * Set horaire. * - * @param string|null $horaire * * @return Immersion */ - public function setHoraire($horaire = null) + public function setHoraire(?string $horaire = null) { $this->horaire = $horaire; @@ -760,7 +751,7 @@ class Immersion implements \Stringable return $this->objectifsAutre; } - public function setObjectifsAutre($objectifsAutre) + public function setObjectifsAutre(?string $objectifsAutre) { $this->objectifsAutre = $objectifsAutre; @@ -818,11 +809,10 @@ class Immersion implements \Stringable /** * Set principalesActivites. * - * @param string|null $principalesActivites * * @return Immersion */ - public function setPrincipalesActivites($principalesActivites = null) + public function setPrincipalesActivites(?string $principalesActivites = null) { $this->principalesActivites = $principalesActivites; @@ -842,11 +832,10 @@ class Immersion implements \Stringable /** * Set competencesAcquises. * - * @param string|null $competencesAcquises * * @return Immersion */ - public function setCompetencesAcquises($competencesAcquises = null) + public function setCompetencesAcquises(?string $competencesAcquises = null) { $this->competencesAcquises = $competencesAcquises; @@ -866,11 +855,10 @@ class Immersion implements \Stringable /** * Set competencesADevelopper. * - * @param string|null $competencesADevelopper * * @return Immersion */ - public function setCompetencesADevelopper($competencesADevelopper = null) + public function setCompetencesADevelopper(?string $competencesADevelopper = null) { $this->competencesADevelopper = $competencesADevelopper; @@ -890,11 +878,10 @@ class Immersion implements \Stringable /** * Set noteBilan. * - * @param string|null $noteBilan * * @return Immersion */ - public function setNoteBilan($noteBilan = null) + public function setNoteBilan(?string $noteBilan = null) { $this->noteBilan = $noteBilan; @@ -954,7 +941,7 @@ class Immersion implements \Stringable return $this->structureAccAddress; } - public function setStructureAccEmail($structureAccEmail) + public function setStructureAccEmail(?string $structureAccEmail) { $this->structureAccEmail = $structureAccEmail; return $this; @@ -976,13 +963,13 @@ class Immersion implements \Stringable return $this->savoirEtreNote; } - public function setIsBilanFullfilled($isBilanFullfilled) + public function setIsBilanFullfilled(?bool $isBilanFullfilled) { $this->isBilanFullfilled = $isBilanFullfilled; return $this; } - public function setSavoirEtreNote($savoirEtreNote) + public function setSavoirEtreNote(?string $savoirEtreNote) { $this->savoirEtreNote = $savoirEtreNote; return $this; @@ -1098,133 +1085,133 @@ class Immersion implements \Stringable return $this->respectHierarchieNote; } - public function setPonctualiteSalarie($ponctualiteSalarie) + public function setPonctualiteSalarie(?string $ponctualiteSalarie) { $this->ponctualiteSalarie = $ponctualiteSalarie; return $this; } - public function setPonctualiteSalarieNote($ponctualiteSalarieNote) + public function setPonctualiteSalarieNote(?string $ponctualiteSalarieNote) { $this->ponctualiteSalarieNote = $ponctualiteSalarieNote; return $this; } - public function setAssiduite($assiduite) + public function setAssiduite(?string $assiduite) { $this->assiduite = $assiduite; return $this; } - public function setAssiduiteNote($assiduiteNote) + public function setAssiduiteNote(?string $assiduiteNote) { $this->assiduiteNote = $assiduiteNote; return $this; } - public function setInteretActivite($interetActivite) + public function setInteretActivite(?string $interetActivite) { $this->interetActivite = $interetActivite; return $this; } - public function setInteretActiviteNote($interetActiviteNote) + public function setInteretActiviteNote(?string $interetActiviteNote) { $this->interetActiviteNote = $interetActiviteNote; return $this; } - public function setIntegreRegle($integreRegle) + public function setIntegreRegle(?string $integreRegle) { $this->integreRegle = $integreRegle; return $this; } - public function setIntegreRegleNote($integreRegleNote) + public function setIntegreRegleNote(?string $integreRegleNote) { $this->integreRegleNote = $integreRegleNote; return $this; } - public function setEspritInitiative($espritInitiative) + public function setEspritInitiative(?string $espritInitiative) { $this->espritInitiative = $espritInitiative; return $this; } - public function setEspritInitiativeNote($espritInitiativeNote) + public function setEspritInitiativeNote(?string $espritInitiativeNote) { $this->espritInitiativeNote = $espritInitiativeNote; return $this; } - public function setOrganisation($organisation) + public function setOrganisation(?string $organisation) { $this->organisation = $organisation; return $this; } - public function setOrganisationNote($organisationNote) + public function setOrganisationNote(?string $organisationNote) { $this->organisationNote = $organisationNote; return $this; } - public function setCapaciteTravailEquipe($capaciteTravailEquipe) + public function setCapaciteTravailEquipe(?string $capaciteTravailEquipe) { $this->capaciteTravailEquipe = $capaciteTravailEquipe; return $this; } - public function setCapaciteTravailEquipeNote($capaciteTravailEquipeNote) + public function setCapaciteTravailEquipeNote(?string $capaciteTravailEquipeNote) { $this->capaciteTravailEquipeNote = $capaciteTravailEquipeNote; return $this; } - public function setStyleVestimentaire($styleVestimentaire) + public function setStyleVestimentaire(?string $styleVestimentaire) { $this->styleVestimentaire = $styleVestimentaire; return $this; } - public function setStyleVestimentaireNote($styleVestimentaireNote) + public function setStyleVestimentaireNote(?string $styleVestimentaireNote) { $this->styleVestimentaireNote = $styleVestimentaireNote; return $this; } - public function setLangageProf($langageProf) + public function setLangageProf(?string $langageProf) { $this->langageProf = $langageProf; return $this; } - public function setLangageProfNote($langageProfNote) + public function setLangageProfNote(?string $langageProfNote) { $this->langageProfNote = $langageProfNote; return $this; } - public function setAppliqueConsigne($appliqueConsigne) + public function setAppliqueConsigne(?string $appliqueConsigne) { $this->appliqueConsigne = $appliqueConsigne; return $this; } - public function setAppliqueConsigneNote($appliqueConsigneNote) + public function setAppliqueConsigneNote(?string $appliqueConsigneNote) { $this->appliqueConsigneNote = $appliqueConsigneNote; return $this; } - public function setRespectHierarchie($respectHierarchie) + public function setRespectHierarchie(?string $respectHierarchie) { $this->respectHierarchie = $respectHierarchie; return $this; } - public function setRespectHierarchieNote($respectHierarchieNote) + public function setRespectHierarchieNote(?string $respectHierarchieNote) { $this->respectHierarchieNote = $respectHierarchieNote; return $this; diff --git a/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php b/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php index 747edd1bc..2c6cb039b 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php +++ b/src/Bundle/ChillJobBundle/src/Entity/ProjetProfessionnel.php @@ -9,16 +9,16 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Entity; +namespace Chill\JobBundle\Entity; -use Chill\ChillJobBundle\Repository\ProjetProfessionnelRepository; +use Chill\JobBundle\Repository\ProjetProfessionnelRepository; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\ArrayCollection; use Symfony\Component\Validator\Constraints as Assert; use Chill\PersonBundle\Entity\Person; -use Chill\ChillJobBundle\Entity\Rome\Appellation; +use Chill\JobBundle\Entity\Rome\Appellation; /** * ProjetProfessionnel. @@ -49,7 +49,7 @@ class ProjetProfessionnel implements \Stringable private ?\DateTimeInterface $reportDate = null; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection */ #[ORM\JoinTable(name: 'chill_csconnectes.projetprofessionnel_souhait')] #[ORM\ManyToMany(targetEntity: Appellation::class, cascade: ['persist'])] @@ -98,7 +98,7 @@ class ProjetProfessionnel implements \Stringable private ?string $enCoursConstruction = null; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection */ #[ORM\JoinTable(name: 'chill_csconnectes.projetprofessionnel_valide')] #[ORM\ManyToMany(targetEntity: Appellation::class)] @@ -136,7 +136,7 @@ class ProjetProfessionnel implements \Stringable * * @return ProjetProfessionnel */ - public function setReportDate($reportDate) + public function setReportDate(?\DateTimeInterface $reportDate) { $this->reportDate = $reportDate; @@ -180,11 +180,10 @@ class ProjetProfessionnel implements \Stringable /** * Set typeContratNotes. * - * @param string|null $typeContratNotes * * @return ProjetProfessionnel */ - public function setTypeContratNotes($typeContratNotes = null) + public function setTypeContratNotes(?string $typeContratNotes = null) { $this->typeContratNotes = $typeContratNotes; @@ -228,11 +227,10 @@ class ProjetProfessionnel implements \Stringable /** * Set volumeHoraireNotes. * - * @param string|null $volumeHoraireNotes * * @return ProjetProfessionnel */ - public function setVolumeHoraireNotes($volumeHoraireNotes = null) + public function setVolumeHoraireNotes(?string $volumeHoraireNotes = null) { $this->volumeHoraireNotes = $volumeHoraireNotes; @@ -252,11 +250,10 @@ class ProjetProfessionnel implements \Stringable /** * Set idee. * - * @param string|null $idee * * @return ProjetProfessionnel */ - public function setIdee($idee = null) + public function setIdee(?string $idee = null) { $this->idee = $idee; @@ -276,11 +273,10 @@ class ProjetProfessionnel implements \Stringable /** * Set enCoursConstruction. * - * @param string|null $enCoursConstruction * * @return ProjetProfessionnel */ - public function setEnCoursConstruction($enCoursConstruction = null) + public function setEnCoursConstruction(?string $enCoursConstruction = null) { $this->enCoursConstruction = $enCoursConstruction; @@ -300,11 +296,10 @@ class ProjetProfessionnel implements \Stringable /** * Set valideNotes. * - * @param string|null $valideNotes * * @return ProjetProfessionnel */ - public function setValideNotes($valideNotes = null) + public function setValideNotes(?string $valideNotes = null) { $this->valideNotes = $valideNotes; @@ -324,11 +319,10 @@ class ProjetProfessionnel implements \Stringable /** * Set projetProfessionnelNote. * - * @param string|null $projetProfessionnelNote * * @return ProjetProfessionnel */ - public function setProjetProfessionnelNote($projetProfessionnelNote = null) + public function setProjetProfessionnelNote(?string $projetProfessionnelNote = null) { $this->projetProfessionnelNote = $projetProfessionnelNote; diff --git a/src/Bundle/ChillJobBundle/src/Entity/Rome/Appellation.php b/src/Bundle/ChillJobBundle/src/Entity/Rome/Appellation.php index c17e7352f..455240181 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/Rome/Appellation.php +++ b/src/Bundle/ChillJobBundle/src/Entity/Rome/Appellation.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Entity\Rome; +namespace Chill\JobBundle\Entity\Rome; use Doctrine\ORM\Mapping as ORM; @@ -17,7 +17,7 @@ use Doctrine\ORM\Mapping as ORM; * Appellation. */ #[ORM\Table(name: 'chill_csconnectes.rome_appellation')] -#[ORM\Entity(repositoryClass: \Chill\ChillJobBundle\Repository\Rome\AppellationRepository::class)] +#[ORM\Entity(repositoryClass: \Chill\JobBundle\Repository\Rome\AppellationRepository::class)] class Appellation implements \Stringable { #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)] @@ -51,7 +51,7 @@ class Appellation implements \Stringable * * @return Appellation */ - public function setCode($code) + public function setCode(?string $code) { $this->code = $code; @@ -75,7 +75,7 @@ class Appellation implements \Stringable * * @return Appellation */ - public function setLibelle($libelle) + public function setLibelle(?string $libelle) { $this->libelle = $libelle; diff --git a/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php b/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php index fa797558d..49b65734e 100644 --- a/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php +++ b/src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Entity\Rome; +namespace Chill\JobBundle\Entity\Rome; use Doctrine\ORM\Mapping as ORM; use Doctrine\Common\Collections\ArrayCollection; @@ -18,7 +18,7 @@ use Doctrine\Common\Collections\ArrayCollection; * Metier. */ #[ORM\Table(name: 'chill_csconnectes.rome_metier')] -#[ORM\Entity(repositoryClass: \Chill\ChillJobBundle\Repository\Rome\MetierRepository::class)] +#[ORM\Entity(repositoryClass: \Chill\JobBundle\Repository\Rome\MetierRepository::class)] class Metier { #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)] @@ -33,7 +33,7 @@ class Metier private ?string $code = ''; /** - * @var \Doctrine\Common\Collections\Collection + * @var \Doctrine\Common\Collections\Collection */ #[ORM\OneToMany(targetEntity: Appellation::class, mappedBy: 'metier')] private readonly \Doctrine\Common\Collections\Collection $appellations; @@ -61,7 +61,7 @@ class Metier * * @return Metier */ - public function setLibelle($libelle) + public function setLibelle(?string $libelle) { $this->libelle = $libelle; @@ -85,7 +85,7 @@ class Metier * * @return Metier */ - public function setCode($code) + public function setCode(?string $code) { $this->code = $code; diff --git a/src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php b/src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php index f840c024b..7a88a6452 100644 --- a/src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php +++ b/src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php @@ -9,21 +9,21 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Export; +namespace Chill\JobBundle\Export; use Chill\MainBundle\Export\ExportElementValidatedInterface; use Chill\MainBundle\Export\ListInterface; use Chill\PersonBundle\Export\Export\ListPerson; -use Chill\ChillJobBundle\Entity\CSPerson; +use Chill\JobBundle\Entity\CSPerson; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Query; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Translation\TranslatorInterface; use Chill\MainBundle\Templating\TranslatableStringHelper; use Chill\CustomFieldsBundle\Service\CustomFieldProvider; use Symfony\Component\Validator\Constraints\Callback; use Symfony\Component\Validator\Context\ExecutionContextInterface; +use Symfony\Contracts\Translation\TranslatorInterface; /** * Class ListCSPerson. @@ -240,7 +240,7 @@ class ListCSPerson extends ListPerson implements ListInterface, ExportElementVal break; case 'type_contrat__label': - if (! empty($value)) { + if ($value !== '') { $res[$key] = ($f) ? $value : null; } else { $res[$key] = null; @@ -406,7 +406,7 @@ class ListCSPerson extends ListPerson implements ListInterface, ExportElementVal str_replace('__', '.', $key) ); } - if (empty($value)) { + if ($value === '') { return ''; } $arr = []; @@ -423,7 +423,7 @@ class ListCSPerson extends ListPerson implements ListInterface, ExportElementVal str_replace('__', '.', $key) ); } - if (empty($value)) { + if ($value === '') { return ''; } $this->translationCompatKey($value, $key); @@ -434,7 +434,7 @@ class ListCSPerson extends ListPerson implements ListInterface, ExportElementVal if ('_header' === $value) { return $key; } - if (empty($value)) { + if ($value === '') { return ''; } @@ -462,7 +462,7 @@ class ListCSPerson extends ListPerson implements ListInterface, ExportElementVal if ('_header' === $value) { return $key; } - if (empty($value)) { + if ($value === '') { return ''; } @@ -638,4 +638,9 @@ WHERE ORDER BY p.id ASC SQL; + + public function validateForm(mixed $data, ExecutionContextInterface $context) + { + // TODO: Implement validateForm() method. + } } diff --git a/src/Bundle/ChillJobBundle/src/Export/ListCV.php b/src/Bundle/ChillJobBundle/src/Export/ListCV.php index 7e55a2ad7..084f9ead3 100644 --- a/src/Bundle/ChillJobBundle/src/Export/ListCV.php +++ b/src/Bundle/ChillJobBundle/src/Export/ListCV.php @@ -9,14 +9,14 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Export; +namespace Chill\JobBundle\Export; use Chill\MainBundle\Export\ExportElementValidatedInterface; use Chill\MainBundle\Export\FormatterInterface; use Chill\MainBundle\Export\ListInterface; use Chill\MainBundle\Form\Type\ChillDateType; use Chill\PersonBundle\Entity\Person; -use Chill\ChillJobBundle\Security\Authorization\ExportsVoter; +use Chill\JobBundle\Security\Authorization\ExportsVoter; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Query; use Doctrine\ORM\QueryBuilder; @@ -194,7 +194,7 @@ class ListCV implements ListInterface, ExportElementValidatedInterface * * @return Role */ - public function requiredRole() + public function requiredRole(): string { return new Role(ExportsVoter::EXPORT); } @@ -393,4 +393,9 @@ AND ( ORDER BY cv.reportdate DESC SQL; + + public function getFormDefaultData(): array + { + return []; + } } diff --git a/src/Bundle/ChillJobBundle/src/Export/ListFrein.php b/src/Bundle/ChillJobBundle/src/Export/ListFrein.php index 38aca4556..e965bc30c 100644 --- a/src/Bundle/ChillJobBundle/src/Export/ListFrein.php +++ b/src/Bundle/ChillJobBundle/src/Export/ListFrein.php @@ -9,15 +9,15 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Export; +namespace Chill\JobBundle\Export; use Chill\MainBundle\Export\ExportElementValidatedInterface; use Chill\MainBundle\Export\FormatterInterface; use Chill\MainBundle\Export\ListInterface; use Chill\MainBundle\Form\Type\ChillDateType; use Chill\PersonBundle\Entity\Person; -use Chill\ChillJobBundle\Entity\Frein; -use Chill\ChillJobBundle\Security\Authorization\ExportsVoter; +use Chill\JobBundle\Entity\Frein; +use Chill\JobBundle\Security\Authorization\ExportsVoter; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Query; use Doctrine\ORM\QueryBuilder; @@ -207,7 +207,7 @@ class ListFrein implements ListInterface, ExportElementValidatedInterface * * @return Role */ - public function requiredRole() + public function requiredRole(): string { return new Role(ExportsVoter::EXPORT); } @@ -498,4 +498,9 @@ AND ( ORDER BY fr.reportdate DESC SQL; + + public function getFormDefaultData(): array + { + return []; + } } diff --git a/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php b/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php index 992989426..62b4f9e56 100644 --- a/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php +++ b/src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php @@ -9,15 +9,15 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Export; +namespace Chill\JobBundle\Export; use Chill\MainBundle\Export\ExportElementValidatedInterface; use Chill\MainBundle\Export\FormatterInterface; use Chill\MainBundle\Export\ListInterface; use Chill\MainBundle\Form\Type\ChillDateType; use Chill\PersonBundle\Entity\Person; -use Chill\ChillJobBundle\Entity\ProjetProfessionnel; -use Chill\ChillJobBundle\Security\Authorization\ExportsVoter; +use Chill\JobBundle\Entity\ProjetProfessionnel; +use Chill\JobBundle\Security\Authorization\ExportsVoter; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Query; use Doctrine\ORM\QueryBuilder; @@ -213,7 +213,7 @@ class ListProjetProfessionnel implements ListInterface, ExportElementValidatedIn * * @return Role */ - public function requiredRole() + public function requiredRole(): string { return new Role(ExportsVoter::EXPORT); } @@ -586,4 +586,9 @@ AND ( ORDER BY pp.reportdate DESC SQL; + + public function getFormDefaultData(): array + { + return []; + } } diff --git a/src/Bundle/ChillJobBundle/src/Form/CSPersonDispositifsType.php b/src/Bundle/ChillJobBundle/src/Form/CSPersonDispositifsType.php index 7307c6fe9..f5147c43f 100644 --- a/src/Bundle/ChillJobBundle/src/Form/CSPersonDispositifsType.php +++ b/src/Bundle/ChillJobBundle/src/Form/CSPersonDispositifsType.php @@ -9,12 +9,12 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Form; +namespace Chill\JobBundle\Form; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Chill\ChillJobBundle\Entity\CSPerson; +use Chill\JobBundle\Entity\CSPerson; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; diff --git a/src/Bundle/ChillJobBundle/src/Form/CSPersonPersonalSituationType.php b/src/Bundle/ChillJobBundle/src/Form/CSPersonPersonalSituationType.php index ea6896553..be71025d9 100644 --- a/src/Bundle/ChillJobBundle/src/Form/CSPersonPersonalSituationType.php +++ b/src/Bundle/ChillJobBundle/src/Form/CSPersonPersonalSituationType.php @@ -9,12 +9,12 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Form; +namespace Chill\JobBundle\Form; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Chill\ChillJobBundle\Entity\CSPerson; +use Chill\JobBundle\Entity\CSPerson; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; diff --git a/src/Bundle/ChillJobBundle/src/Form/CV/ExperienceType.php b/src/Bundle/ChillJobBundle/src/Form/CV/ExperienceType.php index 6b5e0df3a..d38a69adf 100644 --- a/src/Bundle/ChillJobBundle/src/Form/CV/ExperienceType.php +++ b/src/Bundle/ChillJobBundle/src/Form/CV/ExperienceType.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Form\CV; +namespace Chill\JobBundle\Form\CV; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; @@ -18,7 +18,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Chill\MainBundle\Form\Type\ChillDateType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; -use Chill\ChillJobBundle\Entity\CV\Experience; +use Chill\JobBundle\Entity\CV\Experience; class ExperienceType extends AbstractType { diff --git a/src/Bundle/ChillJobBundle/src/Form/CV/FormationType.php b/src/Bundle/ChillJobBundle/src/Form/CV/FormationType.php index fa0e75982..90d537a44 100644 --- a/src/Bundle/ChillJobBundle/src/Form/CV/FormationType.php +++ b/src/Bundle/ChillJobBundle/src/Form/CV/FormationType.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Form\CV; +namespace Chill\JobBundle\Form\CV; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; @@ -17,7 +17,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Form\Extension\Core\Type\TextType; use Chill\MainBundle\Form\Type\ChillDateType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; -use Chill\ChillJobBundle\Entity\CV\Formation as F; +use Chill\JobBundle\Entity\CV\Formation as F; class FormationType extends AbstractType { diff --git a/src/Bundle/ChillJobBundle/src/Form/CVType.php b/src/Bundle/ChillJobBundle/src/Form/CVType.php index 38f3ae7eb..f5125e2bb 100644 --- a/src/Bundle/ChillJobBundle/src/Form/CVType.php +++ b/src/Bundle/ChillJobBundle/src/Form/CVType.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Form; +namespace Chill\JobBundle\Form; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; @@ -17,10 +17,10 @@ use Symfony\Component\OptionsResolver\OptionsResolver; use Chill\MainBundle\Form\Type\ChillDateType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; -use Chill\ChillJobBundle\Entity\CV; +use Chill\JobBundle\Entity\CV; use Chill\MainBundle\Form\Type\ChillCollectionType; -use Chill\ChillJobBundle\Form\CV\FormationType; -use Chill\ChillJobBundle\Form\CV\ExperienceType; +use Chill\JobBundle\Form\CV\FormationType; +use Chill\JobBundle\Form\CV\ExperienceType; use Chill\MainBundle\Form\Type\Select2LanguageType; class CVType extends AbstractType diff --git a/src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php b/src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php index c1fd33334..4a7486ddd 100644 --- a/src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php +++ b/src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php @@ -9,15 +9,15 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Form\ChoiceLoader; +namespace Chill\JobBundle\Form\ChoiceLoader; use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface; use Symfony\Component\Form\ChoiceList\ChoiceListInterface; use Symfony\Component\Form\ChoiceList\ArrayChoiceList; -use Chill\ChillJobBundle\Entity\Rome\Appellation; +use Chill\JobBundle\Entity\Rome\Appellation; use Doctrine\ORM\EntityManagerInterface; use Chill\PoleEmploiApiBundle\ApiHelper\PartenaireRomeAppellation; -use Chill\ChillJobBundle\Entity\Rome\Metier; +use Chill\JobBundle\Entity\Rome\Metier; use Symfony\Component\Validator\Validator\ValidatorInterface; /** @@ -36,7 +36,7 @@ class RomeAppellationChoiceLoader implements ChoiceLoaderInterface protected $em; /** - * @var \Chill\ChillJobBundle\Repository\Rome\AppellationRepository + * @var \Chill\JobBundle\Repository\Rome\AppellationRepository */ protected $appellationRepository; diff --git a/src/Bundle/ChillJobBundle/src/Form/FreinType.php b/src/Bundle/ChillJobBundle/src/Form/FreinType.php index 6aa9f71bd..62d822d56 100644 --- a/src/Bundle/ChillJobBundle/src/Form/FreinType.php +++ b/src/Bundle/ChillJobBundle/src/Form/FreinType.php @@ -9,14 +9,14 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Form; +namespace Chill\JobBundle\Form; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; use Chill\MainBundle\Form\Type\ChillDateType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; -use Chill\ChillJobBundle\Entity\Frein; +use Chill\JobBundle\Entity\Frein; use Symfony\Component\Form\Extension\Core\Type\TextareaType; class FreinType extends AbstractType diff --git a/src/Bundle/ChillJobBundle/src/Form/ImmersionType.php b/src/Bundle/ChillJobBundle/src/Form/ImmersionType.php index 655b32bb4..96bc1a1a6 100644 --- a/src/Bundle/ChillJobBundle/src/Form/ImmersionType.php +++ b/src/Bundle/ChillJobBundle/src/Form/ImmersionType.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Form; +namespace Chill\JobBundle\Form; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; @@ -21,7 +21,7 @@ use Chill\ThirdPartyBundle\Form\Type\PickThirdPartyType; use Symfony\Component\Form\Extension\Core\Type\EmailType; use Chill\MainBundle\Form\Type\DateIntervalType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; -use Chill\ChillJobBundle\Entity\Immersion; +use Chill\JobBundle\Entity\Immersion; use Chill\MainBundle\Form\Type\AddressType; class ImmersionType extends AbstractType diff --git a/src/Bundle/ChillJobBundle/src/Form/ProjetProfessionnelType.php b/src/Bundle/ChillJobBundle/src/Form/ProjetProfessionnelType.php index 76f3e5b32..60b23b814 100644 --- a/src/Bundle/ChillJobBundle/src/Form/ProjetProfessionnelType.php +++ b/src/Bundle/ChillJobBundle/src/Form/ProjetProfessionnelType.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Form; +namespace Chill\JobBundle\Form; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; @@ -17,8 +17,8 @@ use Symfony\Component\OptionsResolver\OptionsResolver; use Chill\MainBundle\Form\Type\ChillDateType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; -use Chill\ChillJobBundle\Entity\ProjetProfessionnel; -use Chill\ChillJobBundle\Form\Type\PickRomeAppellationType; +use Chill\JobBundle\Entity\ProjetProfessionnel; +use Chill\JobBundle\Form\Type\PickRomeAppellationType; class ProjetProfessionnelType extends AbstractType { diff --git a/src/Bundle/ChillJobBundle/src/Form/Type/PickRomeAppellationType.php b/src/Bundle/ChillJobBundle/src/Form/Type/PickRomeAppellationType.php index 471d5e7ce..da538f649 100644 --- a/src/Bundle/ChillJobBundle/src/Form/Type/PickRomeAppellationType.php +++ b/src/Bundle/ChillJobBundle/src/Form/Type/PickRomeAppellationType.php @@ -9,20 +9,20 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Form\Type; +namespace Chill\JobBundle\Form\Type; +use Chill\FranceTravailApiBundle\ApiHelper\PartenaireRomeAppellation; use Symfony\Component\Form\AbstractType; use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Form\FormBuilderInterface; -use Chill\ChillJobBundle\Entity\Rome\Appellation; +use Chill\JobBundle\Entity\Rome\Appellation; use Symfony\Bridge\Doctrine\Form\Type\EntityType; -use Symfony\Component\Translation\TranslatorInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; -use Chill\PoleEmploiApiBundle\ApiHelper\PartenaireRomeAppellation; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\OptionsResolver\Options; -use Chill\ChillJobBundle\Form\ChoiceLoader\RomeAppellationChoiceLoader; +use Chill\JobBundle\Form\ChoiceLoader\RomeAppellationChoiceLoader; use Symfony\Component\Validator\Validator\ValidatorInterface; +use Symfony\Contracts\Translation\TranslatorInterface; /** * Allow to grab an appellation. @@ -41,7 +41,7 @@ class PickRomeAppellationType extends AbstractType // /** // * - // * @var \Chill\ChillJobBundle\Form\DataTransformer\RomeAppellationTransformer + // * @var \Chill\JobBundle\Form\DataTransformer\RomeAppellationTransformer // */ // protected $romeAppellationTransformer; diff --git a/src/Bundle/ChillJobBundle/src/Menu/MenuBuilder.php b/src/Bundle/ChillJobBundle/src/Menu/MenuBuilder.php index bd329e440..b9d521a54 100644 --- a/src/Bundle/ChillJobBundle/src/Menu/MenuBuilder.php +++ b/src/Bundle/ChillJobBundle/src/Menu/MenuBuilder.php @@ -9,12 +9,12 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Menu; +namespace Chill\JobBundle\Menu; use Chill\MainBundle\Routing\LocalMenuBuilderInterface; use Knp\Menu\MenuItem; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; -use Chill\ChillJobBundle\Security\Authorization\CSConnectesVoter; +use Chill\JobBundle\Security\Authorization\CSConnectesVoter; class MenuBuilder implements LocalMenuBuilderInterface { @@ -33,29 +33,29 @@ class MenuBuilder implements LocalMenuBuilderInterface /** @var \Chill\PersonBundle\Entity\Person $person */ $person = $parameters['person']; - if ($this->authorizationChecker->isGranted(CSConnectesVoter::REPORT_NEW, $person)) { +// if ($this->authorizationChecker->isGranted(CSConnectesVoter::REPORT_NEW, $person)) { $menu->addChild('Situation personnelle', [ - 'route' => 'chill_crud_csperson_personal_situation_view', + 'route' => 'chill_job_personal_situation_view', 'routeParameters' => [ - 'id' => $person->getId(), + 'person' => $person->getId(), ], ]) ->setExtras([ 'order' => 50, ]); $menu->addChild('Dispositifs', [ - 'route' => 'chill_crud_csperson_dispositifs_view', + 'route' => 'chill_job_dispositifs_view', 'routeParameters' => [ - 'id' => $person->getId(), + 'person' => $person->getId(), ], ]) ->setExtras([ 'order' => 51, ]); - } +// } - $menu->addChild('Parcours d\'accompagnement', [ - 'route' => 'chill_csconnectes_csreport_index', + $menu->addChild('Emploi', [ + 'route' => 'chill_job_report_index', 'routeParameters' => [ 'person' => $person->getId(), ], diff --git a/src/Bundle/ChillJobBundle/src/Repository/CSPersonRepository.php b/src/Bundle/ChillJobBundle/src/Repository/CSPersonRepository.php index 177917364..ac833113e 100644 --- a/src/Bundle/ChillJobBundle/src/Repository/CSPersonRepository.php +++ b/src/Bundle/ChillJobBundle/src/Repository/CSPersonRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Repository; +namespace Chill\JobBundle\Repository; /** * CSPersonRepository. diff --git a/src/Bundle/ChillJobBundle/src/Repository/CV/ExperienceRepository.php b/src/Bundle/ChillJobBundle/src/Repository/CV/ExperienceRepository.php index 4651e13e8..46d6a52d7 100644 --- a/src/Bundle/ChillJobBundle/src/Repository/CV/ExperienceRepository.php +++ b/src/Bundle/ChillJobBundle/src/Repository/CV/ExperienceRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Repository\CV; +namespace Chill\JobBundle\Repository\CV; /** * ExperienceRepository. diff --git a/src/Bundle/ChillJobBundle/src/Repository/CV/FormationRepository.php b/src/Bundle/ChillJobBundle/src/Repository/CV/FormationRepository.php index 3278c3c18..29635d537 100644 --- a/src/Bundle/ChillJobBundle/src/Repository/CV/FormationRepository.php +++ b/src/Bundle/ChillJobBundle/src/Repository/CV/FormationRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Repository\CV; +namespace Chill\JobBundle\Repository\CV; /** * FormationRepository. diff --git a/src/Bundle/ChillJobBundle/src/Repository/CVRepository.php b/src/Bundle/ChillJobBundle/src/Repository/CVRepository.php index 0b9cdc8b9..5656871bf 100644 --- a/src/Bundle/ChillJobBundle/src/Repository/CVRepository.php +++ b/src/Bundle/ChillJobBundle/src/Repository/CVRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Repository; +namespace Chill\JobBundle\Repository; /** * CVRepository. diff --git a/src/Bundle/ChillJobBundle/src/Repository/FreinRepository.php b/src/Bundle/ChillJobBundle/src/Repository/FreinRepository.php index 5be7c12c3..f87e33852 100644 --- a/src/Bundle/ChillJobBundle/src/Repository/FreinRepository.php +++ b/src/Bundle/ChillJobBundle/src/Repository/FreinRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Repository; +namespace Chill\JobBundle\Repository; /** * FreinRepository. diff --git a/src/Bundle/ChillJobBundle/src/Repository/ImmersionRepository.php b/src/Bundle/ChillJobBundle/src/Repository/ImmersionRepository.php index 779bb070c..aa3d2d0d0 100644 --- a/src/Bundle/ChillJobBundle/src/Repository/ImmersionRepository.php +++ b/src/Bundle/ChillJobBundle/src/Repository/ImmersionRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Repository; +namespace Chill\JobBundle\Repository; /** * ImmersionRepository. diff --git a/src/Bundle/ChillJobBundle/src/Repository/ProjetProfessionnelRepository.php b/src/Bundle/ChillJobBundle/src/Repository/ProjetProfessionnelRepository.php index e46dcf2fd..f884245fc 100644 --- a/src/Bundle/ChillJobBundle/src/Repository/ProjetProfessionnelRepository.php +++ b/src/Bundle/ChillJobBundle/src/Repository/ProjetProfessionnelRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Repository; +namespace Chill\JobBundle\Repository; /** * ProjetProfessionnelRepository. diff --git a/src/Bundle/ChillJobBundle/src/Repository/Rome/AppellationRepository.php b/src/Bundle/ChillJobBundle/src/Repository/Rome/AppellationRepository.php index 6bbec7056..fcb152cd9 100644 --- a/src/Bundle/ChillJobBundle/src/Repository/Rome/AppellationRepository.php +++ b/src/Bundle/ChillJobBundle/src/Repository/Rome/AppellationRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Repository\Rome; +namespace Chill\JobBundle\Repository\Rome; /** * AppellationRepository. diff --git a/src/Bundle/ChillJobBundle/src/Repository/Rome/MetierRepository.php b/src/Bundle/ChillJobBundle/src/Repository/Rome/MetierRepository.php index bd6ebc488..04cbac60c 100644 --- a/src/Bundle/ChillJobBundle/src/Repository/Rome/MetierRepository.php +++ b/src/Bundle/ChillJobBundle/src/Repository/Rome/MetierRepository.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Repository\Rome; +namespace Chill\JobBundle\Repository\Rome; /** * MetierRepository. diff --git a/src/Bundle/ChillJobBundle/src/Resources/config/routing.yml b/src/Bundle/ChillJobBundle/src/Resources/config/routing.yml index 6e695ca80..9617e558d 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/config/routing.yml +++ b/src/Bundle/ChillJobBundle/src/Resources/config/routing.yml @@ -1,3 +1,3 @@ -csconnectes_sp_controllers: - resource: "@CSConnectesSPBundle/Controller" - type: annotation \ No newline at end of file +chill_job_controllers: + resource: "@ChillJobBundle/Controller" + type: annotation diff --git a/src/Bundle/ChillJobBundle/src/Resources/config/services.yml b/src/Bundle/ChillJobBundle/src/Resources/config/services.yml index a655348c4..7fbad064e 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/config/services.yml +++ b/src/Bundle/ChillJobBundle/src/Resources/config/services.yml @@ -8,5 +8,5 @@ imports: services: # cs_connectes_sp.example: -# class: Chill\ChillJobBundle\Example +# class: Chill\JobBundle\Example # arguments: ["@service_id", "plain_value", "%parameter%"] diff --git a/src/Bundle/ChillJobBundle/src/Resources/config/services/3party_type.yml b/src/Bundle/ChillJobBundle/src/Resources/config/services/3party_type.yml index 50cca8c30..aef7e8a71 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/config/services/3party_type.yml +++ b/src/Bundle/ChillJobBundle/src/Resources/config/services/3party_type.yml @@ -1,9 +1,9 @@ services: - Chill\ChillJobBundle\ThirdParty\PrescripteurType: + Chill\JobBundle\ThirdParty\PrescripteurType: tags: - { name: chill_3party.provider } - Chill\ChillJobBundle\ThirdParty\EntrepriseType: + Chill\JobBundle\ThirdParty\EntrepriseType: tags: - { name: chill_3party.provider } diff --git a/src/Bundle/ChillJobBundle/src/Resources/config/services/controller.yml b/src/Bundle/ChillJobBundle/src/Resources/config/services/controller.yml index 350953d57..517fa143d 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/config/services/controller.yml +++ b/src/Bundle/ChillJobBundle/src/Resources/config/services/controller.yml @@ -1,3 +1,13 @@ services: - Chill\ChillJobBundle\Controller\CSReportController: + Chill\JobBundle\Controller\CSReportController: + autoconfigure: true + autowire: true tags: ['controller.service_arguments'] + Chill\JobBundle\Controller\CSPersonController: + autoconfigure: true + autowire: true + tags: ['controller.service_arguments'] + Chill\JobBundle\Controller\CSCrudReportController: + autoconfigure: true + autowire: true + tags: [ 'controller.service_arguments' ] diff --git a/src/Bundle/ChillJobBundle/src/Resources/config/services/export.yml b/src/Bundle/ChillJobBundle/src/Resources/config/services/export.yml index 10a547740..e03ca2c37 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/config/services/export.yml +++ b/src/Bundle/ChillJobBundle/src/Resources/config/services/export.yml @@ -1,6 +1,6 @@ services: - Chill\ChillJobBundle\Export\ListCSPerson: + Chill\JobBundle\Export\ListCSPerson: arguments: $em: '@doctrine.orm.entity_manager' $translator: "@translator" @@ -9,19 +9,19 @@ services: tags: - { name: chill.export, alias: list_CSPerson } - Chill\ChillJobBundle\Export\ListCV: + Chill\JobBundle\Export\ListCV: arguments: $em: '@doctrine.orm.entity_manager' tags: - { name: chill.export, alias: list_CV } - Chill\ChillJobBundle\Export\ListFrein: + Chill\JobBundle\Export\ListFrein: arguments: $em: '@doctrine.orm.entity_manager' tags: - { name: chill.export, alias: list_Frein } - Chill\ChillJobBundle\Export\ListProjetProfessionnel: + Chill\JobBundle\Export\ListProjetProfessionnel: arguments: $em: '@doctrine.orm.entity_manager' tags: diff --git a/src/Bundle/ChillJobBundle/src/Resources/config/services/form.yml b/src/Bundle/ChillJobBundle/src/Resources/config/services/form.yml index 3dcc5d709..ecb99167a 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/config/services/form.yml +++ b/src/Bundle/ChillJobBundle/src/Resources/config/services/form.yml @@ -1,8 +1,8 @@ services: - Chill\ChillJobBundle\Form\Type\PickRomeAppellationType: + Chill\JobBundle\Form\Type\PickRomeAppellationType: autowire: true tags: - { name: form.type } - Chill\ChillJobBundle\Form\DataTransformer\RomeAppellationTransformer: + Chill\JobBundle\Form\DataTransformer\RomeAppellationTransformer: autowire: true diff --git a/src/Bundle/ChillJobBundle/src/Resources/config/services/menu.yml b/src/Bundle/ChillJobBundle/src/Resources/config/services/menu.yml index 0dfd289ea..ebc62af6e 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/config/services/menu.yml +++ b/src/Bundle/ChillJobBundle/src/Resources/config/services/menu.yml @@ -1,5 +1,5 @@ services: - Chill\ChillJobBundle\Menu\MenuBuilder: + Chill\JobBundle\Menu\MenuBuilder: arguments: $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface' tags: diff --git a/src/Bundle/ChillJobBundle/src/Resources/config/services/security.yml b/src/Bundle/ChillJobBundle/src/Resources/config/services/security.yml index e3745a9ef..3d94cec44 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/config/services/security.yml +++ b/src/Bundle/ChillJobBundle/src/Resources/config/services/security.yml @@ -1,12 +1,12 @@ services: - Chill\ChillJobBundle\Security\Authorization\CSConnectesVoter: + Chill\JobBundle\Security\Authorization\CSConnectesVoter: arguments: $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper' tags: - { name: security.voter } - { name: chill.role } - Chill\ChillJobBundle\Security\Authorization\ExportsVoter: + Chill\JobBundle\Security\Authorization\ExportsVoter: arguments: $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper' tags: diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_edit.html.twig index 82a4682d9..a2151e5cb 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_edit.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_edit.html.twig @@ -7,24 +7,24 @@ {% block crud_content_header %}

Dispositifs

{% endblock %} - + {# surcharge le block "retour" par un lien vers la page vue #} {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • {% endblock %} - + {% block content_form_actions_view %} {# no view acceptable #} - {% endblock %} - + {% endblock %} + {% block content_form_actions_save_and_close %} {# save and close does not makes sens #} {% endblock %} - + {% block crud_content_form_rows %}

    Accompagnement

    @@ -35,12 +35,12 @@
    {{ form_row(form.accompagnementRQTHDate) }}
    - +
    {{ form_row(form.accompagnementComment) }}
    {{ form_row(form.prescripteur) }} - + {{ form_row(form.dispositifsNotes) }}

    Pôle emploi

    @@ -48,7 +48,7 @@ {{ form_row(form.poleEmploiId) }} {{ form_row(form.poleEmploiInscriptionDate) }} - +

    CAF

    @@ -61,20 +61,20 @@

    Autres informations

    - + {{ form_row(form.cERInscriptionDate) }} {{ form_row(form.cERSignataire) }} {{ form_row(form.pPAEInscriptionDate) }} {{ form_row(form.pPAESignataire) }} - +
    {{ form_row(form.nEETEligibilite) }}
    - +
    {{ form_row(form.nEETCommissionDate) }}
    - + {{ form_row(form.fSEMaDemarcheCode) }} {{ form_row(form.dateContratIEJ) }} {{ form_row(form.dateAvenantIEJ) }} @@ -88,4 +88,4 @@ -{% endblock js %} \ No newline at end of file +{% endblock js %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_view.html.twig index 569aa7078..1cecaf0ad 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_view.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/dispositifs_view.html.twig @@ -10,13 +10,13 @@ {% block title 'Dispositifs d\'accompagnement de %name%'|trans( { '%name%': person.firstName ~ ' ' ~ person.lastName } ) %} -{% block personcontent %} +{% block content %}

    {{ 'Dispositifs d\'accompagnement de %name%'|trans( { '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}

    - +

    Accompagnement

    - +
    - +
    Accompagnements
    {% if entity.accompagnement is null or entity.accompagnement|length == 0 %}
    {{ null|chill_print_or_message }}
    @@ -37,46 +37,46 @@ {% endif %} - +
    Prescripteur
    - + {% if entity.prescripteur is not null %}
    {{ entity.prescripteur|chill_entity_render_box({'with_valid_from': false}) }}
    {% else %}
    {{ null|chill_print_or_message }}
    {% endif %} - +
    Notes
    {{ entity.dispositifsNotes|chill_print_or_message("Aucune note", 'blockquote') }}
    - +

    Pôle emploi

    - +
    Identifiant pôle emploi
    {{ entity.poleEmploiId|chill_print_or_message }}
    - +
    Date d'inscription pôle emploi
    {{ entity.poleEmploiInscriptionDate|chill_print_or_message }}
    - +
    - +

    CAF

    - +
    Identifiant CAF
    {{ entity.cafId|chill_print_or_message }}
    - +
    Date d'inscription CAF
    {{ entity.cafInscriptionDate|chill_print_or_message }}
    - +
    - +

    Autres informations

    - +
    {% for item in [ - ['cERInscriptionDate', 'Date CER'], + ['cERInscriptionDate', 'Date CER'], ['cERSignataire', 'Signataire CER'], ['pPAEInscriptionDate', 'Date PPAE'], ['pPAESignataire', 'Signataire PPAE'], @@ -84,7 +84,7 @@
    {{ item[1] }}
    {{ attribute(entity, item[0])|chill_print_or_message }}
    {% endfor %} - +
    Éligibilite NEET
    {% if entity.nEETEligibilite is null %} @@ -97,30 +97,30 @@ {{ ('neet_eligibility.' ~ entity.nEETEligibilite)|trans }} {% endif %}
    - +
    Code "Ma démarche FSE"
    {{ entity.fSEMaDemarcheCode|chill_print_or_message }}
    - + {% if entity.dateContratIEJ != null or entity.dateAvenantIEJ != null %}
    IEJ
    {% if entity.dateContratIEJ != null %} -

    Date du contrat IEJ : {{ entity.dateContratIEJ|localizeddate('long', 'none') }}

    +

    Date du contrat IEJ : {{ entity.dateContratIEJ|format_date('long', 'none') }}

    {% endif %} {% if entity.dateAvenantIEJ != null %} -

    Date de l'avenant IEJ : {{ entity.dateAvenantIEJ|localizeddate('long', 'none') }}

    +

    Date de l'avenant IEJ : {{ entity.dateAvenantIEJ|format_date('long', 'none') }}

    {% endif %}
    {% endif %}
    - + {% endblock personcontent %} - + {% block css %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig index 04f73a0ed..314c00791 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_edit.html.twig @@ -7,93 +7,93 @@ {% block crud_content_header %}

    Situation personnelle

    {% endblock %} - + {# surcharge le block "retour" par un lien vers la page vue #} {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • {% endblock %} - + {% block content_form_actions_view %} {# no view acceptable #} - {% endblock %} - + {% endblock %} + {% block content_form_actions_save_and_close %} {# save and close does not makes sens #} {% endblock %} - + {% block crud_content_form_rows %}

    Logement

    - +
    {{ form_row(form.situationLogement) }}
    - +
    {{ form_row(form.situationLogementPrecision) }}
    - +

    Situation familiale

    - + {{ form_row(form.enfantACharge) }} {{ form_row(form.personMaritalStatus) }} - +

    Maitrise de la langue

    - + {{ form_row(form.niveauMaitriseLangue) }} - +

    Mobilité

    - + {{ form_row(form.mobiliteMoyenDeTransport) }} {{ form_row(form.vehiculePersonnel) }} {{ form_row(form.permisConduire) }} {{ form_row(form.mobiliteNotes) }} - +

    Situation professionnelle et économique

    - +
    {{ form_row(form.situationProfessionnelle) }}
    - + {{ form_row(form.dateFinDernierEmploi) }} - +
    {{ form_row(form.typeContrat) }}
    - +
    {{ form_row(form.typeContratAide) }}
    - +
    {{ form_row(form.ressources) }}
    - +
    {{ form_row(form.ressourcesComment) }}
    - + {{ form_row(form.ressourceDate1Versement) }} {{ form_row(form.cPFMontant) }} {{ form_row(form.acompteDIF) }} - +

    Situation de handicap

    - +
    {{ form_row(form.handicapIs) }}
    - +
    {{ form_row(form.handicapNotes) }} {{ form_row(form.handicapRecommandation) }} {{ form_row(form.handicapAccompagnement) }}
    - +

    Documents

    - + {{ form_row(form.documentCV) }} {{ form_row(form.documentAgrementIAE) }} {{ form_row(form.documentRQTH) }} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_view.html.twig index a0063cabd..7f8798801 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_view.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/CSPerson/personal_situation_view.html.twig @@ -12,26 +12,26 @@ {% block title 'Situation personnelle de %name%'|trans( { '%name%': person.firstName ~ ' ' ~ person.lastName } ) %} -{% block personcontent %} +{% block content %}

    {{ 'Situation personnelle de %name%'|trans( { '%name%': person.firstName ~ ' ' ~ person.lastName } ) }}

    - +

    Logement

    - +
    - +
    Situation de logement
    {% if entity.situationLogement is not null %}
    {{ ('situation_logement.' ~ entity.situationLogement)|trans }}
    {% else %}
    {{ null|chill_print_or_message("Aucune information") }}
    {% endif %} - +
    - +

    Situation familiale

    - +
    - +
    Enfants à charge
    {% if entity.enfantACharge is not null %}
    @@ -39,7 +39,7 @@ {% else %}
    {{ null|chill_print_or_message }}
    {% endif %} - +
    {{'Marital status'|trans}} :
    {% if entity.person.maritalStatus is not null %} @@ -48,13 +48,13 @@ {{ 'No data given'|trans }} {% endif %}
    - +
    - +

    Maitrise de la langue

    - +
    - +
    Niveau de maitrise de la langue française
    {% if entity.niveauMaitriseLangue is null or entity.niveauMaitriseLangue|length == 0 %}
    {{ null|chill_print_or_message }}
    @@ -70,12 +70,12 @@ {% endif %}
    - +

    Mobilité

    - +
    - +
    Moyens de transports accessibles
    {% if entity.mobiliteMoyenDeTransport is null or entity.mobiliteMoyenDeTransport|length == 0 %} @@ -88,16 +88,16 @@ {% endif %}
    - +
    Véhicule Personnel
    - {% if entity.vehiculePersonnel is null %} + {% if entity.vehiculePersonnel is null %}
    {{ null|chill_print_or_message }}
    {% elseif entity.vehiculePersonnel == true %}
    A un véhicule personnel
    {% else %}
    N'a pas de véhicule personnel
    {% endif %} - +
    Permis de conduire
    {% if entity.permisConduire is null or entity.permisConduire|length == 0 %}
    {{ null|chill_print_or_message }}
    @@ -112,31 +112,31 @@ {% endif %} - +
    Notes concernant la mobilité
    {{ entity.mobiliteNotes|chill_print_or_message("Aucune note", 'blockquote') }}
    - +

    Situation professionnelle et économique

    - +
    - +
    Situation professionnelle
    {% if entity.situationProfessionnelle is not null %}
    {{ ('situation_professionnelle.' ~ entity.situationProfessionnelle)|trans }}
    {% else %}
    {{ null|chill_print_or_message }}
    {% endif %} - +
    Date de fin du dernier emploi
    {% if entity.dateFinDernierEmploi is not null %} -
    {{ entity.dateFinDernierEmploi|localizeddate('medium', 'none') }} +
    {{ entity.dateFinDernierEmploi|format_date('medium', 'none') }} {% else %}
    {{ null|chill_print_or_message }}
    {% endif %} - + {% if entity.situationProfessionnelle == 'en_activite' %}
    Type de contrat
    {% if entity.typeContrat is null or entity.typeContrat|length == 0 %} @@ -172,10 +172,10 @@ {% endif %} - +
    Date du premier versement
    {% if entity.ressourceDate1Versement is not null %} -
    {{ entity.ressourceDate1Versement|localizeddate('medium', 'none') }} +
    {{ entity.ressourceDate1Versement|format_date('medium', 'none') }} {% else %}
    {{ null|chill_print_or_message }}
    {% endif %} @@ -186,19 +186,19 @@ {% else %}
    {{ null|chill_print_or_message }}
    {% endif %} - - + +
    Montant acompte DIF
    {% if entity.acompteDIF is not null %}
    {{ entity.acompteDIF|localizedcurrency('EUR') }}
    {% else %}
    {{ null|chill_print_or_message }}
    {% endif %} - +
    - +

    Handicap

    - +
    Handicap ?
    @@ -212,7 +212,7 @@ Non {% endif %}
    - + {% if entity.handicapIs %}
    Recommandation
    @@ -222,7 +222,7 @@ {{ ('handicap_recommandation.' ~ entity.handicapRecommandation)|trans }} {% endif %}
    - +
    Accompagnement
    {% if entity.handicapAccompagnement is not null %}
    {{ entity.handicapAccompagnement.name }}
    @@ -231,11 +231,11 @@ {% endif %} {% endif %}
    - +

    Documents

    - +
    - + {% for r in [ ['documentCV', 'CV'], ['documentAgrementIAE', 'Document Agrément AIE'], @@ -252,7 +252,7 @@ ['documentFactureElectricite', "Facture d'électricité"], ['documentAttestationSecuriteSociale', "Attestation sécurité sociale"], ] %} - +
    {{ r[1] }}
    {% set document = attribute(entity, r[0]) %} {% if document is null %} @@ -262,10 +262,10 @@ {% endif %} {% endfor %} - +
    - - + + @@ -279,4 +279,4 @@ {% block js %} {{ parent() }} -{% endblock js %} \ No newline at end of file +{% endblock js %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CV/edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CV/edit.html.twig index 96b9428ce..b0d11ec8c 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/CV/edit.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/CV/edit.html.twig @@ -21,34 +21,34 @@ {{ form_row(form.diplomaReconnue) }}
    - + {% endblock %} {% block personcontent %} {% embed '@ChillPerson/CRUD/_edit_content.html.twig' %} {% block crud_content_form_rows %} - - + + {{ form_row(form.reportDate) }} {{ form_row(form.formationLevel) }} {{ form_row(form.formationType) }} {{ form_row(form.spokenLanguages) }} - +

    Formations

    {{ form_widget(form.formations) }} - +

    Expériences

    {{ form_widget(form.experiences) }} - +

    Notes

    {{ form_widget(form.notes) }} {% endblock crud_content_form_rows %} - + {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • @@ -58,4 +58,4 @@ {% block css %} -{% endblock css %} \ No newline at end of file +{% endblock css %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CV/new.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CV/new.html.twig index c7842f048..8d3b970e3 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/CV/new.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/CV/new.html.twig @@ -21,7 +21,7 @@ {{ form_row(form.diplomaReconnue) }} - + {% endblock %} {% block personcontent %} @@ -29,26 +29,26 @@ {% block crud_content_header %}

    {{ ('crud.'~crud_name~'.title_new')|trans({'%person%': person|chill_entity_render_string }) }}

    {% endblock crud_content_header %} - + {% block crud_content_form_rows %} {{ form_row(form.reportDate) }} {{ form_row(form.formationLevel) }} {{ form_row(form.formationType) }} {{ form_row(form.spokenLanguages) }} - +

    Formations

    {{ form_widget(form.formations) }} - +

    Expériences

    {{ form_widget(form.experiences) }} - +

    Notes

    {{ form_widget(form.notes) }} {% endblock crud_content_form_rows %} - + {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • @@ -58,4 +58,4 @@ {% block css %} -{% endblock css %} \ No newline at end of file +{% endblock css %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig index cf9c3a962..89655a425 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig @@ -9,10 +9,10 @@ {% block crud_content_view_details %}
    Date du rapport
    -
    {{ entity.reportDate|localizeddate('long', 'none') }}
    +
    {{ entity.reportDate|format_date('long', 'none') }}

    Compétences

    - +
    Langues parlées
    {% if entity.spokenLanguages is null or entity.spokenLanguages|length == 0 %} @@ -23,42 +23,42 @@ {% endfor %} {% endif %}
    - +

    Formation

    - +
    Niveau de formation
    {{ (entity.formationLevel is null ? null : ('formation_level.' ~ entity.formationLevel))|chill_print_or_message("Aucune information") }}
    - +
    Type de formation
    {{ (entity.formationType is null ? null : ('formation_type.' ~ entity.formationType))|chill_print_or_message("Aucune information") }}
    - +

    Formations suivies

    - +
    {% for f in entity.formations %}

    {{ f.title }}{% if f.organisme is not empty %} auprès de {{ f.organisme }}{% endif %}

    - +
    - +
    Dates de formation
    {% if f.startDate is null and f.endDate is null %} {{ null|chill_print_or_message("Aucune date indiquée") }} {% elseif f.startDate is null %} - Jusqu'au {{ f.endDate|localizeddate('long', 'none') }} (date de début inconnue) + Jusqu'au {{ f.endDate|format_date('long', 'none') }} (date de début inconnue) {% elseif f.endDate is null %} - Depuis le {{ f.startDate|localizeddate('long', 'none') }} (date de fin inconnue) + Depuis le {{ f.startDate|format_date('long', 'none') }} (date de fin inconnue) {% else %} - Du {{ f.startDate|localizeddate('long', 'none') }} au {{ f.endDate|localizeddate('long', 'none') }} + Du {{ f.startDate|format_date('long', 'none') }} au {{ f.endDate|format_date('long', 'none') }} {% endif %}
    - +
    Diplôme

    Diplôme obtenu: {{ (f.diplomaObtained is null ? null : ('diploma_obtained.' ~ f.diplomaObtained))|chill_print_or_message("Aucune information") }}

    @@ -70,34 +70,34 @@

    Aucune formation renseignée

    {% endfor %}
    - +

    Expériences

    - +
    {% for f in entity.experiences %}

    {{ f.poste }} {% if f.structure is not empty %}auprès de {{ f.structure }}{% endif %}

    - +
    - +
    Dates de l'expérience
    {% if f.startDate is null and f.endDate is null %} {{ null|chill_print_or_message("Aucune date indiquée") }} {% elseif f.startDate is null %} - Jusqu'au {{ f.endDate|localizeddate('long', 'none') }} (date de début inconnue) + Jusqu'au {{ f.endDate|format_date('long', 'none') }} (date de début inconnue) {% elseif f.endDate is null %} - Depuis le {{ f.startDate|localizeddate('long', 'none') }} (date de fin inconnue) + Depuis le {{ f.startDate|format_date('long', 'none') }} (date de fin inconnue) {% else %} - Du {{ f.startDate|localizeddate('long', 'none') }} au {{ f.endDate|localizeddate('long', 'none') }} + Du {{ f.startDate|format_date('long', 'none') }} au {{ f.endDate|format_date('long', 'none') }} {% endif %}
    - +
    Type de contrat
    {{ (f.contratType is null ? null : ('xp_contrat_type.'~f.contratType))|chill_print_or_message }}
    - + {% if f.notes is not empty %}
    Notes
    @@ -110,16 +110,16 @@

    Aucune formation renseignée

    {% endfor %}
    - - + +

    Note

    - + {{ entity.notes|chill_print_or_message("Aucune note", 'blockquote') }} {% endblock crud_content_view_details %} - + {% block content_view_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • @@ -139,4 +139,4 @@ background-color: var(--chill-beige); } -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/edit.html.twig index 8e022d6b1..296ea7d56 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/edit.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/edit.html.twig @@ -11,10 +11,10 @@ {% embed '@ChillPerson/CRUD/_edit_content.html.twig' %} {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • {% endblock %} {% endembed %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/new.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/new.html.twig index be8d2a84a..415f1f610 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/new.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/new.html.twig @@ -14,7 +14,7 @@ {% endblock crud_content_header %} {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig index e32d4a453..a93f9dbf6 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig @@ -9,7 +9,7 @@ {% block crud_content_view_details %}
    Date du rapport
    -
    {{ entity.reportDate|localizeddate('long', 'none') }}
    +
    {{ entity.reportDate|format_date('long', 'none') }}
    Freins identifiés
    @@ -27,7 +27,7 @@ {{ entity.notesPerso|chill_print_or_message(null, 'blockquote') }} {% endif %}
    - +
    Freins d'accès à l'emploi
    {% if entity.freinsEmploi|length > 0 %} @@ -46,13 +46,13 @@
    {% endblock crud_content_view_details %} - + {% block content_view_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • {% endblock %} {% endembed %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit-bilan.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit-bilan.html.twig index 37ca1f40a..b5449a158 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit-bilan.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit-bilan.html.twig @@ -12,81 +12,81 @@ Bilan d'immersion {% block crud_content_header %}

    Bilan d'immersion

    {% endblock crud_content_header %} - + {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • {% endblock %} - + {% block crud_content_form_rows %}

    - Immersion du {{ entity.debutDate|localizeddate('long', 'none') }} au {{ entity.getDateEndComputed|localizeddate('long', 'none') }}, + Immersion du {{ entity.debutDate|format_date('long', 'none') }} au {{ entity.getDateEndComputed|format_date('long', 'none') }}, auprès de 

    {{ entity.entreprise.name }}
    Domaine d'activité: {{ entity.domaineActivite }}

    Modifier

    - +

    Savoir-être du jeune

    - + {{ form_widget(form.savoirEtre) }} - + {{ form_row(form.savoirEtreNote) }} - +

    Ponctualité

    - + {{ form_row(form.ponctualiteSalarie) }} {{ form_row(form.ponctualiteSalarieNote) }} - +

    Assiduité

    {{ form_row(form.assiduite) }} {{ form_row(form.assiduiteNote) }} - +

    Intégration

    {{ form_row(form.interetActivite) }} {{ form_row(form.interetActiviteNote) }} - + {{ form_row(form.integreRegle) }} {{ form_row(form.integreRegleNote) }} - +

    Autonomie

    {{ form_row(form.espritInitiative) }} {{ form_row(form.espritInitiativeNote) }} - + {{ form_row(form.organisation) }} {{ form_row(form.organisationNote) }} - +

    Attitude

    {{ form_row(form.capaciteTravailEquipe) }} {{ form_row(form.capaciteTravailEquipeNote) }} - +

    Posture professionnelle

    {{ form_row(form.styleVestimentaire) }} {{ form_row(form.styleVestimentaireNote) }} - + {{ form_row(form.langageProf) }} {{ form_row(form.langageProfNote) }} - +

    Relation avec la hiérarchie

    {{ form_row(form.appliqueConsigne) }} {{ form_row(form.appliqueConsigneNote) }} - + {{ form_row(form.respectHierarchie) }} {{ form_row(form.respectHierarchieNote) }} - +

    Savoir-faire développés

    - + {{ form_row(form.principalesActivites) }} {{ form_row(form.competencesAcquises) }} {{ form_row(form.competencesADevelopper) }} - +

    Notes

    - + {{ form_widget(form.noteBilan) }} - + {% endblock %} {% endembed %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit.html.twig index aacfc14fd..8fad837dd 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/edit.html.twig @@ -11,55 +11,55 @@ {% embed '@ChillPerson/CRUD/_edit_content.html.twig' %} {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • {% endblock %} - + {% block crud_content_form_rows %} {{ form_row(form.entreprise) }} {{ form_row(form.domaineActivite) }} - +

    Tuteur

    - + {{ form_row(form.tuteurName) }} {{ form_row(form.tuteurFonction) }} {{ form_row(form.tuteurPhoneNumber) }} - +

    Structure d'accompagnement

    - + {{ form_row(form.structureAccName) }} {{ form_row(form.structureAccPhonenumber) }} {{ form_row(form.structureAccEmail) }} {{ form_widget(form.structureAccAddress) }} - +

    Descriptif du poste occupé

    - + {{ form_row(form.posteTitle) }} {{ form_row(form.posteLieu) }} {{ form_row(form.debutDate) }} {{ form_row(form.duration) }} {{ form_row(form.horaire) }} - +

    Objectifs

    - +
    {{ form_widget(form.objectifs) }}
    - +
    {{ form_row(form.objectifsAutre) }}
    - +

    Notes

    - + {{ form_widget(form.noteImmersion) }} - + {% endblock %} {% endembed %} {% endblock %} {% block js %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/new.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/new.html.twig index eeeb1b2c4..20da94044 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/new.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/new.html.twig @@ -14,51 +14,51 @@ {% endblock crud_content_header %} {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • {% endblock %} - + {% block crud_content_form_rows %} {{ form_row(form.entreprise) }} {{ form_row(form.domaineActivite) }} - +

    Tuteur

    - + {{ form_row(form.tuteurName) }} {{ form_row(form.tuteurFonction) }} {{ form_row(form.tuteurPhoneNumber) }} - +

    Structure d'accompagnement

    - + {{ form_row(form.structureAccName) }} {{ form_row(form.structureAccPhonenumber) }} {{ form_row(form.structureAccEmail) }} {{ form_widget(form.structureAccAddress) }} - +

    Descriptif du poste occupé

    - + {{ form_row(form.posteTitle) }} {{ form_row(form.posteLieu) }} {{ form_row(form.debutDate) }} {{ form_row(form.duration) }} {{ form_row(form.horaire) }} - +

    Objectifs

    - +
    {{ form_widget(form.objectifs) }}
    - +
    {{ form_row(form.objectifsAutre) }}
    - +

    Notes

    - + {{ form_widget(form.noteImmersion) }} - + {% endblock %} {% endembed %} {% endblock %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig index d5f789431..26d4c2efc 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig @@ -8,24 +8,24 @@ {% block crud_content_view_details %} {% import 'ChillMainBundle:Address:macro.html.twig' as macro_address %} - +

    Entreprise

    - +
    Entreprise
    {{ entity.entreprise|chill_entity_render_box({'with_valid_from': false}) }}
    - +
    Domaine d'activité
    {{ entity.domaineActivite }}
    - +

    Tuteur

    - +
    Nom du tuteur
    {{ entity.tuteurName }}
    - +
    Fonction du tuteur
    {{ entity.tuteurFonction }}
    - + {% if entity.tuteurPhoneNumber is not empty %}
    Téléphone du tuteur
    @@ -54,8 +54,8 @@
    {{ entity.posteLieu|chill_print_or_message }}
    Dates
    -
    Du {{ entity.debutDate|localizeddate('long', 'none') }} - au {{ entity.getDateEndComputed|localizeddate('long', 'none') }} +
    Du {{ entity.debutDate|format_date('long', 'none') }} + au {{ entity.getDateEndComputed|format_date('long', 'none') }}
    Horaire
    @@ -123,8 +123,8 @@ ['Posture professionnelle'], ['styleVestimentaire', 'Style vestimentaire adapté'], ['langageProf', "Langage professionnel"], - ['Relation avec la hiérarchie'], - ['appliqueConsigne', "Applique les consignes"], + ['Relation avec la hiérarchie'], + ['appliqueConsigne', "Applique les consignes"], ['respectHierarchie', "Respecte les niveaux hiérarchiques"], ] %} {% if line|length == 1 %} @@ -151,8 +151,8 @@ {% endif %} {% endfor %} - {% if entity.principalesActivites is not empty - or entity.competencesAcquises is not empty + {% if entity.principalesActivites is not empty + or entity.competencesAcquises is not empty or entity.competencesADevelopper is not empty %}

    Savoir-faire développés

    @@ -185,10 +185,10 @@ {% endif %}
    {% endblock crud_content_view_details %} - + {% block content_view_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • @@ -206,4 +206,4 @@ {% block css %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/edit.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/edit.html.twig index 335019564..2a25f9186 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/edit.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/edit.html.twig @@ -12,38 +12,38 @@ {% block crud_content_header %}

    {{ ('crud.'~crud_name~'.title_edit')|trans({'%person%': person|chill_entity_render_string }) }}

    {% endblock crud_content_header %} - + {% block crud_content_form_rows %} {{ form_row(form.reportDate) }} - +

    Orientation souhaitée

    - + {{ form_row(form.souhait) }} {{ form_row(form.domaineActiviteSouhait) }} - + {{ form_row(form.typeContrat) }} {{ form_row(form.typeContratNotes) }} - + {{ form_row(form.volumeHoraire) }} {{ form_row(form.volumeHoraireNotes) }} - +

    Projet professionnel

    - + {{ form_row(form.idee) }} {{ form_row(form.enCoursConstruction) }} - + {{ form_row(form.valide) }} {{ form_row(form.domaineActiviteValide) }} {{ form_row(form.valideNotes) }} - +

    Notes

    - + {{ form_widget(form.projetProfessionnelNote) }} {% endblock %} - + {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/new.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/new.html.twig index c27a45419..9ccc87bdb 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/new.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/new.html.twig @@ -12,38 +12,38 @@ {% block crud_content_header %}

    {{ ('crud.'~crud_name~'.title_new')|trans({'%person%': person|chill_entity_render_string }) }}

    {% endblock crud_content_header %} - + {% block crud_content_form_rows %} {{ form_row(form.reportDate) }} - +

    Orientation souhaitée

    - + {{ form_row(form.souhait) }} {{ form_row(form.domaineActiviteSouhait) }} - + {{ form_row(form.typeContrat) }} {{ form_row(form.typeContratNotes) }} - + {{ form_row(form.volumeHoraire) }} {{ form_row(form.volumeHoraireNotes) }} - +

    Projet professionnel

    - + {{ form_row(form.idee) }} {{ form_row(form.enCoursConstruction) }} - + {{ form_row(form.valide) }} {{ form_row(form.domaineActiviteValide) }} {{ form_row(form.valideNotes) }} - +

    Notes

    - + {{ form_widget(form.projetProfessionnelNote) }} {% endblock %} - + {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig index ba221ef62..fa3a28329 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig @@ -9,10 +9,10 @@ {% block crud_content_view_details %}
    Date
    -
    {{ entity.reportDate|localizeddate('long', 'none') }}
    - +
    {{ entity.reportDate|format_date('long', 'none') }}
    +

    Souhaits

    - +
    Orientation souhaitée
    {% for r in entity.souhait %} @@ -27,7 +27,7 @@
    {{ entity.domaineActiviteSouhait|nl2br }}
    {% endif %}
    - +
    Type de contrat recherché
    {% for type in entity.typeContrat %} @@ -35,12 +35,12 @@
  • {{ ('projet_prof.type_contrat.' ~ type)|trans }}
    • {% if loop.last %}{% endif %} {% endfor %} - + {% if entity.typeContratNotes is not empty %}
    {{ entity.typeContratNotes|nl2br }}
    {% endif %}
    - +
    Volume horaire souhaité
    {% for type in entity.volumeHoraire %} @@ -48,24 +48,24 @@
  • {{ ('projet_prof.volume_horaire.' ~ type)|trans }}
    • {% if loop.last %}{% endif %} {% endfor %} - + {% if entity.volumeHoraireNotes is not empty %}
    {{ entity.volumeHoraireNotes|nl2br }}
    {% endif %}
    - +

    Projet professionnel

    - +
    Idée
    {{ entity.idee|chill_print_or_message('Aucune information', 'blockquote') }}
    - +
    En cours de construction
    {{ entity.enCoursConstruction|chill_print_or_message('Aucune information', 'blockquote') }}
    - +
    Validé
    {% for r in entity.valide %} @@ -75,7 +75,7 @@ {% else %}

    Aucune orientation indiquée

    {% endfor %} - + {% if entity.valideNotes is not empty %}
    {{ entity.valideNotes|nl2br }} @@ -87,17 +87,17 @@ {% endif %}
    - +

    Notes

    - + {{ entity.projetProfessionnelNote|chill_print_or_message('Aucune note', 'blockquote') }} - - + + {% endblock crud_content_view_details %} - + {% block content_view_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • @@ -105,4 +105,4 @@ {% block content_view_actions_after %} {% endblock %} {% endembed %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Report/delete.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Report/delete.html.twig index d805dfdac..5b09e3622 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/Report/delete.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/Report/delete.html.twig @@ -7,7 +7,7 @@ {% embed '@ChillMain/CRUD/_delete_content.html.twig' %} {% block content_form_actions_back %}
  • - + {{ 'Cancel'|trans }}
    • diff --git a/src/Bundle/ChillJobBundle/src/Resources/views/Report/index.html.twig b/src/Bundle/ChillJobBundle/src/Resources/views/Report/index.html.twig index a9d3fcba0..b8fe5105b 100644 --- a/src/Bundle/ChillJobBundle/src/Resources/views/Report/index.html.twig +++ b/src/Bundle/ChillJobBundle/src/Resources/views/Report/index.html.twig @@ -1,11 +1,11 @@ -{% extends '@ChillPerson/layout.html.twig' %} +{% extends '@ChillPerson/Person/layout.html.twig' %} {% set activeRouteKey = '' %} -{% block personcontent %} +{% block content %}

    Rapports pour {{ person|chill_entity_render_string }}

    - + {% if cvs is defined %}

    CV

    @@ -22,7 +22,7 @@ {% for cv in cvs %} - {{ cv.reportDate|localizeddate('short', 'none') }} + {{ cv.reportDate|format_date('short', 'none') }}
    • @@ -52,7 +52,7 @@
    {% endif %} - + {% if freins is defined %}

    Freins

    @@ -70,7 +70,7 @@ {% for frein in freins %} - {{ frein.reportDate|localizeddate('short', 'none') }} + {{ frein.reportDate|format_date('short', 'none') }} {% if frein.freinsPerso|merge(frein.freinsEmploi)|length > 0 %}
      @@ -113,9 +113,9 @@
    - + {% endif %} - + {% if immersions is defined %}

    Immersions

    @@ -133,7 +133,7 @@ {% for im in immersions %} - {{ im.debutDate|localizeddate('short', 'none') }} + {{ im.debutDate|format_date('short', 'none') }} {{ im.entreprise.name }} @@ -172,8 +172,8 @@ {% endif %} - - {% if projet_professionnels is defined %} + + {% if projet_professionnels is defined %}

    Projets professionnels

    @@ -192,7 +192,7 @@ {% for pr in projet_professionnels %} - {{ pr.reportDate|localizeddate('short', 'none') }} + {{ pr.reportDate|format_date('short', 'none') }} {% set romes = [] %} {% if pr.valide|length > 0 %} @@ -250,4 +250,4 @@ {% endif %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php b/src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php index 6e284b631..1e1196b59 100644 --- a/src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php +++ b/src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php @@ -9,15 +9,15 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Security\Authorization; +namespace Chill\JobBundle\Security\Authorization; use Chill\MainBundle\Security\Authorization\AbstractChillVoter; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; -use Chill\ChillJobBundle\Entity\Frein; -use Chill\ChillJobBundle\Entity\CV; +use Chill\JobBundle\Entity\Frein; +use Chill\JobBundle\Entity\CV; use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface; -use Chill\ChillJobBundle\Entity\Immersion; -use Chill\ChillJobBundle\Entity\ProjetProfessionnel; +use Chill\JobBundle\Entity\Immersion; +use Chill\JobBundle\Entity\ProjetProfessionnel; use Chill\MainBundle\Security\ProvideRoleHierarchyInterface; use Chill\PersonBundle\Entity\Person; use Chill\MainBundle\Security\Authorization\AuthorizationHelper; @@ -103,7 +103,7 @@ class CSConnectesVoter extends AbstractChillVoter implements ProvideRoleHierarch return true; } - public function getRoles() + public function getRoles(): array { return self::ALL; } diff --git a/src/Bundle/ChillJobBundle/src/Security/Authorization/ExportsVoter.php b/src/Bundle/ChillJobBundle/src/Security/Authorization/ExportsVoter.php index 0949bcfc9..d66507ba5 100644 --- a/src/Bundle/ChillJobBundle/src/Security/Authorization/ExportsVoter.php +++ b/src/Bundle/ChillJobBundle/src/Security/Authorization/ExportsVoter.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Security\Authorization; +namespace Chill\JobBundle\Security\Authorization; use Chill\MainBundle\Entity\Center; use Chill\MainBundle\Entity\User; @@ -89,7 +89,7 @@ class ExportsVoter extends AbstractChillVoter implements ProvideRoleHierarchyInt * * @return array where keys are the hierarchy, and values an array of roles: `[ 'title' => [ 'CHILL_FOO_SEE', 'CHILL_FOO_UPDATE' ] ]` */ - public function getRolesWithHierarchy() + public function getRolesWithHierarchy(): array { return ['CSConnectes' => $this->getRoles()]; } @@ -99,7 +99,7 @@ class ExportsVoter extends AbstractChillVoter implements ProvideRoleHierarchyInt * * @return string[] array of roles (as string) */ - public function getRoles() + public function getRoles(): array { return $this->getAttributes(); } @@ -109,7 +109,7 @@ class ExportsVoter extends AbstractChillVoter implements ProvideRoleHierarchyInt * * @return string[] array of roles without scopes */ - public function getRolesWithoutScope() + public function getRolesWithoutScope(): array { return $this->getAttributes(); } diff --git a/src/Bundle/ChillJobBundle/src/Tests/Controller/CSPersonControllerTest.php b/src/Bundle/ChillJobBundle/src/Tests/Controller/CSPersonControllerTest.php index 4e983c8b9..a6b19e648 100644 --- a/src/Bundle/ChillJobBundle/src/Tests/Controller/CSPersonControllerTest.php +++ b/src/Bundle/ChillJobBundle/src/Tests/Controller/CSPersonControllerTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Tests\Controller; +namespace Chill\JobBundle\Tests\Controller; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; diff --git a/src/Bundle/ChillJobBundle/src/Tests/Controller/CSReportControllerTest.php b/src/Bundle/ChillJobBundle/src/Tests/Controller/CSReportControllerTest.php index 091597b24..fd81b8e99 100644 --- a/src/Bundle/ChillJobBundle/src/Tests/Controller/CSReportControllerTest.php +++ b/src/Bundle/ChillJobBundle/src/Tests/Controller/CSReportControllerTest.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\Tests\Controller; +namespace Chill\JobBundle\Tests\Controller; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; diff --git a/src/Bundle/ChillJobBundle/src/ThirdParty/EntrepriseType.php b/src/Bundle/ChillJobBundle/src/ThirdParty/EntrepriseType.php index 9c9b8dbd9..347d9c7d9 100644 --- a/src/Bundle/ChillJobBundle/src/ThirdParty/EntrepriseType.php +++ b/src/Bundle/ChillJobBundle/src/ThirdParty/EntrepriseType.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\ThirdParty; +namespace Chill\JobBundle\ThirdParty; use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeProviderInterface; diff --git a/src/Bundle/ChillJobBundle/src/ThirdParty/PrescripteurType.php b/src/Bundle/ChillJobBundle/src/ThirdParty/PrescripteurType.php index f850b5c12..a53c16547 100644 --- a/src/Bundle/ChillJobBundle/src/ThirdParty/PrescripteurType.php +++ b/src/Bundle/ChillJobBundle/src/ThirdParty/PrescripteurType.php @@ -9,7 +9,7 @@ declare(strict_types=1); * the LICENSE file that was distributed with this source code. */ -namespace Chill\ChillJobBundle\ThirdParty; +namespace Chill\JobBundle\ThirdParty; use Chill\ThirdPartyBundle\ThirdPartyType\ThirdPartyTypeProviderInterface; diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php index cd2917798..72ad60ace 100644 --- a/src/Bundle/ChillMainBundle/Entity/Address.php +++ b/src/Bundle/ChillMainBundle/Entity/Address.php @@ -446,7 +446,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface return $this; } - public function setLinkedToThirdParty($linkedToThirdParty): self + public function setLinkedToThirdParty(?\Chill\ThirdPartyBundle\Entity\ThirdParty $linkedToThirdParty): self { $this->linkedToThirdParty = $linkedToThirdParty; diff --git a/src/Bundle/ChillMainBundle/Entity/Center.php b/src/Bundle/ChillMainBundle/Entity/Center.php index 61a026b5e..e898fea8c 100644 --- a/src/Bundle/ChillMainBundle/Entity/Center.php +++ b/src/Bundle/ChillMainBundle/Entity/Center.php @@ -111,7 +111,7 @@ class Center implements HasCenterInterface, \Stringable /** * @return $this */ - public function setName($name) + public function setName(string $name) { $this->name = $name; diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php index aec4e3dde..ee90fb88b 100644 --- a/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php +++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php @@ -64,7 +64,7 @@ class CommentEmbeddable /** * @param int $userId */ - public function setUserId($userId) + public function setUserId(?int $userId) { $this->userId = $userId; } diff --git a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php index 6e5168c63..0c2af22f7 100644 --- a/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php +++ b/src/Bundle/ChillMainBundle/Entity/Embeddable/PrivateCommentEmbeddable.php @@ -57,7 +57,7 @@ class PrivateCommentEmbeddable return $this; } - public function setComments($comments) + public function setComments(array $comments) { $this->comments = $comments; diff --git a/src/Bundle/ChillMainBundle/Entity/Language.php b/src/Bundle/ChillMainBundle/Entity/Language.php index ae7cb865f..079b31d22 100644 --- a/src/Bundle/ChillMainBundle/Entity/Language.php +++ b/src/Bundle/ChillMainBundle/Entity/Language.php @@ -63,7 +63,7 @@ class Language * * @return Language */ - public function setId($id) + public function setId(?string $id) { $this->id = $id; @@ -77,7 +77,7 @@ class Language * * @return Language */ - public function setName($name) + public function setName(array $name) { $this->name = $name; diff --git a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php index 480270e74..a52b3f427 100644 --- a/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php +++ b/src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php @@ -137,7 +137,7 @@ class PermissionsGroup /** * @return $this */ - public function setName($name) + public function setName(string $name) { $this->name = $name; diff --git a/src/Bundle/ChillMainBundle/Entity/PostalCode.php b/src/Bundle/ChillMainBundle/Entity/PostalCode.php index 3449e0184..ed81a2b4b 100644 --- a/src/Bundle/ChillMainBundle/Entity/PostalCode.php +++ b/src/Bundle/ChillMainBundle/Entity/PostalCode.php @@ -161,7 +161,7 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface * * @return PostalCode */ - public function setCode($code) + public function setCode(?string $code) { $this->code = $code; @@ -187,7 +187,7 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface * * @return PostalCode */ - public function setName($name) + public function setName(?string $name) { $this->name = $name; @@ -197,11 +197,10 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface /** * Set origin. * - * @param int $origin * * @return PostalCode */ - public function setOrigin($origin) + public function setOrigin(int $origin) { $this->origin = $origin; diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php index d00b241b2..22b1404e7 100644 --- a/src/Bundle/ChillMainBundle/Entity/User.php +++ b/src/Bundle/ChillMainBundle/Entity/User.php @@ -432,7 +432,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter /** * @return $this */ - public function setEmail($email) + public function setEmail(?string $email) { $this->email = $email; @@ -442,7 +442,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter /** * @return $this */ - public function setEmailCanonical($emailCanonical) + public function setEmailCanonical(?string $emailCanonical) { $this->emailCanonical = $emailCanonical; @@ -516,7 +516,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter /** * @return $this */ - public function setPassword($password) + public function setPassword(string $password) { $this->password = $password; @@ -526,7 +526,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter /** * @return $this */ - public function setSalt($salt) + public function setSalt(?string $salt) { $this->salt = $salt; @@ -588,7 +588,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter /** * @return $this */ - public function setUsernameCanonical($usernameCanonical) + public function setUsernameCanonical(?string $usernameCanonical) { $this->usernameCanonical = $usernameCanonical; diff --git a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php index 4cfab08bb..9ca1bdc0b 100644 --- a/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php +++ b/src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php @@ -202,7 +202,7 @@ class AuthorizationHelper implements AuthorizationHelperInterface * * @return bool true if the user has access */ - public function userHasAccess(User $user, mixed $entity, string $attribute) + public function userHasAccess(UserInterface $user, mixed $entity, string $attribute): bool { $centers = $this->centerResolverManager->resolveCenters($entity); diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php index 6421ffcba..48a25670d 100644 --- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php +++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php @@ -205,7 +205,7 @@ final class FilterOrderHelper return null !== $this->searchBoxFields; } - public function setSearchBox($searchBoxFields = null): self + public function setSearchBox(?array $searchBoxFields = null): self { $this->searchBoxFields = $searchBoxFields; diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php index 4c6e21fd7..6cfd17f26 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php @@ -182,11 +182,10 @@ class ClosingMotive /** * Set name. * - * @param array $name * * @return ClosingMotive */ - public function setName($name) + public function setName(array $name) { $this->name = $name; diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index 0a9bf9612..6c5abf00a 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person.php @@ -1412,7 +1412,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI /** * @param \DateTime $birthdate */ - public function setBirthdate($birthdate): self + public function setBirthdate(?\DateTime $birthdate): self { $this->birthdate = $birthdate; @@ -1527,7 +1527,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI return $this; } - public function setFullnameCanonical($fullnameCanonical): self + public function setFullnameCanonical(?string $fullnameCanonical): self { $this->fullnameCanonical = $fullnameCanonical; diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php index 7b562d5f3..323752e54 100644 --- a/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php +++ b/src/Bundle/ChillPersonBundle/Entity/PersonNotDuplicate.php @@ -76,7 +76,7 @@ class PersonNotDuplicate $this->date = $date; } - public function setId($id) + public function setId(?int $id) { $this->id = $id; } diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php index 37b7ca7d7..794dcf0d7 100644 --- a/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php +++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php @@ -39,11 +39,11 @@ class ListPerson implements ListInterface, GroupedExportInterface private readonly bool $filterStatsByCenters; public function __construct( - private readonly CustomFieldProvider $customFieldProvider, - private readonly ListPersonHelper $listPersonHelper, - private readonly EntityManagerInterface $entityManager, + private readonly CustomFieldProvider $customFieldProvider, + private readonly ListPersonHelper $listPersonHelper, + protected readonly EntityManagerInterface $entityManager, private readonly TranslatableStringHelper $translatableStringHelper, - ParameterBagInterface $parameterBag, + ParameterBagInterface $parameterBag, ) { $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center']; } diff --git a/src/Bundle/ChillReportBundle/Entity/Report.php b/src/Bundle/ChillReportBundle/Entity/Report.php index 367f784fa..a1579b2a1 100644 --- a/src/Bundle/ChillReportBundle/Entity/Report.php +++ b/src/Bundle/ChillReportBundle/Entity/Report.php @@ -158,7 +158,7 @@ class Report implements HasCenterInterface, HasScopeInterface * * @return Report */ - public function setDate($date) + public function setDate(?\DateTime $date) { $this->date = $date; diff --git a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php index 007a9834d..f63912b32 100644 --- a/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php +++ b/src/Bundle/ChillTaskBundle/Entity/RecurringTask.php @@ -116,7 +116,7 @@ class RecurringTask extends AbstractTask * * @return RecurringTask */ - public function setFirstOccurenceEndDate($firstOccurenceEndDate) + public function setFirstOccurenceEndDate(?\DateTime $firstOccurenceEndDate) { $this->firstOccurenceEndDate = $firstOccurenceEndDate; @@ -130,7 +130,7 @@ class RecurringTask extends AbstractTask * * @return RecurringTask */ - public function setLastOccurenceEndDate($lastOccurenceEndDate) + public function setLastOccurenceEndDate(?\DateTime $lastOccurenceEndDate) { $this->lastOccurenceEndDate = $lastOccurenceEndDate; @@ -144,7 +144,7 @@ class RecurringTask extends AbstractTask * * @return RecurringTask */ - public function setOccurenceFrequency($occurenceFrequency) + public function setOccurenceFrequency(?string $occurenceFrequency) { $this->occurenceFrequency = $occurenceFrequency; diff --git a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php index a03da4beb..c8427b725 100644 --- a/src/Bundle/ChillTaskBundle/Entity/SingleTask.php +++ b/src/Bundle/ChillTaskBundle/Entity/SingleTask.php @@ -140,7 +140,7 @@ class SingleTask extends AbstractTask * * @return SingleTask */ - public function setEndDate($endDate) + public function setEndDate(?\DateTime $endDate) { $this->endDate = $endDate; @@ -159,7 +159,7 @@ class SingleTask extends AbstractTask * * @return SingleTask */ - public function setStartDate($startDate) + public function setStartDate(?\DateTime $startDate) { $this->startDate = $startDate; diff --git a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php index e2d763585..92de2c496 100644 --- a/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php +++ b/src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php @@ -105,11 +105,10 @@ class AbstractTaskPlaceEvent /** * Set transition. * - * @param string $transition * * @return AbstractTaskPlaceEvent */ - public function setTransition($transition) + public function setTransition(string $transition) { $this->transition = $transition;