@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace Kendrick\SymfonyDebugToolbarGit\DataCollector; |
| 4 | 4 | |
| 5 | 5 | use Kendrick\SymfonyDebugToolbarGit\Git\Git; |
| 6 | -use Kendrick\SymfonyDebugToolbarGit\Git\GitLastCommit; |
|
| 7 | 6 | use Symfony\Component\DependencyInjection\ContainerInterface; |
| 8 | 7 | use Symfony\Component\HttpKernel\DataCollector\DataCollector; |
| 9 | 8 | use Symfony\Component\HttpFoundation\Request; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $this->data['author'] = $this->gitService->shellExec(GitCommand::GIT_AUTHOR_LAST_COMMIT); |
| 51 | 51 | $this->data['email'] = $this->gitService->shellExec(GitCommand::GIT_EMAIL_LAST_COMMIT); |
| 52 | 52 | $this->data['message'] = $this->gitService->shellExec(GitCommand::GIT_MESSAGE_LAST_COMMIT); |
| 53 | - $this->data['merge'] = $this->gitService->shellExec(GitCommand::GIT_ABBREVIATED_PARENT_HASHES. $this->data['commit']); |
|
| 53 | + $this->data['merge'] = $this->gitService->shellExec(GitCommand::GIT_ABBREVIATED_PARENT_HASHES.$this->data['commit']); |
|
| 54 | 54 | $this->getDateCommit(); |
| 55 | 55 | } |
| 56 | 56 | |
@@ -205,11 +205,11 @@ discard block |
||
| 205 | 205 | */ |
| 206 | 206 | public final function getIconColor() |
| 207 | 207 | { |
| 208 | - if ((float)$this->getSymfonyVersion() >= 2.8) { |
|
| 208 | + if ((float) $this->getSymfonyVersion() >= 2.8) { |
|
| 209 | 209 | return $this->data['iconColor'] = '#AAAAAA'; |
| 210 | 210 | } |
| 211 | 211 | |
| 212 | - return $this->data['iconColor'] = '#3F3F3F';#3F3F3F |
|
| 212 | + return $this->data['iconColor'] = '#3F3F3F'; #3F3F3F |
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | /** |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | $time = date_diff($dateCommit, $dateNow); |
| 246 | 246 | |
| 247 | 247 | // static time difference : minutes and seconds |
| 248 | - $this->data['timeCommitIntervalMinutes'] = $time->format('%y') * 365 * 24 * 60 + $time->format('%m') * 30 * 24 * 60 + $time->format('%d') * 24 * 60 + $time->format('%h') * 60 + $time->format('%i'); |
|
| 248 | + $this->data['timeCommitIntervalMinutes'] = $time->format('%y')*365*24*60+$time->format('%m')*30*24*60+$time->format('%d')*24*60+$time->format('%h')*60+$time->format('%i'); |
|
| 249 | 249 | // full readable date |
| 250 | 250 | $this->data['date'] = $date; |
| 251 | 251 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | public function getGitDirInConfiguration() |
| 19 | 19 | { |
| 20 | - $gitDir = $this->container->getParameter('symfony_debug_toolbar_git.repository_local_dir') . '/.git'; |
|
| 20 | + $gitDir = $this->container->getParameter('symfony_debug_toolbar_git.repository_local_dir').'/.git'; |
|
| 21 | 21 | return $gitDir; |
| 22 | 22 | } |
| 23 | 23 | |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | public function GitDirExist() |
| 29 | 29 | { |
| 30 | - $gitDir = $this->container->get('kernel')->getRootDir() . "/.."; |
|
| 30 | + $gitDir = $this->container->get('kernel')->getRootDir()."/.."; |
|
| 31 | 31 | $gitDir .= $this->getGitDirInConfiguration(); |
| 32 | 32 | |
| 33 | 33 | return file_exists($gitDir); |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $command = sprintf('cd %s && %s', $this->GitDirExist(), $command); |
| 43 | 43 | $resultCommand = shell_exec($command); |
| 44 | 44 | |
| 45 | - return (string)trim($resultCommand); |
|
| 45 | + return (string) trim($resultCommand); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | /** |