thecodingmachine / utils.patcher

src/views/applyPatches.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     <input name="selfedit" type="hidden" value="<?php echo plainstring_to_htmlprotected($this->selfedit); ?>"></input>
     <input name="action" type="hidden" value="<?php echo plainstring_to_htmlprotected($this->action); ?>"></input>
 <?php foreach ($this->nbPatchesByType as $name => $number): ?>
-    <label class="checkbox"><input type="checkbox" name="types[]" value="<?= plainstring_to_htmlprotected($name) ?>" <?php if ($name == '') { echo "checked readonly"; } ?> /> <?= plainstring_to_htmlprotected($name?:'default') ?> (<?= $number ?> patch<?= $number > 1 ? 'es':'' ?>)</label>
+    <label class="checkbox"><input type="checkbox" name="types[]" value="<?= plainstring_to_htmlprotected($name) ?>" <?php if ($name == '') { echo "checked readonly"; } ?> /> <?= plainstring_to_htmlprotected($name ?: 'default') ?> (<?= $number ?> patch<?= $number > 1 ? 'es' : '' ?>)</label>
 <?php endforeach; ?>
 
     <?php if ($this->action === 'reset'): ?>

Braces +10 added lines, -4 removed lines

@@ -3,9 +3,12 @@ 
 <?php if ($this->action === 'reset'): ?>
     <h1>Reset database</h1>
     <div class="alert alert-danger"><strong>Warning!</strong> You are about to reset your complete database!</div>
-<?php else: ?>
+<?php else {
+	: ?>
     <h1>Apply patches</h1>
-<?php endif; ?>
+<?php endif;
+}
+?>
 
 Please select the patch types you want to apply:
 
@@ -19,7 +22,10 @@ 
 
     <?php if ($this->action === 'reset'): ?>
         <button class="btn btn-large btn-danger"><i class="icon-remove icon-white"></i> Yes, I want to reset the database</button>
-    <?php else: ?>
+    <?php else {
+	: ?>
         <button class="btn btn-large btn-success"><i class="icon-arrow-right icon-white"></i> Apply selected patches</button>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
 </form>
\ No newline at end of file

src/Mouf/Utils/Patcher/Controllers/PatchController.php

Unused Use Statements -9 removed lines

@@ -2,16 +2,7 @@
 namespace Mouf\Utils\Patcher\Controllers;
 
 use Mouf\Controllers\AbstractMoufInstanceController;
-
-use Mouf\Database\TDBM\Utils\TDBMDaoGenerator;
-
 use Mouf\Html\Widgets\MessageService\Service\UserMessageInterface;
-use Mouf\MoufManager;
-
-use Mouf\Mvc\Splash\Controllers\Controller;
-
-use Mouf\Reflection\MoufReflectionProxy;
-
 use Mouf\Html\HtmlElement\HtmlBlock;
 use Mouf\InstanceProxy;
 use Mouf\Utils\Patcher\PatchException;

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 	 * @Action
 	 * @Logged
 	 */
-	public function defaultAction($name, $selfedit="false") {
+	public function defaultAction($name, $selfedit = "false") {
 		$this->initController($name, $selfedit);
 		
 		$patchService = new InstanceProxy($name, $selfedit == "true");
@@ -194,7 +194,7 @@ 
                 $patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
             }
 
-            $msg .= sprintf('%d patch%s applied (%s)', $nbPatchesApplied, ($nbPatchesApplied > 1)?'es':'', implode(', ', $patchArr));
+            $msg .= sprintf('%d patch%s applied (%s)', $nbPatchesApplied, ($nbPatchesApplied > 1) ? 'es' : '', implode(', ', $patchArr));
         }
         if ($nbPatchesSkipped !== 0) {
             $patchArr = [];
@@ -203,7 +203,7 @@ 
                 $patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
             }
 
-            $msg .= sprintf('%d patch%s skipped (%s)', $nbPatchesSkipped, ($nbPatchesSkipped > 1)?'es':'', implode(', ', $patchArr));
+            $msg .= sprintf('%d patch%s skipped (%s)', $nbPatchesSkipped, ($nbPatchesSkipped > 1) ? 'es' : '', implode(', ', $patchArr));
         }
 
         if ($msg !== '') {

Indentation +97 added lines, -98 removed lines

@@ -20,7 +20,6 @@ 
 
 /**
  * The controller to track which patchs have been applied.
-
  */
 class PatchController extends AbstractMoufInstanceController {
 	
@@ -99,115 +98,115 @@ 
 		header('Location: .?name='.urlencode($name));
 	}
 
-    /**
-     * Displays the page to select the patch types to be applied.
-     *
-     * @Action
-     * @Logged
-     * @param string $name
-     * @param string $selfedit
-     * @param string $action One of "reset" or "apply"
-     */
-    public function runAllPatches($name, $selfedit, $action) {
-        $this->initController($name, $selfedit);
-
-        $patchService = new InstanceProxy($name, $selfedit == "true");
-        $this->patchesArray = $patchService->getView();
-
-        $types = $patchService->_getSerializedTypes();
-
-        foreach ($types as $type) {
-            $this->nbPatchesByType[$type['name']] = 0;
-        }
-
-        $nbNoneDefaultPatches = 0;
-
-        foreach ($this->patchesArray as $patch) {
-            if ($action === 'reset' || $patch['status'] === PatchInterface::STATUS_AWAITING || $patch['status'] === PatchInterface::STATUS_ERROR) {
-                $type = $patch['patch_type'];
-                if ($type !== '') {
-                    $nbNoneDefaultPatches++;
-                }
-                $this->nbPatchesByType[$type]++;
-            }
-        }
-
-        // If all patches to be applied are default patches, let's do this right now.
-        if ($nbNoneDefaultPatches === 0) {
-            $this->applyAllPatches($name, [''], $action, $selfedit);
-            return;
-        }
-
-        ksort($this->nbPatchesByType);
-
-        $this->action = $action;
-
-        // Otherwise, let's display a screen to select the patch types to be applied.
-        $this->content->addFile(__DIR__."/../../../../views/applyPatches.php", $this);
-        $this->template->toHtml();
-    }
-
-
-    /**
-     * Runs all patches in a row.
-     *
-     * @Action
-     * @Logged
-     * @param string $name
-     * @param string[] $types
-     * @param string $action One of "reset" or "apply"
-     * @param string $selfedit
-     */
+	/**
+	 * Displays the page to select the patch types to be applied.
+	 *
+	 * @Action
+	 * @Logged
+	 * @param string $name
+	 * @param string $selfedit
+	 * @param string $action One of "reset" or "apply"
+	 */
+	public function runAllPatches($name, $selfedit, $action) {
+		$this->initController($name, $selfedit);
+
+		$patchService = new InstanceProxy($name, $selfedit == "true");
+		$this->patchesArray = $patchService->getView();
+
+		$types = $patchService->_getSerializedTypes();
+
+		foreach ($types as $type) {
+			$this->nbPatchesByType[$type['name']] = 0;
+		}
+
+		$nbNoneDefaultPatches = 0;
+
+		foreach ($this->patchesArray as $patch) {
+			if ($action === 'reset' || $patch['status'] === PatchInterface::STATUS_AWAITING || $patch['status'] === PatchInterface::STATUS_ERROR) {
+				$type = $patch['patch_type'];
+				if ($type !== '') {
+					$nbNoneDefaultPatches++;
+				}
+				$this->nbPatchesByType[$type]++;
+			}
+		}
+
+		// If all patches to be applied are default patches, let's do this right now.
+		if ($nbNoneDefaultPatches === 0) {
+			$this->applyAllPatches($name, [''], $action, $selfedit);
+			return;
+		}
+
+		ksort($this->nbPatchesByType);
+
+		$this->action = $action;
+
+		// Otherwise, let's display a screen to select the patch types to be applied.
+		$this->content->addFile(__DIR__."/../../../../views/applyPatches.php", $this);
+		$this->template->toHtml();
+	}
+
+
+	/**
+	 * Runs all patches in a row.
+	 *
+	 * @Action
+	 * @Logged
+	 * @param string $name
+	 * @param string[] $types
+	 * @param string $action One of "reset" or "apply"
+	 * @param string $selfedit
+	 */
 	public function applyAllPatches($name, array $types, $action, $selfedit) {
 		$patchService = new InstanceProxy($name, $selfedit == "true");
 		/* @var $patchService PatchService */
 
-        if ($action === 'reset') {
-            $patchService->reset();
-        }
-        try {
+		if ($action === 'reset') {
+			$patchService->reset();
+		}
+		try {
 
-            [
-                'applied' => $appliedPatchArray,
-                'skipped' => $skippedPatchArray
-            ] = $patchService->applyAll($types);
+			[
+				'applied' => $appliedPatchArray,
+				'skipped' => $skippedPatchArray
+			] = $patchService->applyAll($types);
 
-            $this->displayNotificationMessage($appliedPatchArray, $skippedPatchArray);
-        } catch (\Exception $e) {
+			$this->displayNotificationMessage($appliedPatchArray, $skippedPatchArray);
+		} catch (\Exception $e) {
 			$htmlMessage = "An error occured while applying the patch: ".$e->getMessage();
 			set_user_message($htmlMessage);
 		}
 
 
-        header('Location: .?name='.urlencode($name));
+		header('Location: .?name='.urlencode($name));
 	}
 
 	private function displayNotificationMessage(array $appliedPatchArray, array $skippedPatchArray)
-    {
-        $nbPatchesApplied = array_sum($appliedPatchArray);
-        $nbPatchesSkipped = array_sum($skippedPatchArray);
-        $msg = '';
-        if ($nbPatchesApplied !== 0) {
-            $patchArr = [];
-            foreach ($appliedPatchArray as $name => $number) {
-                $name = $name ?: 'default';
-                $patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
-            }
-
-            $msg .= sprintf('%d patch%s applied (%s)', $nbPatchesApplied, ($nbPatchesApplied > 1)?'es':'', implode(', ', $patchArr));
-        }
-        if ($nbPatchesSkipped !== 0) {
-            $patchArr = [];
-            foreach ($skippedPatchArray as $name => $number) {
-                $name = $name ?: 'default';
-                $patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
-            }
-
-            $msg .= sprintf('%d patch%s skipped (%s)', $nbPatchesSkipped, ($nbPatchesSkipped > 1)?'es':'', implode(', ', $patchArr));
-        }
-
-        if ($msg !== '') {
-            set_user_message($msg, UserMessageInterface::SUCCESS);
-        }
-    }
+	{
+		$nbPatchesApplied = array_sum($appliedPatchArray);
+		$nbPatchesSkipped = array_sum($skippedPatchArray);
+		$msg = '';
+		if ($nbPatchesApplied !== 0) {
+			$patchArr = [];
+			foreach ($appliedPatchArray as $name => $number) {
+				$name = $name ?: 'default';
+				$patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
+			}
+
+			$msg .= sprintf('%d patch%s applied (%s)', $nbPatchesApplied, ($nbPatchesApplied > 1)?'es':'', implode(', ', $patchArr));
+		}
+		if ($nbPatchesSkipped !== 0) {
+			$patchArr = [];
+			foreach ($skippedPatchArray as $name => $number) {
+				$name = $name ?: 'default';
+				$patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
+			}
+
+			$msg .= sprintf('%d patch%s skipped (%s)', $nbPatchesSkipped, ($nbPatchesSkipped > 1)?'es':'', implode(', ', $patchArr));
+		}
+
+		if ($msg !== '') {
+			set_user_message($msg, UserMessageInterface::SUCCESS);
+		}
+	}
 }
\ No newline at end of file

src/Mouf/Utils/Patcher/Commands/ApplyAllPatchesCommand.php

Indentation +24 added lines, -24 removed lines

@@ -17,32 +17,32 @@
 {
 
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this
-        ->setName('patches:apply-all')
-        ->setDescription('Apply pending patches.')
-        ->setDefinition(array(
-
-        ))
-        ->setHelp(<<<EOT
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$this
+		->setName('patches:apply-all')
+		->setDescription('Apply pending patches.')
+		->setDefinition(array(
+
+		))
+		->setHelp(<<<EOT
 Apply pending patches. You can select the type of patches to be applied using the options. Default patches are always applied.
 
 Use patches:apply if you want to cherry-pick a particular patch.
 EOT
-        );
-
-        $this->registerOptions();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $this->applyAll($input, $output);
-    }
+		);
+
+		$this->registerOptions();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		$this->applyAll($input, $output);
+	}
 }

src/Mouf/Utils/Patcher/Commands/AbstractApplyAllCommand.php

Indentation +77 added lines, -77 removed lines

@@ -12,81 +12,81 @@
 
 class AbstractApplyAllCommand extends Command
 {
-    /**
-     * @var PatchService
-     */
-    protected $patchService;
-
-    public function __construct(PatchService $patchService)
-    {
-        $this->patchService = $patchService;
-        parent::__construct();
-    }
-
-    protected function registerOptions(): void
-    {
-        foreach ($this->patchService->getTypes() as $type) {
-            if ($type->getName() !== '') {
-                $this->addOption($type->getName(), null, InputOption::VALUE_NONE, 'Applies patches of type "'.$type->getName().'". '.$type->getDescription());
-            }
-        }
-    }
-
-    protected function applyAll(InputInterface $input, OutputInterface $output)
-    {
-        $types = [];
-        foreach ($this->patchService->getTypes() as $type) {
-            if ($type->getName() !== '' && $input->getOption($type->getName())) {
-                $types[] = $type->getName();
-            }
-        }
-
-        try {
-
-            [
-                'applied' => $appliedPatchArray,
-                'skipped' => $skippedPatchArray
-            ] = $this->patchService->applyAll($types);
-
-        } catch (\Exception $e) {
-            $output->writeln(sprintf(
-                'An error occurred while applying patch: <error>%s</error>', $e->getMessage()
-            ));
-            throw $e;
-        }
-
-        $msg = $this->getNotificationMessage($appliedPatchArray, $skippedPatchArray);
-        if ($msg) {
-            $output->writeln($msg);
-        } else {
-            $output->writeln('<info>No patches to apply</info>');
-        }
-    }
-
-    private function getNotificationMessage(array $appliedPatchArray, array $skippedPatchArray): string
-    {
-        $nbPatchesApplied = array_sum($appliedPatchArray);
-        $nbPatchesSkipped = array_sum($skippedPatchArray);
-        $msg = '';
-        if ($nbPatchesApplied !== 0) {
-            $patchArr = [];
-            foreach ($appliedPatchArray as $name => $number) {
-                $name = $name ?: 'default';
-                $patchArr[] = $name.': <info>'.$number.'</info>';
-            }
-
-            $msg .= sprintf('<info>%d</info> patch%s applied (%s)', $nbPatchesApplied, ($nbPatchesApplied > 1)?'es':'', implode(', ', $patchArr))."\n";
-        }
-        if ($nbPatchesSkipped !== 0) {
-            $patchArr = [];
-            foreach ($skippedPatchArray as $name => $number) {
-                $name = $name ?: 'default';
-                $patchArr[] = $name.': <info>'.$number.'</info>';
-            }
-
-            $msg .= sprintf('<info>%d</info><comment> patch%s skipped</comment> (%s)', $nbPatchesSkipped, ($nbPatchesSkipped > 1)?'es':'', implode(', ', $patchArr));
-        }
-
-        return $msg;
-    }
+	/**
+	 * @var PatchService
+	 */
+	protected $patchService;
+
+	public function __construct(PatchService $patchService)
+	{
+		$this->patchService = $patchService;
+		parent::__construct();
+	}
+
+	protected function registerOptions(): void
+	{
+		foreach ($this->patchService->getTypes() as $type) {
+			if ($type->getName() !== '') {
+				$this->addOption($type->getName(), null, InputOption::VALUE_NONE, 'Applies patches of type "'.$type->getName().'". '.$type->getDescription());
+			}
+		}
+	}
+
+	protected function applyAll(InputInterface $input, OutputInterface $output)
+	{
+		$types = [];
+		foreach ($this->patchService->getTypes() as $type) {
+			if ($type->getName() !== '' && $input->getOption($type->getName())) {
+				$types[] = $type->getName();
+			}
+		}
+
+		try {
+
+			[
+				'applied' => $appliedPatchArray,
+				'skipped' => $skippedPatchArray
+			] = $this->patchService->applyAll($types);
+
+		} catch (\Exception $e) {
+			$output->writeln(sprintf(
+				'An error occurred while applying patch: <error>%s</error>', $e->getMessage()
+			));
+			throw $e;
+		}
+
+		$msg = $this->getNotificationMessage($appliedPatchArray, $skippedPatchArray);
+		if ($msg) {
+			$output->writeln($msg);
+		} else {
+			$output->writeln('<info>No patches to apply</info>');
+		}
+	}
+
+	private function getNotificationMessage(array $appliedPatchArray, array $skippedPatchArray): string
+	{
+		$nbPatchesApplied = array_sum($appliedPatchArray);
+		$nbPatchesSkipped = array_sum($skippedPatchArray);
+		$msg = '';
+		if ($nbPatchesApplied !== 0) {
+			$patchArr = [];
+			foreach ($appliedPatchArray as $name => $number) {
+				$name = $name ?: 'default';
+				$patchArr[] = $name.': <info>'.$number.'</info>';
+			}
+
+			$msg .= sprintf('<info>%d</info> patch%s applied (%s)', $nbPatchesApplied, ($nbPatchesApplied > 1)?'es':'', implode(', ', $patchArr))."\n";
+		}
+		if ($nbPatchesSkipped !== 0) {
+			$patchArr = [];
+			foreach ($skippedPatchArray as $name => $number) {
+				$name = $name ?: 'default';
+				$patchArr[] = $name.': <info>'.$number.'</info>';
+			}
+
+			$msg .= sprintf('<info>%d</info><comment> patch%s skipped</comment> (%s)', $nbPatchesSkipped, ($nbPatchesSkipped > 1)?'es':'', implode(', ', $patchArr));
+		}
+
+		return $msg;
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
                 $patchArr[] = $name.': <info>'.$number.'</info>';
             }
 
-            $msg .= sprintf('<info>%d</info> patch%s applied (%s)', $nbPatchesApplied, ($nbPatchesApplied > 1)?'es':'', implode(', ', $patchArr))."\n";
+            $msg .= sprintf('<info>%d</info> patch%s applied (%s)', $nbPatchesApplied, ($nbPatchesApplied > 1) ? 'es' : '', implode(', ', $patchArr))."\n";
         }
         if ($nbPatchesSkipped !== 0) {
             $patchArr = [];
@@ -84,7 +84,7 @@ 
                 $patchArr[] = $name.': <info>'.$number.'</info>';
             }
 
-            $msg .= sprintf('<info>%d</info><comment> patch%s skipped</comment> (%s)', $nbPatchesSkipped, ($nbPatchesSkipped > 1)?'es':'', implode(', ', $patchArr));
+            $msg .= sprintf('<info>%d</info><comment> patch%s skipped</comment> (%s)', $nbPatchesSkipped, ($nbPatchesSkipped > 1) ? 'es' : '', implode(', ', $patchArr));
         }
 
         return $msg;

src/Mouf/Utils/Patcher/Commands/ResetPatchesCommand.php

Indentation +22 added lines, -22 removed lines

@@ -15,34 +15,34 @@
  */
 class ResetPatchesCommand extends AbstractApplyAllCommand
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this
-        ->setName('patches:reset')
-        ->setDescription('Reset database and reapply all patches.')
-        ->setDefinition(array(
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$this
+		->setName('patches:reset')
+		->setDescription('Reset database and reapply all patches.')
+		->setDefinition(array(
 
-        ))
-        ->setHelp(<<<EOT
+		))
+		->setHelp(<<<EOT
 Reset the database and reapplies all pending patches. You can select the type of patches to be applied using the options. Default patches are always applied.
 
 Use patches:apply-all if you want to apply remaining patches without resetting the database.
 EOT
-        );
+		);
 
-        $this->registerOptions();
-    }
+		$this->registerOptions();
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $this->patchService->reset();
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		$this->patchService->reset();
 
-        $this->applyAll($input, $output);
-    }
+		$this->applyAll($input, $output);
+	}
 }