diff --git a/public/main/inc/ajax/extra_field.ajax.php b/public/main/inc/ajax/extra_field.ajax.php
index 347cefe4a2..1febbc38be 100644
--- a/public/main/inc/ajax/extra_field.ajax.php
+++ b/public/main/inc/ajax/extra_field.ajax.php
@@ -3,7 +3,6 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CoreBundle\Entity\ExtraFieldSavedSearch;
-use Chamilo\CoreBundle\Entity\Tag;
 use Chamilo\CoreBundle\Framework\Container;
 
 require_once __DIR__.'/../global.inc.php';
diff --git a/public/main/search/load_search.php b/public/main/search/load_search.php
index b884c7aec5..bd6f1a221c 100644
--- a/public/main/search/load_search.php
+++ b/public/main/search/load_search.php
@@ -22,7 +22,7 @@ $(function() {
 api_block_anonymous_users();
 $allowToSee = api_is_drh() || api_is_student_boss() || api_is_platform_admin();
 
-if ($allowToSee === false) {
+if (false === $allowToSee) {
     api_not_allowed(true);
 }
 $userId = api_get_user_id();
@@ -128,7 +128,7 @@ if (!empty($items)) {
     /** @var ExtraFieldSavedSearch $item */
     foreach ($items as $item) {
         $variable = 'extra_'.$item->getField()->getVariable();
-        if ($item->getField()->getFieldType() === ExtraField::FIELD_TYPE_TAG) {
+        if (ExtraField::FIELD_TYPE_TAG === $item->getField()->getFieldType()) {
             $tagsData[$variable] = $item->getValue();
         }
         $defaults[$variable] = $item->getValue();
@@ -216,7 +216,6 @@ $extra = $extraFieldUser->addElements(
 );
 $userForm->addEndPanel();
 
-
 $userForm->addStartPanel('dispo', get_lang('Disponibilite Pendant Mon Stage'));
 $userForm->addHtml('<p class="text-info">'.get_lang('Disponibilite Pendant Mon Stage Explanation').'</p>');
 
@@ -298,13 +297,13 @@ if (isset($_POST) && !empty($_POST)) {
     Session::write('search_using_3', $searchChecked3);
 } else {
     $searchChecked1 = Session::read('search_using_1');
-    $searchChecked1 = $searchChecked1 === null ? 'checked' : $searchChecked1;
+    $searchChecked1 = null === $searchChecked1 ? 'checked' : $searchChecked1;
 
     $searchChecked2 = Session::read('search_using_2');
-    $searchChecked2 = $searchChecked2 === null ? 'checked' : $searchChecked2;
+    $searchChecked2 = null === $searchChecked2 ? 'checked' : $searchChecked2;
 
     $searchChecked3 = Session::read('search_using_3');
-    $searchChecked3 = $searchChecked3 === null ? 'checked' : $searchChecked3;
+    $searchChecked3 = null === $searchChecked3 ? 'checked' : $searchChecked3;
 }
 
 $form->addStartPanel('dispo_avant', get_lang('Disponibilite Avant'));
@@ -564,7 +563,7 @@ if ($formSearch->validate()) {
 // Search filter
 $filters = [];
 foreach ($defaults as $key => $value) {
-    if (substr($key, 0, 6) !== 'extra_' && substr($key, 0, 7) !== '_extra_') {
+    if ('extra_' !== substr($key, 0, 6) && '_extra_' !== substr($key, 0, 7)) {
         continue;
     }
     if (!empty($value)) {
@@ -629,7 +628,7 @@ if ($form->validate()) {
     if ($search) {
         // Parse params.
         foreach ($params as $key => $value) {
-            if (substr($key, 0, 6) !== 'extra_' && substr($key, 0, 7) !== '_extra_') {
+            if ('extra_' !== substr($key, 0, 6) && '_extra_' !== substr($key, 0, 7)) {
                 continue;
             }
             if (!empty($value)) {
@@ -700,7 +699,7 @@ if ($form->validate()) {
 
         foreach ($userData as $key => $value) {
             $found = strpos($key, '__persist__');
-            if ($found === false) {
+            if (false === $found) {
                 continue;
             }
         }
@@ -710,7 +709,7 @@ if ($form->validate()) {
         ) {
             $wantStage = $userData['extra_filiere_want_stage']['extra_filiere_want_stage'];
 
-            if ($wantStage === 'yes') {
+            if ('yes' === $wantStage) {
                 if (isset($userData['extra_filiere_user'])) {
                     $userData['extra_filiere'] = [];
                     $userData['extra_filiere']['extra_filiere'] = $userData['extra_filiere_user']['extra_filiere_user'];
@@ -720,7 +719,7 @@ if ($form->validate()) {
 
         // save in ExtraFieldSavedSearch.
         foreach ($userData as $key => $value) {
-            if (substr($key, 0, 6) !== 'extra_' && substr($key, 0, 7) !== '_extra_') {
+            if ('extra_' !== substr($key, 0, 6) && '_extra_' !== substr($key, 0, 7)) {
                 continue;
             }
 
@@ -822,7 +821,7 @@ if (!empty($filterToSend)) {
         $userEndDatePlus = api_get_utc_datetime(substr($userEndDatePlus, 0, 11).'23:59:59');
 
         // Special OFAJ date logic
-        if ($userEndDate == '') {
+        if ('' == $userEndDate) {
             $sql = " AND (
                 (s.access_start_date >= '$userStartDateMinus') OR
                 ((s.access_start_date = '' OR s.access_start_date IS NULL) AND (s.access_end_date = '' OR s.access_end_date IS NULL))
@@ -952,7 +951,7 @@ if (!empty($filterToSend)) {
 
         if ($deleteFiliere) {
             foreach ($filterToSend['rules'] as &$filterItem) {
-                if (isset($filterItem['field']) && $filterItem['field'] == 'extra_filiere') {
+                if (isset($filterItem['field']) && 'extra_filiere' == $filterItem['field']) {
                     $filterItem = [];
                 }
             }
@@ -1172,13 +1171,9 @@ $userReportButton = Display::url(
     ['class' => 'btn btn-primary']
 );
 
-
 $tpl->assign('grid', $grid.$button.$table->toHtml().$userReportButton);
 $tpl->assign('grid_js', $griJs);
 $templateName = $tpl->get_template('search/search_extra_field.html.twig');
 $contentTemplate = $tpl->fetch($templateName);
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();
-
-
-
diff --git a/public/main/search/search.php b/public/main/search/search.php
index e0a0883802..f7b9ef3090 100644
--- a/public/main/search/search.php
+++ b/public/main/search/search.php
@@ -37,7 +37,7 @@ $diagnosisComplete = $extraFieldValue->get_values_by_handler_and_field_variable(
     'diagnosis_completed'
 );
 $diagnosisComplete = false;
-if ($diagnosisComplete && isset($diagnosisComplete['value']) && $diagnosisComplete['value'] == 1) {
+if ($diagnosisComplete && isset($diagnosisComplete['value']) && 1 == $diagnosisComplete['value']) {
     if (!isset($_GET['result'])) {
         header('Location:'.api_get_self().'?result=1');
         exit;
@@ -45,12 +45,12 @@ if ($diagnosisComplete && isset($diagnosisComplete['value']) && $diagnosisComple
 }
 
 $hide = true;
-if ($wantStage !== false) {
-    $hide = $wantStage['value'] === 'yes';
+if (false !== $wantStage) {
+    $hide = 'yes' === $wantStage['value'];
 }
 
 $defaultValueStatus = 'extraFiliere.hide()';
-if ($hide === false) {
+if (false === $hide) {
     $defaultValueStatus = '';
 }
 
@@ -58,7 +58,7 @@ $url = api_get_path(WEB_AJAX_PATH).'extra_field.ajax.php?a=order&user_id='.$user
 
 // Use current user language
 $langInfo = api_get_language_from_iso($userInfo['language']);
-$targetLanguage =  $langInfo->getEnglishName();
+$targetLanguage = $langInfo->getEnglishName();
 $theme = 'theme_fr';
 switch ($targetLanguage) {
     case 'italian':
@@ -200,7 +200,7 @@ if (!empty($items)) {
     /** @var ExtraFieldSavedSearch $item */
     foreach ($items as $item) {
         $variable = 'extra_'.$item->getField()->getVariable();
-        if ($item->getField()->getFieldType() === Extrafield::FIELD_TYPE_TAG) {
+        if (Extrafield::FIELD_TYPE_TAG === $item->getField()->getFieldType()) {
             $tagsData[$variable] = $item->getValue();
         }
         $defaults[$variable] = $item->getValue();
@@ -599,7 +599,7 @@ if ($userForm->validate()) {
         $isPartial = true;
     }
 
-    if ($isPartial === false) {
+    if (false === $isPartial) {
         $userData['extra_diagnosis_completed'] = 1;
     }
 
@@ -640,7 +640,7 @@ if ($userForm->validate()) {
 
     foreach ($userData as $key => $value) {
         $found = strpos($key, '__persist__');
-        if ($found === false) {
+        if (false === $found) {
             continue;
         }
     }
@@ -650,7 +650,7 @@ if ($userForm->validate()) {
     ) {
         $wantStage = $userData['extra_filiere_want_stage']['extra_filiere_want_stage'];
 
-        if ($wantStage === 'yes') {
+        if ('yes' === $wantStage) {
             if (isset($userData['extra_filiere_user'])) {
                 $userData['extra_filiere'] = [];
                 $userData['extra_filiere']['extra_filiere'] = $userData['extra_filiere_user']['extra_filiere_user'];
@@ -662,7 +662,7 @@ if ($userForm->validate()) {
     $extraFieldRepo = Container::getExtraFieldRepository();
 
     foreach ($userData as $key => $value) {
-        if (substr($key, 0, 6) !== 'extra_' && substr($key, 0, 7) !== '_extra_') {
+        if ('extra_' !== substr($key, 0, 6) && '_extra_' !== substr($key, 0, 7)) {
             continue;
         }
 
@@ -752,7 +752,7 @@ $tpl->assign('grid', '');
 $tpl->assign('grid_js', '');
 $tpl->assign('form_search', '');
 $tpl->assign('form', '');
-if ($result === false) {
+if (false === $result) {
     $tpl->assign('form', $userFormToString);
 } else {
     Display::addFlash(Display::return_message(get_lang('Your session search diagnosis is saved')));
@@ -761,6 +761,3 @@ if ($result === false) {
 $content = $tpl->fetch($tpl->get_template('search/search_extra_field.tpl'));
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();
-
-
-
diff --git a/src/CoreBundle/Traits/Repository/RepositoryQueryBuilderTrait.php b/src/CoreBundle/Traits/Repository/RepositoryQueryBuilderTrait.php
index ae9131c607..89486f7f6f 100644
--- a/src/CoreBundle/Traits/Repository/RepositoryQueryBuilderTrait.php
+++ b/src/CoreBundle/Traits/Repository/RepositoryQueryBuilderTrait.php
@@ -16,4 +16,4 @@ trait RepositoryQueryBuilderTrait
     {
         return $qb ?: $this->createQueryBuilder($alias);
     }
-}
\ No newline at end of file
+}