Structure updateed | Error logging extended

Author: Webklex

src/GitHook/GitHook.php

@@ -48,6 +48,12 @@ class GitHook {
      */
     protected $currentBranch = null;
 
+    /**
+     * This variable might be set and used later on. It holds the pushed branch name
+     * @var null
+     */
+    protected $pushedBranch = null;
+
     /**
      * GitHook constructor.
      */
@@ -119,7 +125,7 @@ public function locateLaravelRoot(){
      *
      * @return string
      */
-    protected function getCurrentBranch(){
+    public function getCurrentBranch(){
         if($this->currentBranch == null){
             $this->currentBranch = trim(
                 shell_exec(
@@ -131,6 +137,15 @@ protected function getCurrentBranch(){
         return $this->currentBranch;
     }
 
+    /**
+     * Get the pushed branch name
+     *
+     * @return string
+     */
+    public function getPushedBranch(){
+        return $this->pushedBranch;
+    }
+
     /**
      * Check if white listing is enabled and if so if the request comes from a white listed IP
      *
@@ -163,10 +178,10 @@ public function checkRepository(){
      * @return bool
      */
     public function checkBranch(){
-        $pushed_branch = explode('/', $this->aRequest->get('ref'));
-        $pushed_branch = trim($pushed_branch[2]);
+        $pushedBranch = explode('/', $this->aRequest->get('ref'));
+        $this->pushedBranch = trim($pushedBranch[2]);
 
-        return $this->getCurrentBranch() == $pushed_branch;
+        return $this->getCurrentBranch() == $this->pushedBranch;
     }
 
     /**

src/GitHook/Http/Controller/GitHookController.php

@@ -78,7 +78,8 @@ public function gitHook(Request $request)
         /* Check if the pushed branch is the one we one want to deploy
          * */
         if ($this->oGitHook->checkBranch() == false){
-            $this->oGitHook->getLogger()->addWarning('Pushed refs do not match current branch');
+            $this->oGitHook->getLogger()->addWarning('Pushed refs do not match current branch: ['.
+                $this->oGitHook->getCurrentBranch().' /=/ '.$this->oGitHook->getPushedBranch().']');
             return response()->json([
                 'success' => false,
                 'message' => 'Pushed refs do not match current branch',

src/GitHook/Providers/LaravelServiceProvider.php

@@ -26,10 +26,9 @@ public function boot()
         $this->publishes([
             __DIR__.'/../../config/git-hook.php' => config_path('git-hook.php'),
         ]);
-        $this->loadViewsFrom(__DIR__.'/../resources/views', 'git-hook');
 
-        $source = realpath(__DIR__.'/../../config/git-hook.php');
-        $this->mergeConfigFrom($source, 'git-hook');
+        $this->mergeConfigFrom(realpath(__DIR__.'/../../config/git-hook.php'), 'git-hook');
+        $this->loadViewsFrom(__DIR__.'/../resources/views', 'git-hook');
 
         require __DIR__.'/../Http/routes.php';
     }
@@ -42,7 +41,7 @@ public function boot()
     public function register()
     {
         $this->app->bind('git-hook', function ($app) {
-            //return new GitHookApp;
+            return new GitHookApp;
         });
 
     }