thecodingmachine / utils.patcher

src/Mouf/Utils/Patcher/PatchInstaller.php

Indentation +37 added lines, -37 removed lines

@@ -18,41 +18,41 @@
 
 class PatchInstaller implements PackageInstallerInterface
 {
-    /**
-     * (non-PHPdoc)
-     * @see \Mouf\Installer\PackageInstallerInterface::install()
-     * @param  MoufManager         $moufManager
-     * @throws \Mouf\MoufException
-     */
-    public static function install(MoufManager $moufManager)
-    {
-        // Let's create the instance.
-        $patchService = InstallUtils::getOrCreateInstance('patchService', 'Mouf\\Utils\\Patcher\\PatchService', $moufManager);
-
-        $consoleUtils = new ConsoleUtils($moufManager);
-
-        $listPatchesCommand = $moufManager->createInstance(ListPatchesCommand::class);
-        $listPatchesCommand->getConstructorArgumentProperty("patchService")->setValue($patchService);
-        $consoleUtils->registerCommand($listPatchesCommand);
-
-        $applyAllPatchesCommand = $moufManager->createInstance(ApplyAllPatchesCommand::class);
-        $applyAllPatchesCommand->getConstructorArgumentProperty("patchService")->setValue($patchService);
-        $consoleUtils->registerCommand($applyAllPatchesCommand);
-
-        $applyPatchCommand = $moufManager->createInstance(ApplyPatchCommand::class);
-        $applyPatchCommand->getConstructorArgumentProperty("patchService")->setValue($patchService);
-        $consoleUtils->registerCommand($applyPatchCommand);
-
-        $skipPatchCommand = $moufManager->createInstance(SkipPatchCommand::class);
-        $skipPatchCommand->getConstructorArgumentProperty("patchService")->setValue($patchService);
-        $consoleUtils->registerCommand($skipPatchCommand);
-
-        $revertPatchCommand = $moufManager->createInstance(RevertPatchCommand::class);
-        $revertPatchCommand->getConstructorArgumentProperty("patchService")->setValue($patchService);
-        $consoleUtils->registerCommand($revertPatchCommand);
-
-
-        // Let's rewrite the MoufComponents.php file to save the component
-        $moufManager->rewriteMouf();
-    }
+	/**
+	 * (non-PHPdoc)
+	 * @see \Mouf\Installer\PackageInstallerInterface::install()
+	 * @param  MoufManager         $moufManager
+	 * @throws \Mouf\MoufException
+	 */
+	public static function install(MoufManager $moufManager)
+	{
+		// Let's create the instance.
+		$patchService = InstallUtils::getOrCreateInstance('patchService', 'Mouf\\Utils\\Patcher\\PatchService', $moufManager);
+
+		$consoleUtils = new ConsoleUtils($moufManager);
+
+		$listPatchesCommand = $moufManager->createInstance(ListPatchesCommand::class);
+		$listPatchesCommand->getConstructorArgumentProperty("patchService")->setValue($patchService);
+		$consoleUtils->registerCommand($listPatchesCommand);
+
+		$applyAllPatchesCommand = $moufManager->createInstance(ApplyAllPatchesCommand::class);
+		$applyAllPatchesCommand->getConstructorArgumentProperty("patchService")->setValue($patchService);
+		$consoleUtils->registerCommand($applyAllPatchesCommand);
+
+		$applyPatchCommand = $moufManager->createInstance(ApplyPatchCommand::class);
+		$applyPatchCommand->getConstructorArgumentProperty("patchService")->setValue($patchService);
+		$consoleUtils->registerCommand($applyPatchCommand);
+
+		$skipPatchCommand = $moufManager->createInstance(SkipPatchCommand::class);
+		$skipPatchCommand->getConstructorArgumentProperty("patchService")->setValue($patchService);
+		$consoleUtils->registerCommand($skipPatchCommand);
+
+		$revertPatchCommand = $moufManager->createInstance(RevertPatchCommand::class);
+		$revertPatchCommand->getConstructorArgumentProperty("patchService")->setValue($patchService);
+		$consoleUtils->registerCommand($revertPatchCommand);
+
+
+		// Let's rewrite the MoufComponents.php file to save the component
+		$moufManager->rewriteMouf();
+	}
 }

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

Indentation +34 added lines, -34 removed lines

@@ -15,45 +15,45 @@
  */
 class SkipPatchCommand extends Command
 {
-    /**
-     * @var PatchService
-     */
-    private $patchService;
+	/**
+	 * @var PatchService
+	 */
+	private $patchService;
 
-    public function __construct(PatchService $patchService)
-    {
-        parent::__construct();
-        $this->patchService = $patchService;
-    }
+	public function __construct(PatchService $patchService)
+	{
+		parent::__construct();
+		$this->patchService = $patchService;
+	}
 
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this
-        ->setName('patches:skip')
-        ->setDescription('Skip a patch.')
-        ->addArgument(
-            'name',
-            InputArgument::REQUIRED,
-            'The name of the patch instance to be skipped'
-        )
-        ->setHelp(<<<EOT
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$this
+		->setName('patches:skip')
+		->setDescription('Skip a patch.')
+		->addArgument(
+			'name',
+			InputArgument::REQUIRED,
+			'The name of the patch instance to be skipped'
+		)
+		->setHelp(<<<EOT
 Skips a patch. You must pass in parameter the name of the patch.
 EOT
-        );
-    }
+		);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $patchName = $input->getArgument('name');
-        $this->patchService->skip($patchName);
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		$patchName = $input->getArgument('name');
+		$this->patchService->skip($patchName);
 
-        $output->writeln('Patch marked as skipped');
-    }
+		$output->writeln('Patch marked as skipped');
+	}
 }

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

Indentation +39 added lines, -39 removed lines

@@ -15,47 +15,47 @@
  */
 class ApplyPatchCommand extends Command
 {
-    /**
-     * @var PatchService
-     */
-    private $patchService;
-
-    public function __construct(PatchService $patchService)
-    {
-        parent::__construct();
-        $this->patchService = $patchService;
-    }
-
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this
-        ->setName('patches:apply')
-        ->setDescription('Apply a patch.')
-        ->addArgument(
-            'name',
-            InputArgument::REQUIRED,
-            'The name of the patch instance to be applied'
-        )
-        ->setHelp(<<<EOT
+	/**
+	 * @var PatchService
+	 */
+	private $patchService;
+
+	public function __construct(PatchService $patchService)
+	{
+		parent::__construct();
+		$this->patchService = $patchService;
+	}
+
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$this
+		->setName('patches:apply')
+		->setDescription('Apply a patch.')
+		->addArgument(
+			'name',
+			InputArgument::REQUIRED,
+			'The name of the patch instance to be applied'
+		)
+		->setHelp(<<<EOT
 Apply a patch. You must pass in parameter the name of the patch.
 
 Use patches:apply-all to apply all pending patches.
 EOT
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $patchName = $input->getArgument('name');
-        $this->patchService->apply($patchName);
-
-        $output->writeln('Patch successfully applied');
-    }
+		);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		$patchName = $input->getArgument('name');
+		$this->patchService->apply($patchName);
+
+		$output->writeln('Patch successfully applied');
+	}
 }

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

Indentation +50 added lines, -50 removed lines

@@ -15,65 +15,65 @@
  */
 class ApplyAllPatchesCommand extends Command
 {
-    /**
-     * @var PatchService
-     */
-    private $patchService;
+	/**
+	 * @var PatchService
+	 */
+	private $patchService;
 
-    public function __construct(PatchService $patchService)
-    {
-        parent::__construct();
-        $this->patchService = $patchService;
-    }
+	public function __construct(PatchService $patchService)
+	{
+		parent::__construct();
+		$this->patchService = $patchService;
+	}
 
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this
-        ->setName('patches:apply-all')
-        ->setDescription('Apply all pending patches.')
-        ->setDefinition(array(
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$this
+		->setName('patches:apply-all')
+		->setDescription('Apply all pending patches.')
+		->setDefinition(array(
 
-        ))
-        ->setHelp(<<<EOT
+		))
+		->setHelp(<<<EOT
 Apply all pending patches.
 
 Use patches:apply if you want to cherry-pick a particular patch.
 EOT
-        );
-    }
+		);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $patchesArray = $this->patchService->getView();
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		$patchesArray = $this->patchService->getView();
 
-        $count = 0;
-        try {
-            foreach ($patchesArray as $patch) {
-                if ($patch['status'] == PatchInterface::STATUS_AWAITING || $patch['status'] == PatchInterface::STATUS_ERROR) {
-                    $this->patchService->apply($patch['uniqueName']);
-                    $count++;
-                }
-            }
-        } catch (\Exception $e) {
-            $output->writeln(sprintf(
-                    'An error occured while applying patch <info>%s</info>: <error>%s</error>', $patch['uniqueName'], $e->getMessage()
-                ));
-            throw $e;
-        }
+		$count = 0;
+		try {
+			foreach ($patchesArray as $patch) {
+				if ($patch['status'] == PatchInterface::STATUS_AWAITING || $patch['status'] == PatchInterface::STATUS_ERROR) {
+					$this->patchService->apply($patch['uniqueName']);
+					$count++;
+				}
+			}
+		} catch (\Exception $e) {
+			$output->writeln(sprintf(
+					'An error occured while applying patch <info>%s</info>: <error>%s</error>', $patch['uniqueName'], $e->getMessage()
+				));
+			throw $e;
+		}
 
-        if ($count) {
-            $output->writeln(sprintf(
-                    '<info>%d</info> patches successfully applied', $count
-                ));
-        } else {
-            $output->writeln('<info>No patches to apply</info>');
-        }
-    }
+		if ($count) {
+			$output->writeln(sprintf(
+					'<info>%d</info> patches successfully applied', $count
+				));
+		} else {
+			$output->writeln('<info>No patches to apply</info>');
+		}
+	}
 }

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

Indentation +34 added lines, -34 removed lines

@@ -15,45 +15,45 @@
  */
 class RevertPatchCommand extends Command
 {
-    /**
-     * @var PatchService
-     */
-    private $patchService;
+	/**
+	 * @var PatchService
+	 */
+	private $patchService;
 
-    public function __construct(PatchService $patchService)
-    {
-        parent::__construct();
-        $this->patchService = $patchService;
-    }
+	public function __construct(PatchService $patchService)
+	{
+		parent::__construct();
+		$this->patchService = $patchService;
+	}
 
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this
-        ->setName('patches:revert')
-        ->setDescription('Revert a patch.')
-        ->addArgument(
-            'name',
-            InputArgument::REQUIRED,
-            'The name of the patch instance to be reverted'
-        )
-        ->setHelp(<<<EOT
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$this
+		->setName('patches:revert')
+		->setDescription('Revert a patch.')
+		->addArgument(
+			'name',
+			InputArgument::REQUIRED,
+			'The name of the patch instance to be reverted'
+		)
+		->setHelp(<<<EOT
 Reverts a patch. You must pass in parameter the name of the patch.
 EOT
-        );
-    }
+		);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $patchName = $input->getArgument('name');
-        $this->patchService->revert($patchName);
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		$patchName = $input->getArgument('name');
+		$this->patchService->revert($patchName);
 
-        $output->writeln('Patch successfully reverted');
-    }
+		$output->writeln('Patch successfully reverted');
+	}
 }

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

Indentation +50 added lines, -50 removed lines

@@ -15,66 +15,66 @@
  */
 class ListPatchesCommand extends Command
 {
-    /**
-     * @var PatchService
-     */
-    private $patchService;
+	/**
+	 * @var PatchService
+	 */
+	private $patchService;
 
-    public function __construct(PatchService $patchService)
-    {
-        parent::__construct();
-        $this->patchService = $patchService;
-    }
+	public function __construct(PatchService $patchService)
+	{
+		parent::__construct();
+		$this->patchService = $patchService;
+	}
 
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this
-        ->setName('patches:list')
-        ->setDescription('List all the patches.')
-        ->setDefinition(array(
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$this
+		->setName('patches:list')
+		->setDescription('List all the patches.')
+		->setDefinition(array(
 
-        ))
-        ->setHelp(<<<EOT
+		))
+		->setHelp(<<<EOT
 List all patches declared in Mouf patch service.
 
 The command will display the status of each patch, i.e. whether it has been applied or skipped or is waiting to be applied.
 EOT
-        );
-    }
+		);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $patches = $this->patchService->getView();
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		$patches = $this->patchService->getView();
 
-        $rows = array_map(function($row) {
-            return [ $row['uniqueName'], $this->renderStatus($row['status']) ];
-        }, $patches);
+		$rows = array_map(function($row) {
+			return [ $row['uniqueName'], $this->renderStatus($row['status']) ];
+		}, $patches);
 
-        $table = new Table($output);
-        $table
-            ->setHeaders(array('Patch', 'Status'))
-            ->setRows($rows)
-        ;
-        $table->render();
-    }
+		$table = new Table($output);
+		$table
+			->setHeaders(array('Patch', 'Status'))
+			->setRows($rows)
+		;
+		$table->render();
+	}
 
-    private function renderStatus($status) {
-        $map = [
-            PatchInterface::STATUS_APPLIED => "<info>Applied</info>",
-            PatchInterface::STATUS_SKIPPED => "<comment>Skipped</comment>",
-            PatchInterface::STATUS_AWAITING => "Awaiting",
-            PatchInterface::STATUS_ERROR => "<error>Skipped</error>",
-        ];
-        if (!isset($map[$status])) {
-            throw new \Exception('Unexpected status "'.$map[$status].'"');
-        }
-        return $map[$status];
-    }
+	private function renderStatus($status) {
+		$map = [
+			PatchInterface::STATUS_APPLIED => "<info>Applied</info>",
+			PatchInterface::STATUS_SKIPPED => "<comment>Skipped</comment>",
+			PatchInterface::STATUS_AWAITING => "Awaiting",
+			PatchInterface::STATUS_ERROR => "<error>Skipped</error>",
+		];
+		if (!isset($map[$status])) {
+			throw new \Exception('Unexpected status "'.$map[$status].'"');
+		}
+		return $map[$status];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         $patches = $this->patchService->getView();
 
         $rows = array_map(function($row) {
-            return [ $row['uniqueName'], $this->renderStatus($row['status']) ];
+            return [$row['uniqueName'], $this->renderStatus($row['status'])];
         }, $patches);
 
         $table = new Table($output);

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

Indentation -1 removed lines

@@ -18,7 +18,6 @@
 
 /**
  * The controller to track which patchs have been applied.
-
  */
 class PatchController extends AbstractMoufInstanceController {
 	

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,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");

src/Mouf/Utils/Patcher/PatchService.php

Spacing +4 added lines, -4 removed lines

@@ -161,15 +161,15 @@
 			
 			$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 ';
 			if ($nbAwaitingPatchs != 0) {
-				$html .= $nbAwaitingPatchs." awaiting patch".(($nbAwaitingPatchs != 1)?"es":"");
+				$html .= $nbAwaitingPatchs." awaiting patch".(($nbAwaitingPatchs != 1) ? "es" : "");
 				if ($nbPatchsInError != 0) {
-					$html .=" and";
+					$html .= " and";
 				}
 			}
 			if ($nbPatchsInError != 0) {
-				$html .=$nbPatchsInError." patch".(($nbPatchsInError != 1)?"es":"")." in error";
+				$html .= $nbPatchsInError." patch".(($nbPatchsInError != 1) ? "es" : "")." in error";
 			}
-			$html .='</a>';
+			$html .= '</a>';
 				
 			
 			return new MoufValidatorResult($status, $html);

src/views/patchesList.php

Spacing +6 added lines, -6 removed lines

@@ -19,13 +19,13 @@ 
 <?php 
 	echo '<button class="btn btn-large btn-success patch-run-all"><i class="icon-arrow-right icon-white"></i> Apply ';
 	if ($this->nbAwaiting != 0) {
-		echo $this->nbAwaiting." awaiting patch".(($this->nbAwaiting != 1)?"es":"");
+		echo $this->nbAwaiting." awaiting patch".(($this->nbAwaiting != 1) ? "es" : "");
 		if ($this->nbError != 0) {
 			echo " and ";
 		}
 	}
 	if ($this->nbError != 0) {
-		echo $this->nbError." patch".(($this->nbError != 1)?"es":"")." in error";
+		echo $this->nbError." patch".(($this->nbError != 1) ? "es" : "")." in error";
 	}
 	echo '</button>';
 ?>
@@ -66,10 +66,10 @@ 
 		<td>
 		<?php 
 		
-		echo '<button class="btn btn-mini btn-success patch-apply" '.(($patch['status'] == PatchInterface::STATUS_APPLIED)?'disabled="disabled"':'').'><i class="icon-arrow-right icon-white"></i> Apply</button>';
-		echo ' <button class="btn btn-mini btn-info patch-skip" '.(($patch['status'] == PatchInterface::STATUS_APPLIED || $patch['status'] == PatchInterface::STATUS_SKIPPED)?'disabled="disabled"':'').'><i class="icon-share-alt icon-white"></i> Skip</button>';
+		echo '<button class="btn btn-mini btn-success patch-apply" '.(($patch['status'] == PatchInterface::STATUS_APPLIED) ? 'disabled="disabled"' : '').'><i class="icon-arrow-right icon-white"></i> Apply</button>';
+		echo ' <button class="btn btn-mini btn-info patch-skip" '.(($patch['status'] == PatchInterface::STATUS_APPLIED || $patch['status'] == PatchInterface::STATUS_SKIPPED) ? 'disabled="disabled"' : '').'><i class="icon-share-alt icon-white"></i> Skip</button>';
 		if ($patch['canRevert']) {
-			echo ' <button class="btn btn-mini btn-inverse patch-revert" '.(($patch['status'] == PatchInterface::STATUS_AWAITING)?'disabled="disabled"':'').'><i class="icon-arrow-left icon-white"></i> Revert</button>';
+			echo ' <button class="btn btn-mini btn-inverse patch-revert" '.(($patch['status'] == PatchInterface::STATUS_AWAITING) ? 'disabled="disabled"' : '').'><i class="icon-arrow-left icon-white"></i> Revert</button>';
 		}
 		if ($patch['edit_url']) {
 			echo ' <a class="btn btn-mini btn-danger patch-edit" href="'.ROOT_URL.$patch['edit_url'].'"><i class="icon-edit icon-white"></i> Edit</a>';
@@ -82,7 +82,7 @@ 
 	<tr>
 		<td colspan="4">
 			<div class="alert alert-error">
-			<strong>Last error message</strong>: <?php echo plainstring_to_htmlprotected($patch['error_message']);?>
+			<strong>Last error message</strong>: <?php echo plainstring_to_htmlprotected($patch['error_message']); ?>
 			</div>
 		</td>
 	</tr>

Braces +5 added lines, -2 removed lines

@@ -5,7 +5,8 @@ 
 <?php if (empty($this->patchesArray)): ?>
 <div class="alert alert-info">No patches have been registered yet.</div>
 <?php 
-else:
+else {
+	:
 
 if ($this->nbAwaiting == 0 && $this->nbError == 0) {
 ?>
@@ -14,7 +15,9 @@ 
 } else {
 ?>
 <form action="runAllPatches" method="post">
-	<input name="name" type="hidden" value="<?php echo plainstring_to_htmlprotected($this->instanceName); ?>"></input>
+	<input name="name" type="hidden" value="<?php echo plainstring_to_htmlprotected($this->instanceName);
+}
+?>"></input>
 	<input name="selfedit" type="hidden" value="<?php echo plainstring_to_htmlprotected($this->selfedit); ?>"></input>
 <?php 
 	echo '<button class="btn btn-large btn-success patch-run-all"><i class="icon-arrow-right icon-white"></i> Apply ';