Use enum instead of config file for directives

composer.json

@@ -16,7 +16,8 @@
     "php": ">=5.4.0",
     "chobie/jira-api-restclient": "2.0.*@dev",
     "apache/log4php": "2.3.0",
-    "phpoption/phpoption": "^1.5"
+    "phpoption/phpoption": "^1.5",
+    "eloquent/enumeration": "^5.1"
   },
   "require-dev": {
     "phpunit/phpunit": "3.7.*",

src/Bart/GitHook/Directives.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Bart\GitHook;
+
+use Eloquent\Enumeration\AbstractEnumeration;
+
+/**
+ * Class Directives
+ * @package Bart\GitHook
+ */
+class Directives extends AbstractEnumeration
+{
+    /**
+     * Used by StopTheLineJenkins Hook Action to allow commits that have this
+     * directive to go through, when the build is broken.
+     */
+    const buildFix = '{buildFix}';
+
+}

src/Bart/GitHook/GitHookConfig.php

@@ -29,12 +29,6 @@ public function README()
 ; %s will be replaced with commit revision hash
 comment_template = 'Commit %s pushed to JIRA. See online at https://git.example.com/?h=%s'
 
-[jenkins]
-; Used by StopTheLineJenkins Hook Action to allow
-; commits that have this directive to go through,
-; when the build is broken. Defaults to {buildfix}.
-build_fix_directive = '{buildfix}'
-
 [notifications]
 ; Optional email address to notify when emergencies are pushed
 emergency_notification_email = emergencies@example.com
@@ -68,14 +62,6 @@ public function jiraCommentTemplate()
 		return $this->getValue('jira', 'comment_template');
 	}
 
-	/**
-	 * @return string Build fix directive used to allow commits that fix builds to go through
-	 */
-	public function jenkinsBuildFixDirective()
-	{
-		return $this->getValue('jenkins', 'build_fix_directive', '{buildFix}', false);
-	}
-
     /**
      * @return \string[] List of refs to run git hooks on
      */
@@ -108,5 +94,4 @@ public function getEmergencyNotificationBody()
         return $this->getValue('notifications', 'body', '', false);
     }
 
-
-}
+}

src/Bart/GitHook/StopTheLineJenkins.php

@@ -56,9 +56,7 @@ public function run(Commit $commit)
 		$this->logger->info('Jenkins job is not healthy...asserting that commit message contains {buildfix} hash');
 		$messageSubject = $commit->messageSubject();
 
-		/** @var GitHookConfig $gitHookConfig */
-		$gitHookConfig = Diesel::create('\Bart\GitHook\GitHookConfig');
-		$buildFixDirective = $gitHookConfig->jenkinsBuildFixDirective();
+		$buildFixDirective = Directives::buildFix();
 
 		// Check if commit has buildfix directive
 		if (preg_match("/{$buildFixDirective}/", $messageSubject) > 0) {

src/Bart/Jenkins/JenkinsConfig.php

@@ -51,7 +51,7 @@ public function protocol()
     }
 
     /**
-     * @return string The port that the Jenkins instance is running on
+     * @return int The port that the Jenkins instance is running on
      * @throws ConfigurationException
      */
     public function port()

test/Bart/GitHook/StopTheLineJenkinsTest.php

@@ -6,8 +6,6 @@
 
 class StopTheLineJenkinsTest extends TestBase
 {
-    private static $buildFixDirective = '{buildFix}';
-
     public function testHealthyBuild()
     {
         $this->mockJenkinsJobWithDependencies();
@@ -35,10 +33,6 @@ public function dataProviderValidBuildFixDirectives()
     public function testUnhealthyBuildAndValidBuildFixDirectives($message)
     {
         $this->mockJenkinsJobWithDependencies(false);
-        $this->shmockAndDieselify('\Bart\GitHook\GitHookConfig', function ($hConfigs) {
-            $hConfigs->jenkinsBuildFixDirective()->once()->return_value(self::$buildFixDirective);
-        }, true);
-
         $mockCommit = CommitTest::getStubCommit($this, 'HEAD', function ($head) use ($message) {
             $head->messageSubject()->once()->return_value($message);
         });
@@ -64,10 +58,6 @@ public function dataProviderInvalidBuildFixDirectives()
     public function testUnhealthyBuildAndInvalidBuildFixDirectives($message)
     {
         $this->mockJenkinsJobWithDependencies(false);
-        $this->shmockAndDieselify('\Bart\GitHook\GitHookConfig', function ($hConfigs) {
-            $hConfigs->jenkinsBuildFixDirective()->once()->return_value(self::$buildFixDirective);
-        }, true);
-
         $mockCommit = CommitTest::getStubCommit($this, 'HEAD', function ($head) use ($message) {
             $head->messageSubject()->once()->return_value($message);
         });