diff --git a/.env b/.env
index b66cc43..ceb12f5 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,6 @@
### Symfony Configuration
APP_ENV=prod
+APP_SECRET=
### General Configuration
WEBSITE_BASE_URL='http://localhost/activity/' #Base URL of the website (end with a slash)
diff --git a/.gitignore b/.gitignore
index 94b24ef..d841242 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,4 @@
var/*
vendor/*
phpunit.xml
-migrations/*
.phpunit.result.cache
diff --git a/migrations/.gitignore b/migrations/.gitignore
new file mode 100644
index 0000000..a565b0f
--- /dev/null
+++ b/migrations/.gitignore
@@ -0,0 +1 @@
+Version*
\ No newline at end of file
diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php
index ac3fee1..283edc3 100644
--- a/src/Controller/ActivityController.php
+++ b/src/Controller/ActivityController.php
@@ -44,7 +44,7 @@
// Activity add form
/** @var ActivityAddForm $activityAddForm */
$activityAddForm = $this->createNamedCustomForm('activityAdd', ActivityAddForm::class, [
- 'actors' => $actors,
+ 'actors' => $actors
]);
$activityAddForm->handleRequest($request);
if ($activityAddForm->isSubmitted() && $activityAddForm->isValid()) {
@@ -53,17 +53,18 @@
$activity = $activityAddForm->getActivity();
$entityManager->persist($activity);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'redirect' => $this->generateUrl('activity_activity', [
- 'id' => $activity->getId()
- ], UrlGenerator::ABSOLUTE_PATH),
- ]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
- 'code' => Response::HTTP_BAD_REQUEST,
+ 'id' => $activity->getId(),
+ ], UrlGenerator::ABSOLUTE_PATH)
]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST
+ ]);
}
// Activity delete form
@@ -74,30 +75,31 @@
$errors = $activityDeleteForm->validate();
if (empty($errors)) {
$activity = $activityDeleteForm->getActivity($activityRepository);
- if (!is_null($activity)) {
+ if (! is_null($activity)) {
$entityManager->remove($activity);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'refresh' => true,
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => 'Activité non trouvé',
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
- } else {
+
return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
+ 'error' => 'Activité non trouvé',
'code' => Response::HTTP_BAD_REQUEST,
]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
}
// Filter
/** @var ActivityFilterForm $activityFilterForm */
$activityFilterForm = $this->createNamedGetCustomForm('activityFilter', ActivityFilterForm::class, [
- 'actors' => $actors,
+ 'actors' => $actors
]);
$activityFilterForm->handleRequest($request);
$activities = $activityFilterForm->getActivities($activityRepository);
@@ -137,7 +139,7 @@
// Activity edit form
/** @var ActivityEditForm $activityEditForm */
$activityEditForm = $this->createNamedCustomForm('edit', ActivityEditForm::class, [
- 'actors' => $actors,
+ 'actors' => $actors
]);
$activityEditForm->handleRequest($request);
if ($activityEditForm->isSubmitted() && $activityEditForm->isValid()) {
@@ -147,16 +149,17 @@
$activityEditForm->updateActivity($activity);
$entityManager->persist($activity);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'message' => 'Modification enregistrées',
'refresh' => true,
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
}
// Activity delete form
@@ -166,31 +169,32 @@
if ($activityDeleteForm->isSubmitted() && $activityDeleteForm->isValid()) {
$errors = $activityDeleteForm->validate();
if (empty($errors)) {
- if (!is_null($activity)) {
+ if (! is_null($activity)) {
$entityManager->remove($activity);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'redirect' => $this->generateUrl('activity_activities', [], UrlGenerator::ABSOLUTE_PATH),
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => 'Activité non trouvé',
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
- } else {
+
return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
+ 'error' => 'Activité non trouvé',
'code' => Response::HTTP_BAD_REQUEST,
]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
}
// Task add form
/** @var TaskAddForm $taskAddForm */
$taskAddForm = $this->createNamedCustomForm('taskAdd', TaskAddForm::class, [
'actors' => $actors,
- 'actor' => $activity->getActor(),
+ 'actor' => $activity->getActor()
]);
$taskAddForm->handleRequest($request);
if ($taskAddForm->isSubmitted() && $taskAddForm->isValid()) {
@@ -200,18 +204,19 @@
$task->setActivity($activity);
$entityManager->persist($task);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'refresh' => true,
'reset' => true,
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
}
-
+
// Task delete form
/** @var TaskDeleteForm $taskDeleteForm */
$taskDeleteForm = $this->createNamedCustomForm('taskDelete', TaskDeleteForm::class);
@@ -220,23 +225,25 @@
$errors = $taskDeleteForm->validate();
if (empty($errors)) {
$task = $taskDeleteForm->getTask($taskRepository);
- if (!is_null($task)) {
+ if (! is_null($task)) {
$entityManager->remove($task);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'refresh' => true,
]);
}
+
return $this->ajaxFormAnswer([
'error' => 'Tâche non trouvé',
'code' => Response::HTTP_BAD_REQUEST,
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
}
// Update fields
diff --git a/src/Controller/ActorController.php b/src/Controller/ActorController.php
index 5ab69bc..3dc4b59 100644
--- a/src/Controller/ActorController.php
+++ b/src/Controller/ActorController.php
@@ -46,12 +46,12 @@
'refresh' => true,
'reset' => true,
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
}
// Actor delete form
@@ -62,24 +62,25 @@
$errors = $actorDeleteForm->validate();
if (empty($errors)) {
$actor = $actorDeleteForm->getActor($actorRepository);
- if (!is_null($actor)) {
+ if (! is_null($actor)) {
$entityManager->remove($actor);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'refresh' => true,
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => 'Utilisateur non trouvé',
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
- } else {
+
return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
+ 'error' => 'Utilisateur non trouvé',
'code' => Response::HTTP_BAD_REQUEST,
]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
}
// Get actors
@@ -123,16 +124,17 @@
$actorEditForm->updateActor($actor);
$entityManager->persist($actor);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'message' => 'Modification enregistrées',
'refresh' => true,
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST
+ ]);
}
// Actor delete form
@@ -144,15 +146,16 @@
if (empty($errors)) {
$entityManager->remove($actor);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'redirect' => $this->generateUrl('actor_actors', [], UrlGenerator::ABSOLUTE_PATH),
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
}
// Update fields
@@ -161,7 +164,7 @@
// Get activities
$activities = $activityRepository->findBy([
'actor' => $actor,
- 'status' => StatusEnum::ACTIVE_STATUS
+ 'status' => StatusEnum::ACTIVE_STATUS,
]);
// Get tasks
diff --git a/src/Controller/TaskController.php b/src/Controller/TaskController.php
index b00f3ee..5b8b327 100644
--- a/src/Controller/TaskController.php
+++ b/src/Controller/TaskController.php
@@ -46,16 +46,17 @@
$task = $taskAddForm->getTask();
$entityManager->persist($task);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'refresh' => true,
'reset' => true,
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST
+ ]);
}
// Task delete form
@@ -66,29 +67,31 @@
$errors = $taskDeleteForm->validate();
if (empty($errors)) {
$task = $taskDeleteForm->getTask($taskRepository);
- if (!is_null($task)) {
+ if (! is_null($task)) {
$entityManager->remove($task);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'refresh' => true,
]);
}
+
return $this->ajaxFormAnswer([
'error' => 'Tâche non trouvé',
'code' => Response::HTTP_BAD_REQUEST,
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => join('
', $errors),
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
}
// Filter
/** @var TaskFilterForm $taskFilterForm */
$taskFilterForm = $this->createNamedGetCustomForm('taskFilter', TaskFilterForm::class, [
- 'actors' => $actors,
+ 'actors' => $actors
]);
$taskFilterForm->handleRequest($request);
$tasks = $taskFilterForm->getTasks($taskRepository);
@@ -126,7 +129,7 @@
// Task edit form
/** @var TaskEditForm $taskEditForm */
$taskEditForm = $this->createNamedCustomForm('taskEdit', TaskEditForm::class, [
- 'actors' => $actors
+ 'actors' => $actors,
]);
$taskEditForm->handleRequest($request);
if ($taskEditForm->isSubmitted() && $taskEditForm->isValid()) {
@@ -135,16 +138,17 @@
$taskEditForm->updateTask($task);
$entityManager->persist($task);
$entityManager->flush();
+
return $this->ajaxFormAnswer([
'message' => 'Modification enregistrées',
'refresh' => true,
]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => 'Tâche non trouvé',
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => 'Tâche non trouvé',
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
}
// Task delete form
@@ -160,24 +164,20 @@
return $this->ajaxFormAnswer([
'redirect' => $this->generateUrl('task_tasks', [], UrlGenerator::ABSOLUTE_PATH),
]);
- } else {
- return $this->ajaxFormAnswer([
- 'redirect' => $this->generateUrl('activity_activity', [
- 'id' => $task->getActivity()
- ->getId()
- ], UrlGenerator::ABSOLUTE_PATH),
- ]);
}
+
return $this->ajaxFormAnswer([
- 'error' => 'Tâche non trouvé',
- 'code' => Response::HTTP_BAD_REQUEST,
- ]);
- } else {
- return $this->ajaxFormAnswer([
- 'error' => join('
', $errors),
- 'code' => Response::HTTP_BAD_REQUEST,
+ 'redirect' => $this->generateUrl('activity_activity', [
+ 'id' => $task->getActivity()
+ ->getId(),
+ ], UrlGenerator::ABSOLUTE_PATH)
]);
}
+
+ return $this->ajaxFormAnswer([
+ 'error' => 'Tâche non trouvé',
+ 'code' => Response::HTTP_BAD_REQUEST,
+ ]);
}
// Update fields
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 469dcce..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,11 +0,0 @@
-bootEnv(dirname(__DIR__).'/.env');
-}