thecodingmachine / utils.patcher

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

Indentation +108 added lines, -109 removed lines

@@ -19,7 +19,6 @@ 
 
 /**
  * The controller to track which patchs have been applied.
-
  */
 class PatchController extends AbstractMoufInstanceController {
 	
@@ -98,96 +97,96 @@ 
 		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 array $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 array $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");
 
-        if ($action === 'reset') {
-            $patchService->reset();
-        }
+		if ($action === 'reset') {
+			$patchService->reset();
+		}
 
 		$this->patchesArray = $patchService->getView();
 
 		// Array of count of applied and skipped patches. 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) {
@@ -195,37 +194,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/PatchListenerInterface.php

Indentation +10 added lines, -10 removed lines

@@ -8,16 +8,16 @@
  */
 interface PatchListenerInterface
 {
-    /**
-     * Triggered when the 'reset()' method is called on the PatchService
-     */
-    public function onReset(): void;
+	/**
+	 * Triggered when the 'reset()' method is called on the PatchService
+	 */
+	public function onReset(): void;
 
-    /**
-     * Triggered when one or many patches have been applied.
-     *
-     * @param PatchInterface[] $patches
-     */
-    //public function onPatchesApplied(array $patches): void;
+	/**
+	 * Triggered when one or many patches have been applied.
+	 *
+	 * @param PatchInterface[] $patches
+	 */
+	//public function onPatchesApplied(array $patches): void;
 
 }
\ No newline at end of file