@@ -48,7 +48,7 @@ |
||
48 | 48 | { |
49 | 49 | $realConditions = []; |
50 | 50 | foreach ($conditions as $condition) { |
51 | - if (! $condition instanceof Condition) { |
|
51 | + if (!$condition instanceof Condition) { |
|
52 | 52 | continue; |
53 | 53 | } |
54 | 54 | $realConditions[] = $condition; |
@@ -122,9 +122,9 @@ discard block |
||
122 | 122 | protected function errorDetails(string $file): string |
123 | 123 | { |
124 | 124 | return ' <comment>(' |
125 | - . $this->fileMatches[$file] . ' match' |
|
126 | - . ($this->fileMatches[$file] > 1 ? 'es' : '') |
|
127 | - . ')</comment>'; |
|
125 | + . $this->fileMatches[$file] . ' match' |
|
126 | + . ($this->fileMatches[$file] > 1 ? 'es' : '') |
|
127 | + . ')</comment>'; |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -136,10 +136,10 @@ discard block |
||
136 | 136 | protected function errorMessage(int $filesFailed): string |
137 | 137 | { |
138 | 138 | return 'Regex \'' . $this->regexName . '\' failed: ' |
139 | - . 'found ' . $this->totalMatches . ' match' |
|
140 | - . ($this->totalMatches > 1 ? 'es' : '') |
|
141 | - . ' in ' . $filesFailed . ' file' |
|
142 | - . ($filesFailed > 1 ? 's' : '' ); |
|
139 | + . 'found ' . $this->totalMatches . ' match' |
|
140 | + . ($this->totalMatches > 1 ? 'es' : '') |
|
141 | + . ' in ' . $filesFailed . ' file' |
|
142 | + . ($filesFailed > 1 ? 's' : '' ); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
@@ -139,7 +139,7 @@ |
||
139 | 139 | . 'found ' . $this->totalMatches . ' match' |
140 | 140 | . ($this->totalMatches > 1 ? 'es' : '') |
141 | 141 | . ' in ' . $filesFailed . ' file' |
142 | - . ($filesFailed > 1 ? 's' : '' ); |
|
142 | + . ($filesFailed > 1 ? 's' : ''); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | |
79 | 79 | // every action has to get executed |
80 | 80 | $actionConfigFail->expects($this->atLeastOnce()) |
81 | - ->method('getAction') |
|
82 | - ->willReturn(CH_PATH_FILES . '/bin/failure'); |
|
81 | + ->method('getAction') |
|
82 | + ->willReturn(CH_PATH_FILES . '/bin/failure'); |
|
83 | 83 | |
84 | 84 | // so even if the first actions fails this action has to get executed |
85 | 85 | $actionConfigSuccess->expects($this->atLeastOnce()) |
@@ -88,8 +88,8 @@ discard block |
||
88 | 88 | |
89 | 89 | $hookConfig->method('isEnabled')->willReturn(true); |
90 | 90 | $hookConfig->expects($this->once()) |
91 | - ->method('getActions') |
|
92 | - ->willReturn([$actionConfigFail, $actionConfigSuccess]); |
|
91 | + ->method('getActions') |
|
92 | + ->willReturn([$actionConfigFail, $actionConfigSuccess]); |
|
93 | 93 | |
94 | 94 | $config->expects($this->once())->method('getHookConfigToExecute')->willReturn($hookConfig); |
95 | 95 | $config->method('isHookEnabled')->willReturn(true); |
@@ -125,8 +125,8 @@ discard block |
||
125 | 125 | |
126 | 126 | $hookConfig->method('isEnabled')->willReturn(true); |
127 | 127 | $hookConfig->expects($this->once()) |
128 | - ->method('getActions') |
|
129 | - ->willReturn([$actionConfigFail, $actionConfigSuccess]); |
|
128 | + ->method('getActions') |
|
129 | + ->willReturn([$actionConfigFail, $actionConfigSuccess]); |
|
130 | 130 | |
131 | 131 | $config->expects($this->once())->method('getHookConfigToExecute')->willReturn($hookConfig); |
132 | 132 | $config->expects($this->atLeastOnce())->method('isHookEnabled')->willReturn(true); |
@@ -50,7 +50,7 @@ |
||
50 | 50 | $command = $io->getArgument(Hooks::ARG_COMMAND); |
51 | 51 | |
52 | 52 | /** @var \CaptainHook\App\Git\ChangedFiles\Detecting $class */ |
53 | - $class = self::$detectors[$command] ?? '\\CaptainHook\\App\\Git\\ChangedFiles\\Detector\\Fallback'; |
|
53 | + $class = self::$detectors[$command] ?? '\\CaptainHook\\App\\Git\\ChangedFiles\\Detector\\Fallback'; |
|
54 | 54 | return new $class($io, $repository); |
55 | 55 | } |
56 | 56 | } |
@@ -45,13 +45,13 @@ |
||
45 | 45 | $io = $this->createIOMock(); |
46 | 46 | $io->method('getArgument')->willReturn('hook:pre-push'); |
47 | 47 | $io->expects($this->atLeastOnce()) |
48 | - ->method('getStandardInput') |
|
49 | - ->willReturn( |
|
50 | - [ |
|
51 | - 'refs/heads/main 9dfa0fa6221d75f48b2dfac359127324bedf8409' . |
|
52 | - ' refs/heads/main 8309f6e16097754469c485e604900c573bf2c5d8' |
|
53 | - ] |
|
54 | - ); |
|
48 | + ->method('getStandardInput') |
|
49 | + ->willReturn( |
|
50 | + [ |
|
51 | + 'refs/heads/main 9dfa0fa6221d75f48b2dfac359127324bedf8409' . |
|
52 | + ' refs/heads/main 8309f6e16097754469c485e604900c573bf2c5d8' |
|
53 | + ] |
|
54 | + ); |
|
55 | 55 | $operator = $this->createGitDiffOperator(['fiz.php', 'foo.txt']); |
56 | 56 | $repository = $this->createRepositoryMock(''); |
57 | 57 | $repository->expects($this->once())->method('getDiffOperator')->willReturn($operator); |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | ->method('getBranchRevFromRefLog') |
49 | 49 | ->willReturn('main'); |
50 | 50 | $info->expects($this->once()) |
51 | - ->method('getCurrentBranch') |
|
52 | - ->willReturn('foo'); |
|
51 | + ->method('getCurrentBranch') |
|
52 | + ->willReturn('foo'); |
|
53 | 53 | |
54 | 54 | $repo->expects($this->atLeastOnce())->method('getLogOperator')->willReturn($log); |
55 | 55 | $repo->expects($this->atLeastOnce())->method('getInfoOperator')->willReturn($info); |
@@ -102,8 +102,8 @@ discard block |
||
102 | 102 | ->method('getChangedFilesSince') |
103 | 103 | ->willReturn(['file1.php', 'file2.php', 'README.md', 'foo.txt']); |
104 | 104 | $info->expects($this->once()) |
105 | - ->method('getCurrentBranch') |
|
106 | - ->willReturn('foo'); |
|
105 | + ->method('getCurrentBranch') |
|
106 | + ->willReturn('foo'); |
|
107 | 107 | |
108 | 108 | $repo->expects($this->atLeastOnce())->method('getLogOperator')->willReturn($log); |
109 | 109 | $repo->expects($this->atLeastOnce())->method('getInfoOperator')->willReturn($info); |
@@ -129,8 +129,8 @@ discard block |
||
129 | 129 | ->method('getChangedFilesSince') |
130 | 130 | ->willReturn(['foo/file1.php', 'foo/file2.php', 'README.md']); |
131 | 131 | $info->expects($this->once()) |
132 | - ->method('getCurrentBranch') |
|
133 | - ->willReturn('foo'); |
|
132 | + ->method('getCurrentBranch') |
|
133 | + ->willReturn('foo'); |
|
134 | 134 | |
135 | 135 | $repo->expects($this->atLeastOnce())->method('getLogOperator')->willReturn($log); |
136 | 136 | $repo->expects($this->atLeastOnce())->method('getInfoOperator')->willReturn($info); |
@@ -110,7 +110,7 @@ |
||
110 | 110 | |
111 | 111 | $executableInclude = substr($executablePath, 0, 1) == '/' |
112 | 112 | ? '\'' . $executablePath . '\'' |
113 | - : '__DIR__ . \'/../../' . $executablePath . '\''; |
|
113 | + : '__DIR__ . \'/../../' . $executablePath . '\''; |
|
114 | 114 | return array_merge( |
115 | 115 | [ |
116 | 116 | '#!/usr/bin/env php', |
@@ -81,7 +81,7 @@ |
||
81 | 81 | '<fg=red>Warning: Hook script is out of date</>', |
82 | 82 | 'The git hook script needs to be updated.', |
83 | 83 | 'Required version is <info>' . CH::MIN_REQ_INSTALLER . '</info>' |
84 | - . ' found <fg=red>' . $installerVersion . '</>.', |
|
84 | + . ' found <fg=red>' . $installerVersion . '</>.', |
|
85 | 85 | 'Please re-install your hook by running:', |
86 | 86 | ' <comment>captainhook install ' . $this->hook . '</comment>', |
87 | 87 | '', |
@@ -59,7 +59,7 @@ |
||
59 | 59 | */ |
60 | 60 | public function handle(Event $event): void |
61 | 61 | { |
62 | - if (!IOUtil::answerToBool($event->io()->ask(PHP_EOL . $this->question . ' ', $this->default ? 'y' : 'n'))) { |
|
62 | + if (!IOUtil::answerToBool($event->io()->ask(PHP_EOL . $this->question . ' ', $this->default ? 'y' : 'n'))) { |
|
63 | 63 | throw new ActionFailed('no confirmation, abort!'); |
64 | 64 | } |
65 | 65 | } |