Code cleanup

Author: Matias Griese

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v2.1.0
+## mm/dd/2020
+
+1. [](#new)
+    * Requires Grav v1.6.0
+    * Pass phpstan level 2 tests
+1. [](#improved)
+    * Code cleanup
+
 # v2.0.5
 ## 05/06/2019
 

blueprints.yaml

@@ -13,7 +13,7 @@ docs: https://github.com/trilbymedia/grav-plugin-git-sync
 license: MIT
 
 dependencies:
-- { name: grav, version: '>=1.5.0' }
+- { name: grav, version: '>=1.6.0' }
 - { name: form, version: '>=2.16.3' }
 
 form:

classes/AdminController.php

@@ -14,28 +14,31 @@ class AdminController extends AdminBaseController
     protected $active;
     protected $plugin;
     protected $task_prefix = 'task';
+
+    /** @var GitSync */
     public $git;
 
     /**
-     * @param Plugin   $plugin
+     * @param Plugin $plugin
      */
     public function __construct(Plugin $plugin)
     {
-        $post = !empty($_POST) ? $_POST : [];
         $this->grav = Grav::instance();
         $this->active = false;
         $uri = $this->grav['uri'];
-        $this->post = $this->getPost($post);
         $this->plugin = $plugin;
 
+        $post = !empty($_POST) ? $_POST : [];
+        $this->post = $this->getPost($post);
+
         // Ensure the controller should be running
         if (Utils::isAdminPlugin()) {
             $routeDetails = $this->grav['admin']->getRouteDetails();
             $target = array_pop($routeDetails);
-            $this->git = new GitSync($plugin);
+            $this->git = new GitSync();
 
             // return null if this is not running
-            if ($target != $plugin->name)  {
+            if ($target !== $plugin->name)  {
                 return;
             }
 
@@ -45,7 +48,7 @@ public function __construct(Plugin $plugin)
             $this->admin = Grav::instance()['admin'];
 
             $task = !empty($post['task']) ? $post['task'] : $uri->param('task');
-            if ($task && ($this->target == $plugin->name || $uri->route() == '/lessons')) {
+            if ($task && ($this->target === $plugin->name || $uri->route() === '/lessons')) {
                 $this->task = $task;
                 $this->active = true;
             }
@@ -54,19 +57,20 @@ public function __construct(Plugin $plugin)
 
     public function taskTestConnection()
     {
-        $post    = $this->post;
-        $data    = json_decode(base64_decode($post['test']));
+        $post = $this->post;
+        $test = base64_decode($post['test']) ?: null;
+        $data = $test ? json_decode($test, false) : new \stdClass();
 
         try {
             Helper::testRepository($data->user, $data->password, $data->repository);
             echo json_encode([
-                'status'  => "success",
+                'status'  => 'success',
                 'message' => 'The connection to the repository has been successful.'
             ]);
         } catch (\Exception $e) {
             $invalid = str_replace($data->password, '{password}', $e->getMessage());
             echo json_encode([
-                'status'  => "error",
+                'status'  => 'error',
                 'message' => $invalid
             ]);
         }
@@ -79,13 +83,13 @@ public function taskSynchronize()
         try {
             $this->plugin->synchronize();
             echo json_encode([
-                'status'  => "success",
+                'status'  => 'success',
                 'message' => 'GitSync has successfully synchronized with the repository.'
             ]);
         } catch (\Exception $e) {
             $invalid = str_replace($this->git->getConfig('password', null), '{password}', $e->getMessage());
             echo json_encode([
-                'status'  => "error",
+                'status'  => 'error',
                 'message' => $invalid
             ]);
         }
@@ -98,13 +102,13 @@ public function taskResetLocal()
         try {
             $this->plugin->reset();
             echo json_encode([
-                'status'  => "success",
+                'status'  => 'success',
                 'message' => 'GitSync has successfully reset your local changes and synchronized with the repository.'
             ]);
         } catch (\Exception $e) {
             $invalid = str_replace($this->git->getConfig('password', null), '{password}', $e->getMessage());
             echo json_encode([
-                'status'  => "error",
+                'status'  => 'error',
                 'message' => $invalid
             ]);
         }
@@ -115,11 +119,10 @@ public function taskResetLocal()
     /**
      * Performs a task or action on a post or target.
      *
-     * @return bool|mixed
+     * @return bool
      */
     public function execute()
     {
-        $success = false;
         $params = [];
 
         // Handle Task & Action
@@ -142,10 +145,10 @@ public function execute()
             return false;
         }
 
-        $success = call_user_func_array([$this, $method], $params);
+        $success = $this->{$method}(...$params);
 
         // Grab redirect parameter.
-        $redirect = isset($this->post['_redirect']) ? $this->post['_redirect'] : null;
+        $redirect = $this->post['_redirect'] ?? null;
         unset($this->post['_redirect']);
 
         // Redirect if requested.
@@ -156,6 +159,9 @@ public function execute()
         return $success;
     }
 
+    /**
+     * @return bool
+     */
     public function isActive()
     {
         return (bool) $this->active;