| @@ -41,10 +41,10 @@ | ||
| 41 | 41 | $role = User::ROLE_ADMIN; | 
| 42 | 42 | |
| 43 | 43 | $em = $this->doctrine->getManager(); | 
| 44 | -        $user = $em->getRepository('AppBundle:User')->findBy(['email' => $email]); | |
| 44 | +        $user = $em->getRepository('AppBundle:User')->findBy([ 'email' => $email ]); | |
| 45 | 45 | if (!$user) | 
| 46 | 46 | $user = new User(); | 
| 47 | - else $user = $user[0]; | |
| 47 | + else $user = $user[ 0 ]; | |
| 48 | 48 | |
| 49 | 49 | $pass = $this->userPasswordEncoder->encodePassword($user, $password); | 
| 50 | 50 | $user->setEmail($email); | 
| @@ -42,9 +42,11 @@ | ||
| 42 | 42 | |
| 43 | 43 | $em = $this->doctrine->getManager(); | 
| 44 | 44 |          $user = $em->getRepository('AppBundle:User')->findBy(['email' => $email]); | 
| 45 | - if (!$user) | |
| 46 | - $user = new User(); | |
| 47 | - else $user = $user[0]; | |
| 45 | +        if (!$user) { | |
| 46 | + $user = new User(); | |
| 47 | +        } else { | |
| 48 | + $user = $user[0]; | |
| 49 | + } | |
| 48 | 50 | |
| 49 | 51 | $pass = $this->userPasswordEncoder->encodePassword($user, $password); | 
| 50 | 52 | $user->setEmail($email); | 
| @@ -43,6 +43,6 @@ | ||
| 43 | 43 |          $this->getContainer()->get('app.admin.creator') | 
| 44 | 44 | ->create($email, $password, $firstName, $lastName); | 
| 45 | 45 | |
| 46 | -        $output->writeln(sprintf('User <comment>%s</comment> was created/updated', $firstName.' '.$lastName)); | |
| 46 | +        $output->writeln(sprintf('User <comment>%s</comment> was created/updated', $firstName . ' ' . $lastName)); | |
| 47 | 47 | } | 
| 48 | 48 | } | 
| @@ -41,7 +41,7 @@ discard block | ||
| 41 | 41 |      { | 
| 42 | 42 | $em = $this->em; | 
| 43 | 43 | $type = $response->getResourceOwner()->getName(); | 
| 44 | -        $user = $em->getRepository('AppBundle:User')->findOneBy(['email' => $response->getEmail()]); | |
| 44 | +        $user = $em->getRepository('AppBundle:User')->findOneBy([ 'email' => $response->getEmail() ]); | |
| 45 | 45 |          if ($user === null) { | 
| 46 | 46 | $user = new User(); | 
| 47 | 47 | $user->setEmail($response->getEmail()) | 
| @@ -89,7 +89,7 @@ discard block | ||
| 89 | 89 | */ | 
| 90 | 90 | public function loadUserByUsername($username) | 
| 91 | 91 |      { | 
| 92 | -        $user = $this->em->getRepository('AppBundle:User')->findOneBy(['email' => $username]); | |
| 92 | +        $user = $this->em->getRepository('AppBundle:User')->findOneBy([ 'email' => $username ]); | |
| 93 | 93 |          if (!$user) { | 
| 94 | 94 |              throw new UsernameNotFoundException(sprintf("User '%s' not found.", $username)); | 
| 95 | 95 | } | 
| @@ -24,7 +24,7 @@ discard block | ||
| 24 | 24 |      { | 
| 25 | 25 | $em = $this->doctrine->getManager(); | 
| 26 | 26 |          $question = $em->getRepository('AppBundle:Question') | 
| 27 | - ->find($data['idQuestion']); | |
| 27 | + ->find($data[ 'idQuestion' ]); | |
| 28 | 28 | |
| 29 | 29 | $originalAnswers = $question->getAnswers(); | 
| 30 | 30 | $countOriginalAnswers = $question->getCountAnswers(); | 
| @@ -37,8 +37,8 @@ discard block | ||
| 37 | 37 | |
| 38 | 38 |          foreach ($originalAnswers as $item) { | 
| 39 | 39 | $item->getCorrectly() ? $countAllTrueAnswers++ : null; | 
| 40 | -            $data["answer_{$item->getId()}"] ? $countAllChecks++ : null; | |
| 41 | -            if ($item->getCorrectly() === $data["answer_{$item->getId()}"]) { | |
| 40 | +            $data[ "answer_{$item->getId()}" ] ? $countAllChecks++ : null; | |
| 41 | +            if ($item->getCorrectly() === $data[ "answer_{$item->getId()}" ]) { | |
| 42 | 42 | $sumAllCorrect++; | 
| 43 | 43 | if ($item->getCorrectly()) | 
| 44 | 44 | $sumCorrectChecks++; | 
| @@ -55,8 +55,8 @@ discard block | ||
| 55 | 55 | $maxCountAnswers = $countAllTrueAnswers; | 
| 56 | 56 | } | 
| 57 | 57 | |
| 58 | -        if ($question->getAllIncorrect() || $data['answer_all_incorrect']) { | |
| 59 | - if ($question->getAllIncorrect() === $data['answer_all_incorrect'] && $question->getAllIncorrect() === true && | |
| 58 | +        if ($question->getAllIncorrect() || $data[ 'answer_all_incorrect' ]) { | |
| 59 | + if ($question->getAllIncorrect() === $data[ 'answer_all_incorrect' ] && $question->getAllIncorrect() === true && | |
| 60 | 60 | $sumAllCorrect == $countOriginalAnswers | 
| 61 | 61 | ) | 
| 62 | 62 | return $result = 1; | 
| @@ -68,7 +68,7 @@ discard block | ||
| 68 | 68 |          if ($sumAllCorrect && $sumCorrectChecks && $countAllChecks <= $maxCountAnswers) { | 
| 69 | 69 | // second type question | 
| 70 | 70 |              if ($countAllTrueAnswers == 1) { | 
| 71 | - $result = (1 / $maxCountAnswers) * ($sumCorrectChecks + ($sumFalseAnswers > 0 ? 0: 1)); | |
| 71 | + $result = (1 / $maxCountAnswers) * ($sumCorrectChecks + ($sumFalseAnswers > 0 ? 0 : 1)); | |
| 72 | 72 | } | 
| 73 | 73 | // third type question | 
| 74 | 74 |              elseif ($countAllTrueAnswers > 1) { | 
| @@ -40,8 +40,9 @@ discard block | ||
| 40 | 40 |              $data["answer_{$item->getId()}"] ? $countAllChecks++ : null; | 
| 41 | 41 |              if ($item->getCorrectly() === $data["answer_{$item->getId()}"]) { | 
| 42 | 42 | $sumAllCorrect++; | 
| 43 | - if ($item->getCorrectly()) | |
| 44 | - $sumCorrectChecks++; | |
| 43 | +                if ($item->getCorrectly()) { | |
| 44 | + $sumCorrectChecks++; | |
| 45 | + } | |
| 45 | 46 |              } else { | 
| 46 | 47 |                  if ($item->getCorrectly() === false) { | 
| 47 | 48 | $sumFalseAnswers++; | 
| @@ -58,8 +59,9 @@ discard block | ||
| 58 | 59 |          if ($question->getAllIncorrect() || $data['answer_all_incorrect']) { | 
| 59 | 60 | if ($question->getAllIncorrect() === $data['answer_all_incorrect'] && $question->getAllIncorrect() === true && | 
| 60 | 61 | $sumAllCorrect == $countOriginalAnswers | 
| 61 | - ) | |
| 62 | - return 1; | |
| 62 | +            ) { | |
| 63 | + return 1; | |
| 64 | + } | |
| 63 | 65 | |
| 64 | 66 | return 0; | 
| 65 | 67 | } | 
| @@ -24,7 +24,7 @@ discard block | ||
| 24 | 24 |      { | 
| 25 | 25 | $em = $this->doctrine->getManager(); | 
| 26 | 26 |          $question = $em->getRepository('AppBundle:Question') | 
| 27 | - ->find($data['idQuestion']); | |
| 27 | + ->find($data[ 'idQuestion' ]); | |
| 28 | 28 | |
| 29 | 29 | $originalAnswers = $question->getAnswers(); | 
| 30 | 30 | $countOriginalAnswers = count($originalAnswers); | 
| @@ -37,7 +37,7 @@ discard block | ||
| 37 | 37 | |
| 38 | 38 |          foreach ($originalAnswers as $item) { | 
| 39 | 39 | $item->getCorrectly() ? $countAllTrueAnswers++ : $countAllFalseAnswers++; | 
| 40 | -            if ($item->getCorrectly() === $data["answer_{$item->getId()}"]) { | |
| 40 | +            if ($item->getCorrectly() === $data[ "answer_{$item->getId()}" ]) { | |
| 41 | 41 |                  if ($item->getCorrectly() === true) { | 
| 42 | 42 | $sumTrueCorrect++; | 
| 43 | 43 | } | 
| @@ -49,8 +49,8 @@ discard block | ||
| 49 | 49 | } | 
| 50 | 50 | } | 
| 51 | 51 | //first type question | 
| 52 | -        if ($question->getAllIncorrect() || $data['answer_all_incorrect']) { | |
| 53 | -            if ($question->getAllIncorrect() === $data['answer_all_incorrect'] && $question->getAllIncorrect() === true && $sumTrueCorrect == 0) { | |
| 52 | +        if ($question->getAllIncorrect() || $data[ 'answer_all_incorrect' ]) { | |
| 53 | +            if ($question->getAllIncorrect() === $data[ 'answer_all_incorrect' ] && $question->getAllIncorrect() === true && $sumTrueCorrect == 0) { | |
| 54 | 54 | |
| 55 | 55 | return $result = 1; | 
| 56 | 56 | } | 
| @@ -74,7 +74,7 @@ discard block | ||
| 74 | 74 | // $result = $sumTrueCorrect != 0 ? ((1 / $countAllTrueAnswers) * $sumTrueCorrect) - ((1 / $countAllFalseAnswers) * $countFalseAnswers) : 0; | 
| 75 | 75 | $result = $sumAllCorrect != 0 ? ((1 / $countOriginalAnswers) * $sumAllCorrect) : 0; | 
| 76 | 76 |              } else { | 
| 77 | - $result = 0; | |
| 77 | + $result = 0; | |
| 78 | 78 | } | 
| 79 | 79 | } | 
| 80 | 80 | |
| @@ -64,8 +64,7 @@ | ||
| 64 | 64 | $result = $sumTrueCorrect != 0 ? 1 / $sumTrueCorrect / 2 : 0; | 
| 65 | 65 |              } elseif ($countFalseAnswers > 1) { | 
| 66 | 66 | $result = 0; | 
| 67 | - } | |
| 68 | -            else { | |
| 67 | +            } else { | |
| 69 | 68 | $result = $sumTrueCorrect != 0 ? 1 / $sumTrueCorrect : 0; | 
| 70 | 69 | } | 
| 71 | 70 | //third type question | 
| @@ -34,7 +34,7 @@ | ||
| 34 | 34 | |
| 35 | 35 |          if ($countTrueAnswers > 3) { | 
| 36 | 36 |              $this->session->getFlashBag()->add('notice', | 
| 37 | - 'You have to add not more than 3 true answers for question '.$question->getTextQuestion()); | |
| 37 | + 'You have to add not more than 3 true answers for question ' . $question->getTextQuestion()); | |
| 38 | 38 | |
| 39 | 39 | return false; | 
| 40 | 40 | } | 
| @@ -98,7 +98,7 @@ discard block | ||
| 98 | 98 |              return new RedirectResponse($this->router->generate('homepage')); | 
| 99 | 99 | } | 
| 100 | 100 | |
| 101 | - return ['form' => $form->createView()]; | |
| 101 | + return [ 'form' => $form->createView() ]; | |
| 102 | 102 | } | 
| 103 | 103 | |
| 104 | 104 | public function updateRegistrationUser(Request $request, User $user) | 
| @@ -120,6 +120,6 @@ discard block | ||
| 120 | 120 |              return new RedirectResponse($this->router->generate('homepage')); | 
| 121 | 121 | } | 
| 122 | 122 | |
| 123 | - return ['form' => $form->createView()]; | |
| 123 | + return [ 'form' => $form->createView() ]; | |
| 124 | 124 | } | 
| 125 | 125 | } | 
| 126 | 126 | \ No newline at end of file | 
| @@ -39,7 +39,7 @@ | ||
| 39 | 39 |          if ($passModule->getPercentResult() >= $module->getPersentSuccess()) { | 
| 40 | 40 | $moduleUser->setStatus(ModuleUser::STATUS_SUCCESS); | 
| 41 | 41 | $moduleUser->setRating($passModule->getRating()); | 
| 42 | -        } else if ($moduleUser->getCountPassModules() >= $module->getAttempts()){ | |
| 42 | +        } else if ($moduleUser->getCountPassModules() >= $module->getAttempts()) { | |
| 43 | 43 | $moduleUser->setStatus(ModuleUser::STATUS_FAILED); | 
| 44 | 44 | //$moduleUser->setRating($passModule->getRating()); | 
| 45 | 45 | } | 
| @@ -81,7 +81,7 @@ discard block | ||
| 81 | 81 | $dateEstimate = $pass->getTimeStart() | 
| 82 | 82 |              ->modify("+{$pass->getTimePeriod()} minutes"); | 
| 83 | 83 | |
| 84 | -        if($nowDate > $dateEstimate){ | |
| 84 | +        if ($nowDate > $dateEstimate) { | |
| 85 | 85 | // $pass->setIsActive(false); | 
| 86 | 86 | // $this->doctrine->getEntityManager()->flush(); | 
| 87 | 87 | $this->deactivation->deactivation($pass); | 
| @@ -137,14 +137,14 @@ discard block | ||
| 137 | 137 |              $firstQuestionForPass = $this->doctrine->getRepository('AppBundle:Question') | 
| 138 | 138 | ->getFirstQuestionForPass($passModule->getId()); | 
| 139 | 139 | |
| 140 | - if(null === $firstQuestionForPass) | |
| 140 | + if (null === $firstQuestionForPass) | |
| 141 | 141 |                  return $this->generateOutput('error', 500, 'This module does not have any questions ;('); | 
| 142 | 142 | |
| 143 | 143 | $passModule->setCurrentQuestion($firstQuestionForPass); | 
| 144 | 144 | $this->doctrine->getEntityManager()->flush(); | 
| 145 | 145 | } | 
| 146 | 146 | |
| 147 | -        if(!($passModule->getIsActive())){ | |
| 147 | +        if (!($passModule->getIsActive())) { | |
| 148 | 148 |              return $this->generateOutput('error', 403, 'This pass is not active ;('); | 
| 149 | 149 | } | 
| 150 | 150 | |
| @@ -161,9 +161,9 @@ discard block | ||
| 161 | 161 | 'idPassModule' => $idPassModule, | 
| 162 | 162 | 'answers' => $currentQuestion->getAnswers()->toArray() | 
| 163 | 163 | ]); | 
| 164 | -        $form->add('submit', SubmitType::class, ['label' => 'Save', 'attr' => [ 'class' => 'btn btn-primary' ]]); | |
| 164 | +        $form->add('submit', SubmitType::class, [ 'label' => 'Save', 'attr' => [ 'class' => 'btn btn-primary' ] ]); | |
| 165 | 165 | |
| 166 | - $currentNumberQuestion = $passModule->getCountPassedQuestions()+1; | |
| 166 | + $currentNumberQuestion = $passModule->getCountPassedQuestions() + 1; | |
| 167 | 167 | |
| 168 | 168 |          return $this->generateOutput('ok', 200, [ | 
| 169 | 169 | $form, | 
| @@ -56,8 +56,9 @@ discard block | ||
| 56 | 56 |              return $this->generateOutput('error', 403, 'You do not have access to this module'); | 
| 57 | 57 | } | 
| 58 | 58 | |
| 59 | - if ($moduleUser->getAttempts() == $moduleUser->getModule()->getAttempts()) | |
| 60 | -            return $this->generateOutput('error', 403, 'Your attempts are exhausted'); | |
| 59 | +        if ($moduleUser->getAttempts() == $moduleUser->getModule()->getAttempts()) { | |
| 60 | +                    return $this->generateOutput('error', 403, 'Your attempts are exhausted'); | |
| 61 | + } | |
| 61 | 62 | |
| 62 | 63 | $lastPass = $moduleUser->getPassModules()->last(); | 
| 63 | 64 | |
| @@ -68,8 +69,9 @@ discard block | ||
| 68 | 69 | |
| 69 | 70 | $time_residue = $this->checkDatePass($lastPass); | 
| 70 | 71 | |
| 71 | - if (!$time_residue) | |
| 72 | - $this->identPass($idModule); | |
| 72 | +        if (!$time_residue) { | |
| 73 | + $this->identPass($idModule); | |
| 74 | + } | |
| 73 | 75 | |
| 74 | 76 |          return $this->generateOutput('redirect_to_pass', 301, $lastPass->getId()); | 
| 75 | 77 | } | 
| @@ -137,8 +139,9 @@ discard block | ||
| 137 | 139 |              $firstQuestionForPass = $this->doctrine->getRepository('AppBundle:Question') | 
| 138 | 140 | ->getFirstQuestionForPass($passModule->getId()); | 
| 139 | 141 | |
| 140 | - if(null === $firstQuestionForPass) | |
| 141 | -                return $this->generateOutput('error', 500, 'This module does not have any questions ;('); | |
| 142 | +            if(null === $firstQuestionForPass) { | |
| 143 | +                            return $this->generateOutput('error', 500, 'This module does not have any questions ;('); | |
| 144 | + } | |
| 142 | 145 | |
| 143 | 146 | $passModule->setCurrentQuestion($firstQuestionForPass); | 
| 144 | 147 | $this->doctrine->getEntityManager()->flush(); | 
| @@ -150,8 +153,9 @@ discard block | ||
| 150 | 153 | |
| 151 | 154 | $time_residue = $this->checkDatePass($passModule); | 
| 152 | 155 | |
| 153 | - if (!$time_residue) | |
| 154 | -            return $this->generateOutput('error', 403, 'This pass is overdue ;('); | |
| 156 | +        if (!$time_residue) { | |
| 157 | +                    return $this->generateOutput('error', 403, 'This pass is overdue ;('); | |
| 158 | + } | |
| 155 | 159 | |
| 156 | 160 | |
| 157 | 161 | $currentQuestion = $passModule->getCurrentQuestion(); |