Move disabled checks

In order to really disable the plugin at the right point the checks had to be moved. This should fix issue #3
captainhookphp · Jul 27, 2021 · 3477b73 · 3477b73
1 parent 17b7fb6
commit 3477b73
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -83,6 +83,14 @@ public static function getSubscribedEvents()
      */
     public function installOrUpdateFunction(PackageEvent $event): void
     {
+        if ($this->isPluginDisabled()) {
+            $this->getIO()->write('  <comment>plugin is disabled</comment>');
+            return;
+        }
+        if (getenv('CI') === 'true') {
+            $this->getIO()->write(' <comment>disabling plugin due to CI-environment</comment>');
+            return;
+        }
         // download phar and check signature
         parent::installOrUpdateFunction($event);
         // try to configure and install hooks
@@ -100,16 +108,6 @@ public function configureHooks(): void
         $this->isPackageUpdate = true;
         $this->getIO()->write('<info>CaptainHook</info>');
 
-        if ($this->isPluginDisabled()) {
-            $this->getIO()->write('  <comment>plugin is disabled</comment>');
-            return;
-        }
-
-        if (getenv('CI') === 'true') {
-            $this->getIO()->write(' <comment>disabling plugin due to CI-environment</comment>');
-            return;
-        }
-
         $this->detectConfiguration();
         $this->detectGitDir();
         $this->detectCaptainExecutable();
@@ -218,11 +216,11 @@ private function detectCaptainExecutable(): void
     {
         $extra = $this->getComposer()->getPackage()->getExtra();
         if (isset($extra['captainhook']['exec'])) {
-            $this->executable = $extra['captainhook']['exec'];
+            $this->executable = (string) $extra['captainhook']['exec'];
             return;
         }
 
-        $this->executable = (string) $this->getComposer()->getConfig()->get('bin-dir') . '/captainhook';
+        $this->executable = $this->getComposer()->getConfig()->get('bin-dir') . '/captainhook';
     }
 
     /**