@@ -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); |
@@ -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 | } |
@@ -228,7 +228,7 @@ |
||
228 | 228 | // if hook is configured and no force option is set |
229 | 229 | // ask the user if overwriting the hook is ok |
230 | 230 | if ($this->needConfirmation($hook)) { |
231 | - $ans = $this->io->ask( |
|
231 | + $ans = $this->io->ask( |
|
232 | 232 | 'The <comment>' . $hook . '</comment> hook exists! Overwrite? <comment>[y,N]</comment> ', |
233 | 233 | 'n' |
234 | 234 | ); |
@@ -41,64 +41,64 @@ discard block |
||
41 | 41 | { |
42 | 42 | parent::configure(); |
43 | 43 | $this->setName('install') |
44 | - ->setDescription('Install hooks to your .git/hooks directory') |
|
45 | - ->setHelp('Install git hooks to your .git/hooks directory') |
|
46 | - ->addArgument( |
|
47 | - 'hook', |
|
48 | - InputArgument::OPTIONAL, |
|
49 | - 'Limit the hooks you want to install. ' . |
|
50 | - 'You can specify multiple hooks with comma as delimiter. ' . |
|
51 | - 'By default all hooks get installed' |
|
52 | - ) |
|
53 | - ->addOption( |
|
54 | - 'only-enabled', |
|
55 | - null, |
|
56 | - InputOption::VALUE_NONE, |
|
57 | - 'Limit the hooks you want to install to those enabled in your conf. ' . |
|
58 | - 'By default all hooks get installed' |
|
59 | - ) |
|
60 | - ->addOption( |
|
61 | - 'force', |
|
62 | - 'f', |
|
63 | - InputOption::VALUE_NONE, |
|
64 | - 'Force install without confirmation' |
|
65 | - ) |
|
66 | - ->addOption( |
|
67 | - 'skip-existing', |
|
68 | - 's', |
|
69 | - InputOption::VALUE_NONE, |
|
70 | - 'Do not overwrite existing hooks' |
|
71 | - ) |
|
72 | - ->addOption( |
|
73 | - 'move-existing-to', |
|
74 | - null, |
|
75 | - InputOption::VALUE_OPTIONAL, |
|
76 | - 'Move existing hooks to given directory' |
|
77 | - ) |
|
78 | - ->addOption( |
|
79 | - 'bootstrap', |
|
80 | - 'b', |
|
81 | - InputOption::VALUE_OPTIONAL, |
|
82 | - 'Path to composers vendor/autoload.php' |
|
83 | - ) |
|
84 | - ->addOption( |
|
85 | - 'run-mode', |
|
86 | - 'm', |
|
87 | - InputOption::VALUE_OPTIONAL, |
|
88 | - 'Git hook run mode [php|shell|docker]' |
|
89 | - ) |
|
90 | - ->addOption( |
|
91 | - 'run-exec', |
|
92 | - 'e', |
|
93 | - InputOption::VALUE_OPTIONAL, |
|
94 | - 'The Docker command to start your container e.g. \'docker exec CONTAINER\'' |
|
95 | - ) |
|
96 | - ->addOption( |
|
97 | - 'run-path', |
|
98 | - 'p', |
|
99 | - InputOption::VALUE_OPTIONAL, |
|
100 | - 'The path to the CaptainHook executable \'/usr/bin/captainhook\'' |
|
101 | - ); |
|
44 | + ->setDescription('Install hooks to your .git/hooks directory') |
|
45 | + ->setHelp('Install git hooks to your .git/hooks directory') |
|
46 | + ->addArgument( |
|
47 | + 'hook', |
|
48 | + InputArgument::OPTIONAL, |
|
49 | + 'Limit the hooks you want to install. ' . |
|
50 | + 'You can specify multiple hooks with comma as delimiter. ' . |
|
51 | + 'By default all hooks get installed' |
|
52 | + ) |
|
53 | + ->addOption( |
|
54 | + 'only-enabled', |
|
55 | + null, |
|
56 | + InputOption::VALUE_NONE, |
|
57 | + 'Limit the hooks you want to install to those enabled in your conf. ' . |
|
58 | + 'By default all hooks get installed' |
|
59 | + ) |
|
60 | + ->addOption( |
|
61 | + 'force', |
|
62 | + 'f', |
|
63 | + InputOption::VALUE_NONE, |
|
64 | + 'Force install without confirmation' |
|
65 | + ) |
|
66 | + ->addOption( |
|
67 | + 'skip-existing', |
|
68 | + 's', |
|
69 | + InputOption::VALUE_NONE, |
|
70 | + 'Do not overwrite existing hooks' |
|
71 | + ) |
|
72 | + ->addOption( |
|
73 | + 'move-existing-to', |
|
74 | + null, |
|
75 | + InputOption::VALUE_OPTIONAL, |
|
76 | + 'Move existing hooks to given directory' |
|
77 | + ) |
|
78 | + ->addOption( |
|
79 | + 'bootstrap', |
|
80 | + 'b', |
|
81 | + InputOption::VALUE_OPTIONAL, |
|
82 | + 'Path to composers vendor/autoload.php' |
|
83 | + ) |
|
84 | + ->addOption( |
|
85 | + 'run-mode', |
|
86 | + 'm', |
|
87 | + InputOption::VALUE_OPTIONAL, |
|
88 | + 'Git hook run mode [php|shell|docker]' |
|
89 | + ) |
|
90 | + ->addOption( |
|
91 | + 'run-exec', |
|
92 | + 'e', |
|
93 | + InputOption::VALUE_OPTIONAL, |
|
94 | + 'The Docker command to start your container e.g. \'docker exec CONTAINER\'' |
|
95 | + ) |
|
96 | + ->addOption( |
|
97 | + 'run-path', |
|
98 | + 'p', |
|
99 | + InputOption::VALUE_OPTIONAL, |
|
100 | + 'The path to the CaptainHook executable \'/usr/bin/captainhook\'' |
|
101 | + ); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
@@ -130,11 +130,11 @@ discard block |
||
130 | 130 | $template = Template\Builder::build($config, $repo, $this->resolver); |
131 | 131 | $installer = new Installer($io, $config, $repo, $template); |
132 | 132 | $installer->setHook(IOUtil::argToString($input->getArgument('hook'))) |
133 | - ->setForce(IOUtil::argToBool($input->getOption('force'))) |
|
134 | - ->setSkipExisting(IOUtil::argToBool($input->getOption('skip-existing'))) |
|
135 | - ->setMoveExistingTo(IOUtil::argToString($input->getOption('move-existing-to'))) |
|
136 | - ->setOnlyEnabled(IOUtil::argToBool($input->getOption('only-enabled'))) |
|
137 | - ->run(); |
|
133 | + ->setForce(IOUtil::argToBool($input->getOption('force'))) |
|
134 | + ->setSkipExisting(IOUtil::argToBool($input->getOption('skip-existing'))) |
|
135 | + ->setMoveExistingTo(IOUtil::argToString($input->getOption('move-existing-to'))) |
|
136 | + ->setOnlyEnabled(IOUtil::argToBool($input->getOption('only-enabled'))) |
|
137 | + ->run(); |
|
138 | 138 | |
139 | 139 | return 0; |
140 | 140 | } |
@@ -37,32 +37,32 @@ |
||
37 | 37 | { |
38 | 38 | parent::configure(); |
39 | 39 | $this->setName('uninstall') |
40 | - ->setDescription('Remove all git hooks from your .git/hooks directory') |
|
41 | - ->setHelp('Remove all git hooks from your .git/hooks directory') |
|
42 | - ->addArgument( |
|
43 | - 'hook', |
|
44 | - InputArgument::OPTIONAL, |
|
45 | - 'Remove only this one hook. By default all hooks get uninstalled' |
|
46 | - ) |
|
47 | - ->addOption( |
|
48 | - 'force', |
|
49 | - 'f', |
|
50 | - InputOption::VALUE_NONE, |
|
51 | - 'Force install without confirmation' |
|
52 | - ) |
|
53 | - ->addOption( |
|
54 | - 'only-disabled', |
|
55 | - null, |
|
56 | - InputOption::VALUE_NONE, |
|
57 | - 'Limit the hooks you want to remove to those that are not enabled in your conf. ' . |
|
58 | - 'By default all hooks get uninstalled' |
|
59 | - ) |
|
60 | - ->addOption( |
|
61 | - 'move-existing-to', |
|
62 | - null, |
|
63 | - InputOption::VALUE_OPTIONAL, |
|
64 | - 'Move existing hooks to this directory' |
|
65 | - ); |
|
40 | + ->setDescription('Remove all git hooks from your .git/hooks directory') |
|
41 | + ->setHelp('Remove all git hooks from your .git/hooks directory') |
|
42 | + ->addArgument( |
|
43 | + 'hook', |
|
44 | + InputArgument::OPTIONAL, |
|
45 | + 'Remove only this one hook. By default all hooks get uninstalled' |
|
46 | + ) |
|
47 | + ->addOption( |
|
48 | + 'force', |
|
49 | + 'f', |
|
50 | + InputOption::VALUE_NONE, |
|
51 | + 'Force install without confirmation' |
|
52 | + ) |
|
53 | + ->addOption( |
|
54 | + 'only-disabled', |
|
55 | + null, |
|
56 | + InputOption::VALUE_NONE, |
|
57 | + 'Limit the hooks you want to remove to those that are not enabled in your conf. ' . |
|
58 | + 'By default all hooks get uninstalled' |
|
59 | + ) |
|
60 | + ->addOption( |
|
61 | + 'move-existing-to', |
|
62 | + null, |
|
63 | + InputOption::VALUE_OPTIONAL, |
|
64 | + 'Move existing hooks to this directory' |
|
65 | + ); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | ); |
82 | 82 | |
83 | 83 | if (IOUtil::answerToBool($answer)) { |
84 | - $call = '\\CaptainHook' . '\\App' . '\\Hook\\PHP\\Action\\Linting'; |
|
84 | + $call = '\\CaptainHook' . '\\App' . '\\Hook\\PHP\\Action\\Linting'; |
|
85 | 85 | $config->addAction(new Config\Action($call)); |
86 | 86 | } |
87 | 87 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | ); |
125 | 125 | |
126 | 126 | if (IOUtil::answerToBool($answer)) { |
127 | - $call = $this->io->ask( |
|
127 | + $call = $this->io->ask( |
|
128 | 128 | ' <info>Enter the phpcs command you want to execute.</info> ' |
129 | 129 | . '<comment>[phpcs --standard=psr2 src]</comment> ', |
130 | 130 | 'phpcs --standard=psr2 src' |
@@ -109,7 +109,7 @@ |
||
109 | 109 | |
110 | 110 | $executableInclude = substr($executablePath, 0, 1) == '/' |
111 | 111 | ? '\'' . $executablePath . '\'' |
112 | - : '__DIR__ . \'/../../' . $executablePath . '\''; |
|
112 | + : '__DIR__ . \'/../../' . $executablePath . '\''; |
|
113 | 113 | |
114 | 114 | $bootstrapOption = $this->getBootstrapCmdOption(); |
115 | 115 | $bootstrapOptionQuoted = empty($bootstrapOption) ? '' : ' \'' . $bootstrapOption . '\','; |
@@ -28,7 +28,7 @@ |
||
28 | 28 | public function testStdInValue(): void |
29 | 29 | { |
30 | 30 | $expected = 'refs/heads/main 9dfa0fa6221d75f48b2dfac359127324bedf8409' |
31 | - . ' refs/heads/main 8309f6e16097754469c485e604900c573bf2c5d8'; |
|
31 | + . ' refs/heads/main 8309f6e16097754469c485e604900c573bf2c5d8'; |
|
32 | 32 | |
33 | 33 | $io = $this->createIOMock(); |
34 | 34 | $repo = $this->createRepositoryMock(); |