thecodingmachine / utils.patcher

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

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 
 use Mouf\Utils\Patcher\PatchInterface;
 use Mouf\Utils\Patcher\PatchService;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputInterface;

Indentation +55 added lines, -55 removed lines

@@ -15,71 +15,71 @@
  */
 class ApplyAllPatchesCommand extends Command
 {
-    /**
-     * @var PatchService
-     */
-    private $patchService;
+	/**
+	 * @var PatchService
+	 */
+	private $patchService;
 
-    public function __construct(PatchService $patchService)
-    {
-        $this->patchService = $patchService;
-        parent::__construct();
-    }
+	public function __construct(PatchService $patchService)
+	{
+		$this->patchService = $patchService;
+		parent::__construct();
+	}
 
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this
-        ->setName('patches:apply-all')
-        ->setDescription('Apply pending patches.')
-        ->setDefinition(array(
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$this
+		->setName('patches:apply-all')
+		->setDescription('Apply pending patches.')
+		->setDefinition(array(
 
-        ))
-        ->setHelp(<<<EOT
+		))
+		->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
-        );
+		);
 
-        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());
-            }
-        }
-    }
+		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());
+			}
+		}
+	}
 
-    /**
-     * {@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/views/applyPatches.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
     <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 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; ?>
 
     <button class="btn btn-large btn-success"><i class="icon-arrow-right icon-white"></i> Apply selected patches</button>

src/Mouf/Utils/Patcher/PatchService.php

Indentation +38 added lines, -38 removed lines

@@ -30,33 +30,33 @@ 
  * @ExtendedAction {"name":"View patches list", "url":"patcher/", "default":false}
  */
 class PatchService implements MoufValidatorInterface {
-    const IFEXISTS_EXCEPTION = "exception";
-    const IFEXISTS_IGNORE = "ignore";
+	const IFEXISTS_EXCEPTION = "exception";
+	const IFEXISTS_IGNORE = "ignore";
 
 
-    /**
+	/**
 	 * The list of patches declared for this application.
 	 * 
 	 * @var PatchInterface[]
 	 */
 	private $patchs = [];
 
-    /**
-     * The list of exiting patch types for this application.
-     *
-     * @var PatchType[]
-     */
+	/**
+	 * The list of exiting patch types for this application.
+	 *
+	 * @var PatchType[]
+	 */
 	private $types = [];
 
-    /**
-     * @param PatchType[] $types
-     */
-    public function __construct(array $types)
-    {
-        $this->types = $types;
-    }
+	/**
+	 * @param PatchType[] $types
+	 */
+	public function __construct(array $types)
+	{
+		$this->types = $types;
+	}
 
-    /**
+	/**
 	 * The list of patches declared for this application.
 	 * @param PatchInterface[] $patchs
 	 * @return PatchService
@@ -66,26 +66,26 @@ 
 		return $this;
 	}
 
-    /**
-     * The list of exiting patch types for this application.
-     *
-     * @return PatchType[]
-     */
-    public function getTypes(): array
-    {
-        return $this->types;
-    }
+	/**
+	 * The list of exiting patch types for this application.
+	 *
+	 * @return PatchType[]
+	 */
+	public function getTypes(): array
+	{
+		return $this->types;
+	}
 
-    /**
-     * @internal Returns a serialized list of types for the patch UI.
-     * @return array
-     */
-    public function _getSerializedTypes(): array
-    {
-        return array_map(function(PatchType $type) {
-            return $type->jsonSerialize();
-        }, $this->types);
-    }
+	/**
+	 * @internal Returns a serialized list of types for the patch UI.
+	 * @return array
+	 */
+	public function _getSerializedTypes(): array
+	{
+		return array_map(function(PatchType $type) {
+			return $type->jsonSerialize();
+		}, $this->types);
+	}
 
 	/**
 	 * Adds this patch to the list of existing patches.
@@ -214,8 +214,8 @@ 
 	
 	/**
 	 * Returns a PHP array representing the patchs.
-     *
-     * @internal
+	 *
+	 * @internal
 	 */
 	public function getView(): array {
 		$view = array();
@@ -249,7 +249,7 @@ 
 				"description"=>$description,
 				"error_message"=>$error_message,
 				"edit_url"=>$editUrl,
-                "patch_type"=>$patchType
+				"patch_type"=>$patchType
 			);
 			$view[] = $patchView;
 		}

Spacing +4 added lines, -4 removed lines

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

src/Mouf/Utils/Patcher/PatchInterface.php

Indentation +14 added lines, -14 removed lines

@@ -39,20 +39,20 @@ 
 	/**
 	 * Skips the patch (sets its status to "skipped").
 	 */
-    public function skip(): void;
+	public function skip(): void;
 
 	/**
 	 * Reverts (cancels) the patch.
 	 * Note: patchs do not have to provide a "revert" feature (see canRevert method).
 	 */
-    public function revert(): void;
+	public function revert(): void;
 	
 	/**
 	 * Returns true if this patch can be canceled, false otherwise.
 	 * 
 	 * @return boolean
 	 */
-    public function canRevert(): bool;
+	public function canRevert(): bool;
 	
 	/**
 	 * Returns the status of this patch.
@@ -65,28 +65,28 @@ 
 	 * 
 	 * @return string
 	 */
-    public function getStatus(): string;
+	public function getStatus(): string;
 	
 	/**
 	 * Returns a unique name for this patch. 
 	 *
 	 * @return string
 	 */
-    public function getUniqueName(): string;
+	public function getUniqueName(): string;
 	
 	/**
 	 * Returns a short description of the patch.
 	 * 
 	 * @return string
 	 */
-    public function getDescription(): string;
+	public function getDescription(): string;
 	
 	/**
 	 * Returns the error message of the last action performed, or null if last action was successful.
 	 * 
 	 * @return string
 	 */
-    public function getLastErrorMessage(): ?string;
+	public function getLastErrorMessage(): ?string;
 	
 	/**
 	 * Returns the URL that can be used to edit this patch.
@@ -94,12 +94,12 @@ 
 	 * 
 	 * @return string
 	 */
-    public function getEditUrl(): string;
+	public function getEditUrl(): string;
 
-    /**
-     * Returns the type of the patch.
-     *
-     * @return PatchType
-     */
-    public function getPatchType() : PatchType;
+	/**
+	 * Returns the type of the patch.
+	 *
+	 * @return PatchType
+	 */
+	public function getPatchType() : PatchType;
 }

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 	 * 
 	 * @return string
 	 */
-    public function getLastErrorMessage(): ?string;
+    public function getLastErrorMessage(): ? string;
 	
 	/**
 	 * Returns the URL that can be used to edit this patch.

src/Mouf/Utils/Patcher/PatchType.php

Indentation +55 added lines, -55 removed lines

@@ -8,64 +8,64 @@
 
 class PatchType implements \JsonSerializable
 {
-    /**
-     * @var string
-     */
-    private $name;
-    /**
-     * @var string
-     */
-    private $description;
+	/**
+	 * @var string
+	 */
+	private $name;
+	/**
+	 * @var string
+	 */
+	private $description;
 
-    /**
-     * @Important
-     * @param string $name The name of the patch type. Should not contain special characters or spaces. Note: the default type is an empty string.
-     * @param string $description The description of the patch type
-     * @throws PatchException
-     */
-    public function __construct(string $name, string $description)
-    {
-        if (!preg_match('/^[a-z_\-0-9]*$/i', $name)) {
-            throw new PatchException('A patch name can only contain alphanumeric characters and underscore. Name passed: "'.$name.'"');
-        }
+	/**
+	 * @Important
+	 * @param string $name The name of the patch type. Should not contain special characters or spaces. Note: the default type is an empty string.
+	 * @param string $description The description of the patch type
+	 * @throws PatchException
+	 */
+	public function __construct(string $name, string $description)
+	{
+		if (!preg_match('/^[a-z_\-0-9]*$/i', $name)) {
+			throw new PatchException('A patch name can only contain alphanumeric characters and underscore. Name passed: "'.$name.'"');
+		}
 
-        $this->name = $name;
-        $this->description = $description;
-    }
+		$this->name = $name;
+		$this->description = $description;
+	}
 
-    /**
-     * The name of the patch type. Should not contain special characters or spaces.
-     *
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
+	/**
+	 * The name of the patch type. Should not contain special characters or spaces.
+	 *
+	 * @return string
+	 */
+	public function getName(): string
+	{
+		return $this->name;
+	}
 
-    /**
-     * The description of the patch type.
-     *
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
+	/**
+	 * The description of the patch type.
+	 *
+	 * @return string
+	 */
+	public function getDescription(): string
+	{
+		return $this->description;
+	}
 
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    public function jsonSerialize()
-    {
-        return [
-            'name' => $this->name,
-            'description' => $this->description,
-            'instanceName' => MoufManager::getMoufManager()->findInstanceName($this)
-        ];
-    }
+	/**
+	 * Specify data which should be serialized to JSON
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 * which is a value of any type other than a resource.
+	 * @since 5.4.0
+	 */
+	public function jsonSerialize()
+	{
+		return [
+			'name' => $this->name,
+			'description' => $this->description,
+			'instanceName' => MoufManager::getMoufManager()->findInstanceName($this)
+		];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Mouf\Utils\Patcher;
 

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']), $row['patch_type'] ?: '(default)' ];
-        }, $patches);
+		$rows = array_map(function($row) {
+			return [ $row['uniqueName'], $this->renderStatus($row['status']), $row['patch_type'] ?: '(default)' ];
+		}, $patches);
 
-        $table = new Table($output);
-        $table
-            ->setHeaders(array('Patch', 'Status', 'Type'))
-            ->setRows($rows)
-        ;
-        $table->render();
-    }
+		$table = new Table($output);
+		$table
+			->setHeaders(array('Patch', 'Status', 'Type'))
+			->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']), $row['patch_type'] ?: '(default)' ];
+            return [$row['uniqueName'], $this->renderStatus($row['status']), $row['patch_type'] ?: '(default)'];
         }, $patches);
 
         $table = new Table($output);

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

Indentation +101 added lines, -102 removed lines

@@ -19,7 +19,6 @@ 
 
 /**
  * The controller to track which patchs have been applied.
-
  */
 class PatchController extends AbstractMoufInstanceController {
 	
@@ -97,87 +96,87 @@ 
 		header('Location: .?name='.urlencode($name));
 	}
 
-    /**
-     * Displays the page to select the patch types to be applied.
-     *
-     * @Action
-     * @Logged
-     * @param string $name
-     * @param string $selfedit
-     */
-    public function runAllPatches($name, $selfedit) {
-        $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 ($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, [''], $selfedit);
-            return;
-        }
-
-        ksort($this->nbPatchesByType);
-
-        // 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 array $types
-     * @param string $selfedit
-     */
+	/**
+	 * Displays the page to select the patch types to be applied.
+	 *
+	 * @Action
+	 * @Logged
+	 * @param string $name
+	 * @param string $selfedit
+	 */
+	public function runAllPatches($name, $selfedit) {
+		$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 ($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, [''], $selfedit);
+			return;
+		}
+
+		ksort($this->nbPatchesByType);
+
+		// 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 array $types
+	 * @param string $selfedit
+	 */
 	public function applyAllPatches($name, array $types, $selfedit) {
 		$patchService = new InstanceProxy($name, $selfedit == "true");
 		$this->patchesArray = $patchService->getView();
 
 		// Array of cound of applied and skip patched. Key is the patch type.
 		$appliedPatchArray = [];
-        $skippedPatchArray = [];
+		$skippedPatchArray = [];
 
 		try {
 			foreach ($this->patchesArray as $patch) {
-                if ($patch['status'] == PatchInterface::STATUS_AWAITING || $patch['status'] == PatchInterface::STATUS_ERROR) {
-                    $type = $patch['patch_type'];
-                    if (in_array($type, $types) || $type === '') {
-                        $patchService->apply($patch['uniqueName']);
-                        if (!isset($appliedPatchArray[$type])) {
-                            $appliedPatchArray[$type] = 0;
-                        }
-                        $appliedPatchArray[$type]++;
-                    } else {
-                        $patchService->skip($patch['uniqueName']);
-                        if (!isset($skippedPatchArray[$type])) {
-                            $skippedPatchArray[$type] = 0;
-                        }
-                        $skippedPatchArray[$type]++;
-                    }
-                }
+				if ($patch['status'] == PatchInterface::STATUS_AWAITING || $patch['status'] == PatchInterface::STATUS_ERROR) {
+					$type = $patch['patch_type'];
+					if (in_array($type, $types) || $type === '') {
+						$patchService->apply($patch['uniqueName']);
+						if (!isset($appliedPatchArray[$type])) {
+							$appliedPatchArray[$type] = 0;
+						}
+						$appliedPatchArray[$type]++;
+					} else {
+						$patchService->skip($patch['uniqueName']);
+						if (!isset($skippedPatchArray[$type])) {
+							$skippedPatchArray[$type] = 0;
+						}
+						$skippedPatchArray[$type]++;
+					}
+				}
 			}
 
 		} catch (\Exception $e) {
@@ -185,37 +184,37 @@ 
 			set_user_message($htmlMessage);
 		}
 
-        $this->displayNotificationMessage($appliedPatchArray, $skippedPatchArray);
+		$this->displayNotificationMessage($appliedPatchArray, $skippedPatchArray);
 
-        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(es) applied (%s)', $nbPatchesApplied, implode(', ', $patchArr));
-        }
-        if ($nbPatchesSkipped !== 0) {
-            $patchArr = [];
-            foreach ($skippedPatchArray as $name => $number) {
-                $name = $name ?: 'default';
-                $patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
-            }
-
-            $msg .= sprintf('%d patch(es) skipped (%s)', $nbPatchesSkipped, 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(es) applied (%s)', $nbPatchesApplied, implode(', ', $patchArr));
+		}
+		if ($nbPatchesSkipped !== 0) {
+			$patchArr = [];
+			foreach ($skippedPatchArray as $name => $number) {
+				$name = $name ?: 'default';
+				$patchArr[] = plainstring_to_htmlprotected($name).': '.$number;
+			}
+
+			$msg .= sprintf('%d patch(es) skipped (%s)', $nbPatchesSkipped, implode(', ', $patchArr));
+		}
+
+		if ($msg !== '') {
+			set_user_message($msg, UserMessageInterface::SUCCESS);
+		}
+	}
 }
\ No newline at end of file

src/Mouf/Utils/Patcher/PatchInstaller2.php

Indentation +38 added lines, -38 removed lines

@@ -19,53 +19,53 @@
 
 class PatchInstaller2 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.
-        $patchDefaultType = InstallUtils::getOrCreateInstance('patch.default_type', PatchType::class, $moufManager);
-        $patchDefaultType->getConstructorArgumentProperty('name')->setValue('');
-        $patchDefaultType->getConstructorArgumentProperty('description')->setValue('Patches that should be always applied should have this type. Typically, use this type for DDL changes or reference data insertion.');
+	/**
+	 * (non-PHPdoc)
+	 * @see \Mouf\Installer\PackageInstallerInterface::install()
+	 * @param  MoufManager         $moufManager
+	 * @throws \Mouf\MoufException
+	 */
+	public static function install(MoufManager $moufManager)
+	{
+		// Let's create the instance.
+		$patchDefaultType = InstallUtils::getOrCreateInstance('patch.default_type', PatchType::class, $moufManager);
+		$patchDefaultType->getConstructorArgumentProperty('name')->setValue('');
+		$patchDefaultType->getConstructorArgumentProperty('description')->setValue('Patches that should be always applied should have this type. Typically, use this type for DDL changes or reference data insertion.');
 
-        $patchTestDataType = InstallUtils::getOrCreateInstance('patch.testdata_type', PatchType::class, $moufManager);
-        $patchTestDataType->getConstructorArgumentProperty('name')->setValue('test_data');
-        $patchTestDataType->getConstructorArgumentProperty('description')->setValue('Use this type to mark patches that contain test data that should only be used in staging environment.');
+		$patchTestDataType = InstallUtils::getOrCreateInstance('patch.testdata_type', PatchType::class, $moufManager);
+		$patchTestDataType->getConstructorArgumentProperty('name')->setValue('test_data');
+		$patchTestDataType->getConstructorArgumentProperty('description')->setValue('Use this type to mark patches that contain test data that should only be used in staging environment.');
 
-        $patchService = InstallUtils::getOrCreateInstance('patchService', PatchService::class, $moufManager);
+		$patchService = InstallUtils::getOrCreateInstance('patchService', PatchService::class, $moufManager);
 
-        if (empty($patchService->getConstructorArgumentProperty('types')->getValue())) {
-            $patchService->getConstructorArgumentProperty('types')->setValue([ $patchDefaultType, $patchTestDataType ]);
-        }
+		if (empty($patchService->getConstructorArgumentProperty('types')->getValue())) {
+			$patchService->getConstructorArgumentProperty('types')->setValue([ $patchDefaultType, $patchTestDataType ]);
+		}
 
-        $consoleUtils = new ConsoleUtils($moufManager);
+		$consoleUtils = new ConsoleUtils($moufManager);
 
-        $listPatchesCommand = $moufManager->createInstance(ListPatchesCommand::class);
-        $listPatchesCommand->getConstructorArgumentProperty("patchService")->setValue($patchService);
-        $consoleUtils->registerCommand($listPatchesCommand);
+		$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);
+		$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);
+		$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);
+		$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);
+		$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();
-    }
+		// Let's rewrite the MoufComponents.php file to save the component
+		$moufManager->rewriteMouf();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         $patchService = InstallUtils::getOrCreateInstance('patchService', PatchService::class, $moufManager);
 
         if (empty($patchService->getConstructorArgumentProperty('types')->getValue())) {
-            $patchService->getConstructorArgumentProperty('types')->setValue([ $patchDefaultType, $patchTestDataType ]);
+            $patchService->getConstructorArgumentProperty('types')->setValue([$patchDefaultType, $patchTestDataType]);
         }
 
         $consoleUtils = new ConsoleUtils($moufManager);