Merge pull request #371 from kenjis/fix-setup

Improve setup

Author: kenjis

docs/install.md

@@ -117,7 +117,7 @@ class Auth extends ShieldAuth
 }
 ```
 
-2. **Helper Setup** The `setting` helper needs to be included in almost every page. The simplest way to do this is to add them to the `BaseController::initController` method:
+2. **Helper Setup** The `setting` helper needs to be included in almost every page. The simplest way to do this is to add it to the `BaseController::initController` method:
 
 ```php
 public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)

src/Commands/Setup.php

@@ -196,10 +196,12 @@ protected function add(string $file, string $code, string $pattern, string $repl
     }
 
     /**
+     * Replace for setupHelper()
+     *
      * @param string $file     Relative file path like 'Controllers/BaseController.php'.
      * @param array  $replaces [search => replace]
      */
-    protected function replace(string $file, array $replaces): void
+    private function replace(string $file, array $replaces): bool
     {
         $path      = $this->distPath . $file;
         $cleanPath = clean_path($path);
@@ -209,16 +211,18 @@ protected function replace(string $file, array $replaces): void
         $output = $this->replacer->replace($content, $replaces);
 
         if ($output === $content) {
-            CLI::error("  Skipped {$cleanPath}. It has already been updated.");
-
-            return;
+            return false;
         }
 
         if (write_file($path, $output)) {
             CLI::write(CLI::color('  Updated: ', 'green') . $cleanPath);
-        } else {
-            CLI::error("  Error updating {$cleanPath}.");
+
+            return true;
         }
+
+        CLI::error("  Error updating {$cleanPath}.");
+
+        return false;
     }
 
     private function setupHelper(): void
@@ -230,7 +234,9 @@ private function setupHelper(): void
         $replaces = [
             '$this->helpers = array_merge($this->helpers, [\'auth\', \'setting\']);' => $check,
         ];
-        $this->replace($file, $replaces);
+        if ($this->replace($file, $replaces)) {
+            return;
+        }
 
         // Add helper setup
         $pattern = '/(' . preg_quote('// Do Not Edit This Line', '/') . ')/u';