andela-tolotin / open-source-evangelist

src/EvangelistStatus.php

Spacing +4 added lines, -8 removed lines

@@ -33,14 +33,14 @@ 
 	
     public function __construct($username)
     { 
-        $this->username                         = $username;
+        $this->username = $username;
 
         $num_args = (int) func_num_args(); // get number of arguments passed to 
 
-        if ($num_args == 0 ||  $num_args > 1) {
+        if ($num_args == 0 || $num_args > 1) {
             throw ArgumentCheckException::NullOfOverflowArgumentException("Argument missing: only one argument is allowed");
         }
-<<<<<<< HEAD
+<< << <<< HEAD
 
 =======
       
@@ -113,8 +113,4 @@ 
      */
     public function checkNullUsernameException()
     {
-        if ($this->checkEmptyGithubUsername($this->username)) {
-            throw EvangelistStatusException::createEvangelistStatusException("Username is Empty, please provide a GitHub valid username");
-        }
-    }
-}  
+        if ($this->checkEmptyGithubUsername($this->username
\ No newline at end of file

src/Ranking/EvangelistStatusRanking.php

Spacing +2 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
      */
     public static function determineEvangelistLevel($noOfRepo)
     {
-    	if ($noOfRepo >= 5 && $noOfRepo<= 10) {
+    	if ($noOfRepo >= 5 && $noOfRepo <= 10) {
     		$evangelistTypeMessage = "Damn It!!! Please make the world better, Oh Ye Prodigal Junior Evangelist";
     	} else if ($noOfRepo >= 11 && $noOfRepo <= 20) {
     		$evangelistTypeMessage = "Keep Up The Good Work, I crown you Associate Evangelist";
@@ -45,8 +45,4 @@ 
             return true;
         }
     }
-<<<<<<< HEAD
-    
-=======
->>>>>>> 5ae30be3b2ebb67e6de8fe512888cf961febb1ad
- }
+<< << <<< HEAD