Completed
Push — 2.1 ( 8c7631...c23fe5 )
by David
11s
created
src/Mouf/Utils/Patcher/Commands/SkipPatchCommand.php 1 patch
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -15,45 +15,45 @@
 block discarded – undo
15 15
  */
16 16
 class SkipPatchCommand extends Command
17 17
 {
18
-    /**
19
-     * @var PatchService
20
-     */
21
-    private $patchService;
18
+	/**
19
+	 * @var PatchService
20
+	 */
21
+	private $patchService;
22 22
 
23
-    public function __construct(PatchService $patchService)
24
-    {
25
-        parent::__construct();
26
-        $this->patchService = $patchService;
27
-    }
23
+	public function __construct(PatchService $patchService)
24
+	{
25
+		parent::__construct();
26
+		$this->patchService = $patchService;
27
+	}
28 28
 
29 29
 
30
-    /**
31
-     * {@inheritdoc}
32
-     */
33
-    protected function configure()
34
-    {
35
-        $this
36
-        ->setName('patches:skip')
37
-        ->setDescription('Skip a patch.')
38
-        ->addArgument(
39
-            'name',
40
-            InputArgument::REQUIRED,
41
-            'The name of the patch instance to be skipped'
42
-        )
43
-        ->setHelp(<<<EOT
30
+	/**
31
+	 * {@inheritdoc}
32
+	 */
33
+	protected function configure()
34
+	{
35
+		$this
36
+		->setName('patches:skip')
37
+		->setDescription('Skip a patch.')
38
+		->addArgument(
39
+			'name',
40
+			InputArgument::REQUIRED,
41
+			'The name of the patch instance to be skipped'
42
+		)
43
+		->setHelp(<<<EOT
44 44
 Skips a patch. You must pass in parameter the name of the patch.
45 45
 EOT
46
-        );
47
-    }
46
+		);
47
+	}
48 48
 
49
-    /**
50
-     * {@inheritdoc}
51
-     */
52
-    protected function execute(InputInterface $input, OutputInterface $output)
53
-    {
54
-        $patchName = $input->getArgument('name');
55
-        $this->patchService->skip($patchName);
49
+	/**
50
+	 * {@inheritdoc}
51
+	 */
52
+	protected function execute(InputInterface $input, OutputInterface $output)
53
+	{
54
+		$patchName = $input->getArgument('name');
55
+		$this->patchService->skip($patchName);
56 56
 
57
-        $output->writeln('Patch marked as skipped');
58
-    }
57
+		$output->writeln('Patch marked as skipped');
58
+	}
59 59
 }
Please login to merge, or discard this patch.
src/Mouf/Utils/Patcher/Commands/ApplyPatchCommand.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -15,47 +15,47 @@
 block discarded – undo
15 15
  */
16 16
 class ApplyPatchCommand extends Command
17 17
 {
18
-    /**
19
-     * @var PatchService
20
-     */
21
-    private $patchService;
22
-
23
-    public function __construct(PatchService $patchService)
24
-    {
25
-        parent::__construct();
26
-        $this->patchService = $patchService;
27
-    }
28
-
29
-
30
-    /**
31
-     * {@inheritdoc}
32
-     */
33
-    protected function configure()
34
-    {
35
-        $this
36
-        ->setName('patches:apply')
37
-        ->setDescription('Apply a patch.')
38
-        ->addArgument(
39
-            'name',
40
-            InputArgument::REQUIRED,
41
-            'The name of the patch instance to be applied'
42
-        )
43
-        ->setHelp(<<<EOT
18
+	/**
19
+	 * @var PatchService
20
+	 */
21
+	private $patchService;
22
+
23
+	public function __construct(PatchService $patchService)
24
+	{
25
+		parent::__construct();
26
+		$this->patchService = $patchService;
27
+	}
28
+
29
+
30
+	/**
31
+	 * {@inheritdoc}
32
+	 */
33
+	protected function configure()
34
+	{
35
+		$this
36
+		->setName('patches:apply')
37
+		->setDescription('Apply a patch.')
38
+		->addArgument(
39
+			'name',
40
+			InputArgument::REQUIRED,
41
+			'The name of the patch instance to be applied'
42
+		)
43
+		->setHelp(<<<EOT
44 44
 Apply a patch. You must pass in parameter the name of the patch.
45 45
 
46 46
 Use patches:apply-all to apply all pending patches.
47 47
 EOT
48
-        );
49
-    }
50
-
51
-    /**
52
-     * {@inheritdoc}
53
-     */
54
-    protected function execute(InputInterface $input, OutputInterface $output)
55
-    {
56
-        $patchName = $input->getArgument('name');
57
-        $this->patchService->apply($patchName);
58
-
59
-        $output->writeln('Patch successfully applied');
60
-    }
48
+		);
49
+	}
50
+
51
+	/**
52
+	 * {@inheritdoc}
53
+	 */
54
+	protected function execute(InputInterface $input, OutputInterface $output)
55
+	{
56
+		$patchName = $input->getArgument('name');
57
+		$this->patchService->apply($patchName);
58
+
59
+		$output->writeln('Patch successfully applied');
60
+	}
61 61
 }
Please login to merge, or discard this patch.
src/Mouf/Utils/Patcher/Commands/RevertPatchCommand.php 1 patch
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -15,45 +15,45 @@
 block discarded – undo
15 15
  */
16 16
 class RevertPatchCommand extends Command
17 17
 {
18
-    /**
19
-     * @var PatchService
20
-     */
21
-    private $patchService;
18
+	/**
19
+	 * @var PatchService
20
+	 */
21
+	private $patchService;
22 22
 
23
-    public function __construct(PatchService $patchService)
24
-    {
25
-        parent::__construct();
26
-        $this->patchService = $patchService;
27
-    }
23
+	public function __construct(PatchService $patchService)
24
+	{
25
+		parent::__construct();
26
+		$this->patchService = $patchService;
27
+	}
28 28
 
29 29
 
30
-    /**
31
-     * {@inheritdoc}
32
-     */
33
-    protected function configure()
34
-    {
35
-        $this
36
-        ->setName('patches:revert')
37
-        ->setDescription('Revert a patch.')
38
-        ->addArgument(
39
-            'name',
40
-            InputArgument::REQUIRED,
41
-            'The name of the patch instance to be reverted'
42
-        )
43
-        ->setHelp(<<<EOT
30
+	/**
31
+	 * {@inheritdoc}
32
+	 */
33
+	protected function configure()
34
+	{
35
+		$this
36
+		->setName('patches:revert')
37
+		->setDescription('Revert a patch.')
38
+		->addArgument(
39
+			'name',
40
+			InputArgument::REQUIRED,
41
+			'The name of the patch instance to be reverted'
42
+		)
43
+		->setHelp(<<<EOT
44 44
 Reverts a patch. You must pass in parameter the name of the patch.
45 45
 EOT
46
-        );
47
-    }
46
+		);
47
+	}
48 48
 
49
-    /**
50
-     * {@inheritdoc}
51
-     */
52
-    protected function execute(InputInterface $input, OutputInterface $output)
53
-    {
54
-        $patchName = $input->getArgument('name');
55
-        $this->patchService->revert($patchName);
49
+	/**
50
+	 * {@inheritdoc}
51
+	 */
52
+	protected function execute(InputInterface $input, OutputInterface $output)
53
+	{
54
+		$patchName = $input->getArgument('name');
55
+		$this->patchService->revert($patchName);
56 56
 
57
-        $output->writeln('Patch successfully reverted');
58
-    }
57
+		$output->writeln('Patch successfully reverted');
58
+	}
59 59
 }
Please login to merge, or discard this patch.
src/Mouf/Utils/Patcher/Controllers/PatchController.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
 	 * @Action
44 44
 	 * @Logged
45 45
 	 */
46
-	public function defaultAction($name, $selfedit="false") {
46
+	public function defaultAction($name, $selfedit = "false") {
47 47
 		$this->initController($name, $selfedit);
48 48
 		
49 49
 		$patchService = new InstanceProxy($name, $selfedit == "true");
Please login to merge, or discard this patch.
Indentation   +108 added lines, -109 removed lines patch added patch discarded remove patch
@@ -19,7 +19,6 @@  discard block
 block discarded – undo
19 19
 
20 20
 /**
21 21
  * The controller to track which patchs have been applied.
22
-
23 22
  */
24 23
 class PatchController extends AbstractMoufInstanceController {
25 24
 	
@@ -98,96 +97,96 @@  discard block
 block discarded – undo
98 97
 		header('Location: .?name='.urlencode($name));
99 98
 	}
100 99
 
101
-    /**
102
-     * Displays the page to select the patch types to be applied.
103
-     *
104
-     * @Action
105
-     * @Logged
106
-     * @param string $name
107
-     * @param string $selfedit
108
-     * @param string $action One of "reset" or "apply"
109
-     */
110
-    public function runAllPatches($name, $selfedit, $action) {
111
-        $this->initController($name, $selfedit);
112
-
113
-        $patchService = new InstanceProxy($name, $selfedit == "true");
114
-        $this->patchesArray = $patchService->getView();
115
-
116
-        $types = $patchService->_getSerializedTypes();
117
-
118
-        foreach ($types as $type) {
119
-            $this->nbPatchesByType[$type['name']] = 0;
120
-        }
121
-
122
-        $nbNoneDefaultPatches = 0;
123
-
124
-        foreach ($this->patchesArray as $patch) {
125
-            if ($action === 'reset' || $patch['status'] === PatchInterface::STATUS_AWAITING || $patch['status'] === PatchInterface::STATUS_ERROR) {
126
-                $type = $patch['patch_type'];
127
-                if ($type !== '') {
128
-                    $nbNoneDefaultPatches++;
129
-                }
130
-                $this->nbPatchesByType[$type]++;
131
-            }
132
-        }
133
-
134
-        // If all patches to be applied are default patches, let's do this right now.
135
-        if ($nbNoneDefaultPatches === 0) {
136
-            $this->applyAllPatches($name, [''], $action, $selfedit);
137
-            return;
138
-        }
139
-
140
-        ksort($this->nbPatchesByType);
141
-
142
-        $this->action = $action;
143
-
144
-        // Otherwise, let's display a screen to select the patch types to be applied.
145
-        $this->content->addFile(__DIR__."/../../../../views/applyPatches.php", $this);
146
-        $this->template->toHtml();
147
-    }
148
-
149
-
150
-    /**
151
-     * Runs all patches in a row.
152
-     *
153
-     * @Action
154
-     * @Logged
155
-     * @param string $name
156
-     * @param array $types
157
-     * @param string $action One of "reset" or "apply"
158
-     * @param string $selfedit
159
-     */
100
+	/**
101
+	 * Displays the page to select the patch types to be applied.
102
+	 *
103
+	 * @Action
104
+	 * @Logged
105
+	 * @param string $name
106
+	 * @param string $selfedit
107
+	 * @param string $action One of "reset" or "apply"
108
+	 */
109
+	public function runAllPatches($name, $selfedit, $action) {
110
+		$this->initController($name, $selfedit);
111
+
112
+		$patchService = new InstanceProxy($name, $selfedit == "true");
113
+		$this->patchesArray = $patchService->getView();
114
+
115
+		$types = $patchService->_getSerializedTypes();
116
+
117
+		foreach ($types as $type) {
118
+			$this->nbPatchesByType[$type['name']] = 0;
119
+		}
120
+
121
+		$nbNoneDefaultPatches = 0;
122
+
123
+		foreach ($this->patchesArray as $patch) {
124
+			if ($action === 'reset' || $patch['status'] === PatchInterface::STATUS_AWAITING || $patch['status'] === PatchInterface::STATUS_ERROR) {
125
+				$type = $patch['patch_type'];
126
+				if ($type !== '') {
127
+					$nbNoneDefaultPatches++;
128
+				}
129
+				$this->nbPatchesByType[$type]++;
130
+			}
131
+		}
132
+
133
+		// If all patches to be applied are default patches, let's do this right now.
134
+		if ($nbNoneDefaultPatches === 0) {
135
+			$this->applyAllPatches($name, [''], $action, $selfedit);
136
+			return;
137
+		}
138
+
139
+		ksort($this->nbPatchesByType);
140
+
141
+		$this->action = $action;
142
+
143
+		// Otherwise, let's display a screen to select the patch types to be applied.
144
+		$this->content->addFile(__DIR__."/../../../../views/applyPatches.php", $this);
145
+		$this->template->toHtml();
146
+	}
147
+
148
+
149
+	/**
150
+	 * Runs all patches in a row.
151
+	 *
152
+	 * @Action
153
+	 * @Logged
154
+	 * @param string $name
155
+	 * @param array $types
156
+	 * @param string $action One of "reset" or "apply"
157
+	 * @param string $selfedit
158
+	 */
160 159
 	public function applyAllPatches($name, array $types, $action, $selfedit) {
161 160
 		$patchService = new InstanceProxy($name, $selfedit == "true");
162 161
 
163
-        if ($action === 'reset') {
164
-            $patchService->reset();
165
-        }
162
+		if ($action === 'reset') {
163
+			$patchService->reset();
164
+		}
166 165
 
167 166
 		$this->patchesArray = $patchService->getView();
168 167
 
169 168
 		// Array of count of applied and skipped patches. Key is the patch type.
170 169
 		$appliedPatchArray = [];
171
-        $skippedPatchArray = [];
170
+		$skippedPatchArray = [];
172 171
 
173 172
 		try {
174 173
 			foreach ($this->patchesArray as $patch) {
175
-                if ($patch['status'] === PatchInterface::STATUS_AWAITING || $patch['status'] === PatchInterface::STATUS_ERROR) {
176
-                    $type = $patch['patch_type'];
177
-                    if (in_array($type, $types) || $type === '') {
178
-                        $patchService->apply($patch['uniqueName']);
179
-                        if (!isset($appliedPatchArray[$type])) {
180
-                            $appliedPatchArray[$type] = 0;
181
-                        }
182
-                        $appliedPatchArray[$type]++;
183
-                    } else {
184
-                        $patchService->skip($patch['uniqueName']);
185
-                        if (!isset($skippedPatchArray[$type])) {
186
-                            $skippedPatchArray[$type] = 0;
187
-                        }
188
-                        $skippedPatchArray[$type]++;
189
-                    }
190
-                }
174
+				if ($patch['status'] === PatchInterface::STATUS_AWAITING || $patch['status'] === PatchInterface::STATUS_ERROR) {
175
+					$type = $patch['patch_type'];
176
+					if (in_array($type, $types) || $type === '') {
177
+						$patchService->apply($patch['uniqueName']);
178
+						if (!isset($appliedPatchArray[$type])) {
179
+							$appliedPatchArray[$type] = 0;
180
+						}
181
+						$appliedPatchArray[$type]++;
182
+					} else {
183
+						$patchService->skip($patch['uniqueName']);
184
+						if (!isset($skippedPatchArray[$type])) {
185
+							$skippedPatchArray[$type] = 0;
186
+						}
187
+						$skippedPatchArray[$type]++;
188
+					}
189
+				}
191 190
 			}
192 191
 
193 192
 		} catch (\Exception $e) {
@@ -195,37 +194,37 @@  discard block
 block discarded – undo
195 194
 			set_user_message($htmlMessage);
196 195
 		}
197 196
 
198
-        $this->displayNotificationMessage($appliedPatchArray, $skippedPatchArray);
197
+		$this->displayNotificationMessage($appliedPatchArray, $skippedPatchArray);
199 198
 
200
-        header('Location: .?name='.urlencode($name));
199
+		header('Location: .?name='.urlencode($name));
201 200
 	}
202 201
 
203 202
 	private function displayNotificationMessage(array $appliedPatchArray, array $skippedPatchArray)
204
-    {
205
-        $nbPatchesApplied = array_sum($appliedPatchArray);
206
-        $nbPatchesSkipped = array_sum($skippedPatchArray);
207
-        $msg = '';
208
-        if ($nbPatchesApplied !== 0) {
209
-            $patchArr = [];
210
-            foreach ($appliedPatchArray as $name => $number) {
211
-                $name = $name ?: 'default';
212
-                $patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
213
-            }
214
-
215
-            $msg .= sprintf('%d patch(es) applied (%s)', $nbPatchesApplied, implode(', ', $patchArr));
216
-        }
217
-        if ($nbPatchesSkipped !== 0) {
218
-            $patchArr = [];
219
-            foreach ($skippedPatchArray as $name => $number) {
220
-                $name = $name ?: 'default';
221
-                $patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
222
-            }
223
-
224
-            $msg .= sprintf('%d patch(es) skipped (%s)', $nbPatchesSkipped, implode(', ', $patchArr));
225
-        }
226
-
227
-        if ($msg !== '') {
228
-            set_user_message($msg, UserMessageInterface::SUCCESS);
229
-        }
230
-    }
203
+	{
204
+		$nbPatchesApplied = array_sum($appliedPatchArray);
205
+		$nbPatchesSkipped = array_sum($skippedPatchArray);
206
+		$msg = '';
207
+		if ($nbPatchesApplied !== 0) {
208
+			$patchArr = [];
209
+			foreach ($appliedPatchArray as $name => $number) {
210
+				$name = $name ?: 'default';
211
+				$patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
212
+			}
213
+
214
+			$msg .= sprintf('%d patch(es) applied (%s)', $nbPatchesApplied, implode(', ', $patchArr));
215
+		}
216
+		if ($nbPatchesSkipped !== 0) {
217
+			$patchArr = [];
218
+			foreach ($skippedPatchArray as $name => $number) {
219
+				$name = $name ?: 'default';
220
+				$patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
221
+			}
222
+
223
+			$msg .= sprintf('%d patch(es) skipped (%s)', $nbPatchesSkipped, implode(', ', $patchArr));
224
+		}
225
+
226
+		if ($msg !== '') {
227
+			set_user_message($msg, UserMessageInterface::SUCCESS);
228
+		}
229
+	}
231 230
 }
232 231
\ No newline at end of file
Please login to merge, or discard this patch.
src/Mouf/Utils/Patcher/Commands/ApplyAllPatchesCommand.php 2 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,6 @@
 block discarded – undo
3 3
 
4 4
 use Mouf\Utils\Patcher\PatchInterface;
5 5
 use Mouf\Utils\Patcher\PatchService;
6
-use Symfony\Component\Console\Helper\Table;
7
-use Symfony\Component\Console\Input\InputArgument;
8 6
 use Symfony\Component\Console\Input\InputOption;
9 7
 use Symfony\Component\Console\Output\OutputInterface;
10 8
 use Symfony\Component\Console\Input\InputInterface;
Please login to merge, or discard this patch.
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -15,71 +15,71 @@
 block discarded – undo
15 15
  */
16 16
 class ApplyAllPatchesCommand extends Command
17 17
 {
18
-    /**
19
-     * @var PatchService
20
-     */
21
-    private $patchService;
18
+	/**
19
+	 * @var PatchService
20
+	 */
21
+	private $patchService;
22 22
 
23
-    public function __construct(PatchService $patchService)
24
-    {
25
-        $this->patchService = $patchService;
26
-        parent::__construct();
27
-    }
23
+	public function __construct(PatchService $patchService)
24
+	{
25
+		$this->patchService = $patchService;
26
+		parent::__construct();
27
+	}
28 28
 
29 29
 
30
-    /**
31
-     * {@inheritdoc}
32
-     */
33
-    protected function configure()
34
-    {
35
-        $this
36
-        ->setName('patches:apply-all')
37
-        ->setDescription('Apply pending patches.')
38
-        ->setDefinition(array(
30
+	/**
31
+	 * {@inheritdoc}
32
+	 */
33
+	protected function configure()
34
+	{
35
+		$this
36
+		->setName('patches:apply-all')
37
+		->setDescription('Apply pending patches.')
38
+		->setDefinition(array(
39 39
 
40
-        ))
41
-        ->setHelp(<<<EOT
40
+		))
41
+		->setHelp(<<<EOT
42 42
 Apply pending patches. You can select the type of patches to be applied using the options. Default patches are always applied.
43 43
 
44 44
 Use patches:apply if you want to cherry-pick a particular patch.
45 45
 EOT
46
-        );
46
+		);
47 47
 
48
-        foreach ($this->patchService->getTypes() as $type) {
49
-            if ($type->getName() !== '') {
50
-                $this->addOption($type->getName(), null, InputOption::VALUE_NONE, 'Applies patches of type "'.$type->getName().'". '.$type->getDescription());
51
-            }
52
-        }
53
-    }
48
+		foreach ($this->patchService->getTypes() as $type) {
49
+			if ($type->getName() !== '') {
50
+				$this->addOption($type->getName(), null, InputOption::VALUE_NONE, 'Applies patches of type "'.$type->getName().'". '.$type->getDescription());
51
+			}
52
+		}
53
+	}
54 54
 
55
-    /**
56
-     * {@inheritdoc}
57
-     */
58
-    protected function execute(InputInterface $input, OutputInterface $output)
59
-    {
60
-        $patchesArray = $this->patchService->getView();
55
+	/**
56
+	 * {@inheritdoc}
57
+	 */
58
+	protected function execute(InputInterface $input, OutputInterface $output)
59
+	{
60
+		$patchesArray = $this->patchService->getView();
61 61
 
62
-        $count = 0;
63
-        try {
64
-            foreach ($patchesArray as $patch) {
65
-                if ($patch['status'] == PatchInterface::STATUS_AWAITING || $patch['status'] == PatchInterface::STATUS_ERROR) {
66
-                    $this->patchService->apply($patch['uniqueName']);
67
-                    $count++;
68
-                }
69
-            }
70
-        } catch (\Exception $e) {
71
-            $output->writeln(sprintf(
72
-                    'An error occurred while applying patch <info>%s</info>: <error>%s</error>', $patch['uniqueName'], $e->getMessage()
73
-                ));
74
-            throw $e;
75
-        }
62
+		$count = 0;
63
+		try {
64
+			foreach ($patchesArray as $patch) {
65
+				if ($patch['status'] == PatchInterface::STATUS_AWAITING || $patch['status'] == PatchInterface::STATUS_ERROR) {
66
+					$this->patchService->apply($patch['uniqueName']);
67
+					$count++;
68
+				}
69
+			}
70
+		} catch (\Exception $e) {
71
+			$output->writeln(sprintf(
72
+					'An error occurred while applying patch <info>%s</info>: <error>%s</error>', $patch['uniqueName'], $e->getMessage()
73
+				));
74
+			throw $e;
75
+		}
76 76
 
77
-        if ($count) {
78
-            $output->writeln(sprintf(
79
-                    '<info>%d</info> patches successfully applied', $count
80
-                ));
81
-        } else {
82
-            $output->writeln('<info>No patches to apply</info>');
83
-        }
84
-    }
77
+		if ($count) {
78
+			$output->writeln(sprintf(
79
+					'<info>%d</info> patches successfully applied', $count
80
+				));
81
+		} else {
82
+			$output->writeln('<info>No patches to apply</info>');
83
+		}
84
+	}
85 85
 }
Please login to merge, or discard this patch.
src/Mouf/Utils/Patcher/PatchService.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -197,15 +197,15 @@
 block discarded – undo
197 197
 			
198 198
 			$html = '<strong>Patcher</strong>: <a href="'.ROOT_URL.'vendor/mouf/mouf/patcher/?name='.$instanceName.'" class="btn btn-large btn-success patch-run-all"><i class="icon-arrow-right icon-white"></i> Apply ';
199 199
 			if ($nbAwaitingPatchs != 0) {
200
-				$html .= $nbAwaitingPatchs." awaiting patch".(($nbAwaitingPatchs != 1)?"es":"");
200
+				$html .= $nbAwaitingPatchs." awaiting patch".(($nbAwaitingPatchs != 1) ? "es" : "");
201 201
 				if ($nbPatchesInError != 0) {
202
-					$html .=" and";
202
+					$html .= " and";
203 203
 				}
204 204
 			}
205 205
 			if ($nbPatchesInError != 0) {
206
-				$html .=$nbPatchesInError." patch".(($nbPatchesInError != 1)?"es":"")." in error";
206
+				$html .= $nbPatchesInError." patch".(($nbPatchesInError != 1) ? "es" : "")." in error";
207 207
 			}
208
-			$html .='</a>';
208
+			$html .= '</a>';
209 209
 				
210 210
 			
211 211
 			return new MoufValidatorResult($status, $html);
Please login to merge, or discard this patch.
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -30,42 +30,42 @@  discard block
 block discarded – undo
30 30
  * @ExtendedAction {"name":"View patches list", "url":"patcher/", "default":false}
31 31
  */
32 32
 class PatchService implements MoufValidatorInterface {
33
-    const IFEXISTS_EXCEPTION = "exception";
34
-    const IFEXISTS_IGNORE = "ignore";
33
+	const IFEXISTS_EXCEPTION = "exception";
34
+	const IFEXISTS_IGNORE = "ignore";
35 35
 
36 36
 
37
-    /**
37
+	/**
38 38
 	 * The list of patches declared for this application.
39 39
 	 * 
40 40
 	 * @var PatchInterface[]
41 41
 	 */
42 42
 	private $patchs = [];
43 43
 
44
-    /**
45
-     * The list of exiting patch types for this application.
46
-     *
47
-     * @var PatchType[]
48
-     */
44
+	/**
45
+	 * The list of exiting patch types for this application.
46
+	 *
47
+	 * @var PatchType[]
48
+	 */
49 49
 	private $types = [];
50 50
 
51
-    /**
52
-     * The list of listeners on the patch service.
53
-     *
54
-     * @var array|PatchListenerInterface[]
55
-     */
56
-    private $listeners;
51
+	/**
52
+	 * The list of listeners on the patch service.
53
+	 *
54
+	 * @var array|PatchListenerInterface[]
55
+	 */
56
+	private $listeners;
57 57
 
58
-    /**
59
-     * @param PatchType[] $types
60
-     * @param PatchListenerInterface[] $listeners
61
-     */
62
-    public function __construct(array $types, array $listeners = [])
63
-    {
64
-        $this->types = $types;
65
-        $this->listeners = $listeners;
66
-    }
58
+	/**
59
+	 * @param PatchType[] $types
60
+	 * @param PatchListenerInterface[] $listeners
61
+	 */
62
+	public function __construct(array $types, array $listeners = [])
63
+	{
64
+		$this->types = $types;
65
+		$this->listeners = $listeners;
66
+	}
67 67
 
68
-    /**
68
+	/**
69 69
 	 * The list of patches declared for this application.
70 70
 	 * @param PatchInterface[] $patchs
71 71
 	 * @return PatchService
@@ -75,26 +75,26 @@  discard block
 block discarded – undo
75 75
 		return $this;
76 76
 	}
77 77
 
78
-    /**
79
-     * The list of exiting patch types for this application.
80
-     *
81
-     * @return PatchType[]
82
-     */
83
-    public function getTypes(): array
84
-    {
85
-        return $this->types;
86
-    }
78
+	/**
79
+	 * The list of exiting patch types for this application.
80
+	 *
81
+	 * @return PatchType[]
82
+	 */
83
+	public function getTypes(): array
84
+	{
85
+		return $this->types;
86
+	}
87 87
 
88
-    /**
89
-     * @internal Returns a serialized list of types for the patch UI.
90
-     * @return array
91
-     */
92
-    public function _getSerializedTypes(): array
93
-    {
94
-        return array_map(function(PatchType $type) {
95
-            return $type->jsonSerialize();
96
-        }, $this->types);
97
-    }
88
+	/**
89
+	 * @internal Returns a serialized list of types for the patch UI.
90
+	 * @return array
91
+	 */
92
+	public function _getSerializedTypes(): array
93
+	{
94
+		return array_map(function(PatchType $type) {
95
+			return $type->jsonSerialize();
96
+		}, $this->types);
97
+	}
98 98
 
99 99
 	/**
100 100
 	 * Adds this patch to the list of existing patches.
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
223 223
 	
224 224
 	/**
225 225
 	 * Returns a PHP array representing the patchs.
226
-     *
227
-     * @internal
226
+	 *
227
+	 * @internal
228 228
 	 */
229 229
 	public function getView(): array {
230 230
 		$view = array();
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 				"description"=>$description,
259 259
 				"error_message"=>$error_message,
260 260
 				"edit_url"=>$editUrl,
261
-                "patch_type"=>$patchType
261
+				"patch_type"=>$patchType
262 262
 			);
263 263
 			$view[] = $patchView;
264 264
 		}
@@ -293,14 +293,14 @@  discard block
 block discarded – undo
293 293
 		$patch->revert();
294 294
 	}
295 295
 
296
-    /**
297
-     * Reset all patches to a not applied state.
298
-     *
299
-     * Note: this does NOT run the "revert" method on each patch but DOES trigger a "reset" event.
300
-     */
296
+	/**
297
+	 * Reset all patches to a not applied state.
298
+	 *
299
+	 * Note: this does NOT run the "revert" method on each patch but DOES trigger a "reset" event.
300
+	 */
301 301
 	public function reset(): void {
302
-        foreach ($this->listeners as $listener) {
303
-            $listener->onReset();
304
-        }
305
-    }
302
+		foreach ($this->listeners as $listener) {
303
+			$listener->onReset();
304
+		}
305
+	}
306 306
 }
Please login to merge, or discard this patch.
src/Mouf/Utils/Patcher/PatchType.php 2 patches
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -8,64 +8,64 @@
 block discarded – undo
8 8
 
9 9
 class PatchType implements \JsonSerializable
10 10
 {
11
-    /**
12
-     * @var string
13
-     */
14
-    private $name;
15
-    /**
16
-     * @var string
17
-     */
18
-    private $description;
11
+	/**
12
+	 * @var string
13
+	 */
14
+	private $name;
15
+	/**
16
+	 * @var string
17
+	 */
18
+	private $description;
19 19
 
20
-    /**
21
-     * @Important
22
-     * @param string $name The name of the patch type. Should not contain special characters or spaces. Note: the default type is an empty string.
23
-     * @param string $description The description of the patch type
24
-     * @throws PatchException
25
-     */
26
-    public function __construct(string $name, string $description)
27
-    {
28
-        if (!preg_match('/^[a-z_\-0-9]*$/i', $name)) {
29
-            throw new PatchException('A patch name can only contain alphanumeric characters and underscore. Name passed: "'.$name.'"');
30
-        }
20
+	/**
21
+	 * @Important
22
+	 * @param string $name The name of the patch type. Should not contain special characters or spaces. Note: the default type is an empty string.
23
+	 * @param string $description The description of the patch type
24
+	 * @throws PatchException
25
+	 */
26
+	public function __construct(string $name, string $description)
27
+	{
28
+		if (!preg_match('/^[a-z_\-0-9]*$/i', $name)) {
29
+			throw new PatchException('A patch name can only contain alphanumeric characters and underscore. Name passed: "'.$name.'"');
30
+		}
31 31
 
32
-        $this->name = $name;
33
-        $this->description = $description;
34
-    }
32
+		$this->name = $name;
33
+		$this->description = $description;
34
+	}
35 35
 
36
-    /**
37
-     * The name of the patch type. Should not contain special characters or spaces.
38
-     *
39
-     * @return string
40
-     */
41
-    public function getName(): string
42
-    {
43
-        return $this->name;
44
-    }
36
+	/**
37
+	 * The name of the patch type. Should not contain special characters or spaces.
38
+	 *
39
+	 * @return string
40
+	 */
41
+	public function getName(): string
42
+	{
43
+		return $this->name;
44
+	}
45 45
 
46
-    /**
47
-     * The description of the patch type.
48
-     *
49
-     * @return string
50
-     */
51
-    public function getDescription(): string
52
-    {
53
-        return $this->description;
54
-    }
46
+	/**
47
+	 * The description of the patch type.
48
+	 *
49
+	 * @return string
50
+	 */
51
+	public function getDescription(): string
52
+	{
53
+		return $this->description;
54
+	}
55 55
 
56
-    /**
57
-     * Specify data which should be serialized to JSON
58
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
59
-     * @return mixed data which can be serialized by <b>json_encode</b>,
60
-     * which is a value of any type other than a resource.
61
-     * @since 5.4.0
62
-     */
63
-    public function jsonSerialize()
64
-    {
65
-        return [
66
-            'name' => $this->name,
67
-            'description' => $this->description,
68
-            'instanceName' => MoufManager::getMoufManager()->findInstanceName($this)
69
-        ];
70
-    }
56
+	/**
57
+	 * Specify data which should be serialized to JSON
58
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
59
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
60
+	 * which is a value of any type other than a resource.
61
+	 * @since 5.4.0
62
+	 */
63
+	public function jsonSerialize()
64
+	{
65
+		return [
66
+			'name' => $this->name,
67
+			'description' => $this->description,
68
+			'instanceName' => MoufManager::getMoufManager()->findInstanceName($this)
69
+		];
70
+	}
71 71
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-declare(strict_types=1);
2
+declare(strict_types = 1);
3 3
 
4 4
 namespace Mouf\Utils\Patcher;
5 5
 
Please login to merge, or discard this patch.
src/Mouf/Utils/Patcher/Commands/ListPatchesCommand.php 2 patches
Indentation   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -15,66 +15,66 @@
 block discarded – undo
15 15
  */
16 16
 class ListPatchesCommand extends Command
17 17
 {
18
-    /**
19
-     * @var PatchService
20
-     */
21
-    private $patchService;
18
+	/**
19
+	 * @var PatchService
20
+	 */
21
+	private $patchService;
22 22
 
23
-    public function __construct(PatchService $patchService)
24
-    {
25
-        parent::__construct();
26
-        $this->patchService = $patchService;
27
-    }
23
+	public function __construct(PatchService $patchService)
24
+	{
25
+		parent::__construct();
26
+		$this->patchService = $patchService;
27
+	}
28 28
 
29 29
 
30
-    /**
31
-     * {@inheritdoc}
32
-     */
33
-    protected function configure()
34
-    {
35
-        $this
36
-        ->setName('patches:list')
37
-        ->setDescription('List all the patches.')
38
-        ->setDefinition(array(
30
+	/**
31
+	 * {@inheritdoc}
32
+	 */
33
+	protected function configure()
34
+	{
35
+		$this
36
+		->setName('patches:list')
37
+		->setDescription('List all the patches.')
38
+		->setDefinition(array(
39 39
 
40
-        ))
41
-        ->setHelp(<<<EOT
40
+		))
41
+		->setHelp(<<<EOT
42 42
 List all patches declared in Mouf patch service.
43 43
 
44 44
 The command will display the status of each patch, i.e. whether it has been applied or skipped or is waiting to be applied.
45 45
 EOT
46
-        );
47
-    }
46
+		);
47
+	}
48 48
 
49
-    /**
50
-     * {@inheritdoc}
51
-     */
52
-    protected function execute(InputInterface $input, OutputInterface $output)
53
-    {
54
-        $patches = $this->patchService->getView();
49
+	/**
50
+	 * {@inheritdoc}
51
+	 */
52
+	protected function execute(InputInterface $input, OutputInterface $output)
53
+	{
54
+		$patches = $this->patchService->getView();
55 55
 
56
-        $rows = array_map(function($row) {
57
-            return [ $row['uniqueName'], $this->renderStatus($row['status']), $row['patch_type'] ?: '(default)' ];
58
-        }, $patches);
56
+		$rows = array_map(function($row) {
57
+			return [ $row['uniqueName'], $this->renderStatus($row['status']), $row['patch_type'] ?: '(default)' ];
58
+		}, $patches);
59 59
 
60
-        $table = new Table($output);
61
-        $table
62
-            ->setHeaders(array('Patch', 'Status', 'Type'))
63
-            ->setRows($rows)
64
-        ;
65
-        $table->render();
66
-    }
60
+		$table = new Table($output);
61
+		$table
62
+			->setHeaders(array('Patch', 'Status', 'Type'))
63
+			->setRows($rows)
64
+		;
65
+		$table->render();
66
+	}
67 67
 
68
-    private function renderStatus($status) {
69
-        $map = [
70
-            PatchInterface::STATUS_APPLIED => "<info>Applied</info>",
71
-            PatchInterface::STATUS_SKIPPED => "<comment>Skipped</comment>",
72
-            PatchInterface::STATUS_AWAITING => "Awaiting",
73
-            PatchInterface::STATUS_ERROR => "<error>Skipped</error>",
74
-        ];
75
-        if (!isset($map[$status])) {
76
-            throw new \Exception('Unexpected status "'.$map[$status].'"');
77
-        }
78
-        return $map[$status];
79
-    }
68
+	private function renderStatus($status) {
69
+		$map = [
70
+			PatchInterface::STATUS_APPLIED => "<info>Applied</info>",
71
+			PatchInterface::STATUS_SKIPPED => "<comment>Skipped</comment>",
72
+			PatchInterface::STATUS_AWAITING => "Awaiting",
73
+			PatchInterface::STATUS_ERROR => "<error>Skipped</error>",
74
+		];
75
+		if (!isset($map[$status])) {
76
+			throw new \Exception('Unexpected status "'.$map[$status].'"');
77
+		}
78
+		return $map[$status];
79
+	}
80 80
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
         $patches = $this->patchService->getView();
55 55
 
56 56
         $rows = array_map(function($row) {
57
-            return [ $row['uniqueName'], $this->renderStatus($row['status']), $row['patch_type'] ?: '(default)' ];
57
+            return [$row['uniqueName'], $this->renderStatus($row['status']), $row['patch_type'] ?: '(default)'];
58 58
         }, $patches);
59 59
 
60 60
         $table = new Table($output);
Please login to merge, or discard this patch.
src/Mouf/Utils/Patcher/PatchInterface.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -39,20 +39,20 @@  discard block
 block discarded – undo
39 39
 	/**
40 40
 	 * Skips the patch (sets its status to "skipped").
41 41
 	 */
42
-    public function skip(): void;
42
+	public function skip(): void;
43 43
 
44 44
 	/**
45 45
 	 * Reverts (cancels) the patch.
46 46
 	 * Note: patchs do not have to provide a "revert" feature (see canRevert method).
47 47
 	 */
48
-    public function revert(): void;
48
+	public function revert(): void;
49 49
 	
50 50
 	/**
51 51
 	 * Returns true if this patch can be canceled, false otherwise.
52 52
 	 * 
53 53
 	 * @return boolean
54 54
 	 */
55
-    public function canRevert(): bool;
55
+	public function canRevert(): bool;
56 56
 	
57 57
 	/**
58 58
 	 * Returns the status of this patch.
@@ -65,28 +65,28 @@  discard block
 block discarded – undo
65 65
 	 * 
66 66
 	 * @return string
67 67
 	 */
68
-    public function getStatus(): string;
68
+	public function getStatus(): string;
69 69
 	
70 70
 	/**
71 71
 	 * Returns a unique name for this patch. 
72 72
 	 *
73 73
 	 * @return string
74 74
 	 */
75
-    public function getUniqueName(): string;
75
+	public function getUniqueName(): string;
76 76
 	
77 77
 	/**
78 78
 	 * Returns a short description of the patch.
79 79
 	 * 
80 80
 	 * @return string
81 81
 	 */
82
-    public function getDescription(): string;
82
+	public function getDescription(): string;
83 83
 	
84 84
 	/**
85 85
 	 * Returns the error message of the last action performed, or null if last action was successful.
86 86
 	 * 
87 87
 	 * @return string
88 88
 	 */
89
-    public function getLastErrorMessage(): ?string;
89
+	public function getLastErrorMessage(): ?string;
90 90
 	
91 91
 	/**
92 92
 	 * Returns the URL that can be used to edit this patch.
@@ -94,12 +94,12 @@  discard block
 block discarded – undo
94 94
 	 * 
95 95
 	 * @return string
96 96
 	 */
97
-    public function getEditUrl(): ?string;
97
+	public function getEditUrl(): ?string;
98 98
 
99
-    /**
100
-     * Returns the type of the patch.
101
-     *
102
-     * @return PatchType
103
-     */
104
-    public function getPatchType() : PatchType;
99
+	/**
100
+	 * Returns the type of the patch.
101
+	 *
102
+	 * @return PatchType
103
+	 */
104
+	public function getPatchType() : PatchType;
105 105
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 * 
87 87
 	 * @return string
88 88
 	 */
89
-    public function getLastErrorMessage(): ?string;
89
+    public function getLastErrorMessage(): ? string;
90 90
 	
91 91
 	/**
92 92
 	 * Returns the URL that can be used to edit this patch.
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 	 * 
95 95
 	 * @return string
96 96
 	 */
97
-    public function getEditUrl(): ?string;
97
+    public function getEditUrl(): ? string;
98 98
 
99 99
     /**
100 100
      * Returns the type of the patch.
Please login to merge, or discard this patch.