Completed
Push — master ( f93e28...a26fec )
by Jonathan
07:20 queued 04:02
created
src/Webtrees/Mvc/Dispatcher.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -49,10 +49,10 @@  discard block
 block discarded – undo
49 49
     public function handle(fw\Module\AbstractModule $module, $request) {
50 50
 		
51 51
 		$fq_modclass_name = get_class($module);
52
-		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')) . '\\';
52
+		$ctrl_namespace = substr($fq_modclass_name, 0, - strlen('Module')).'\\';
53 53
 		
54
-		$args = explode( '@', $request, 2);
55
-		switch(count($args)) {
54
+		$args = explode('@', $request, 2);
55
+		switch (count($args)) {
56 56
 			case 1:
57 57
 				$ctrl_name = $args[0];
58 58
 				$method = 'index';
@@ -64,16 +64,16 @@  discard block
 block discarded – undo
64 64
 				break;
65 65
 		}
66 66
 		
67
-		$ctrl_class = $ctrl_namespace . $ctrl_name . 'Controller';
68
-		if(class_exists($ctrl_class) 
67
+		$ctrl_class = $ctrl_namespace.$ctrl_name.'Controller';
68
+		if (class_exists($ctrl_class) 
69 69
 		    && is_subclass_of($ctrl_class, '\\MyArtJaub\\Webtrees\\Mvc\\Controller\\MvcController')
70
-			&& $ctrl = new $ctrl_class($module) ) {
71
-			if(method_exists($ctrl, $method)) {
70
+			&& $ctrl = new $ctrl_class($module)) {
71
+			if (method_exists($ctrl, $method)) {
72 72
 			    try {
73 73
 			        call_user_func_array(array($ctrl, $method), array());
74 74
 			    }
75 75
 			    catch (MvcException $ex) {
76
-			        if(!headers_sent()) {
76
+			        if (!headers_sent()) {
77 77
 			            http_response_code($ex->getHttpCode());
78 78
 			        }
79 79
 			        echo $ex->getMessage();			        
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -71,19 +71,16 @@
 block discarded – undo
71 71
 			if(method_exists($ctrl, $method)) {
72 72
 			    try {
73 73
 			        call_user_func_array(array($ctrl, $method), array());
74
-			    }
75
-			    catch (MvcException $ex) {
74
+			    } catch (MvcException $ex) {
76 75
 			        if(!headers_sent()) {
77 76
 			            http_response_code($ex->getHttpCode());
78 77
 			        }
79 78
 			        echo $ex->getMessage();			        
80 79
 			    }
81
-			}
82
-			 else {
80
+			} else {
83 81
 				 throw new \Exception('The page requested does not exist');
84 82
 			 }
85
-		 }
86
-		 else {
83
+		 } else {
87 84
 			 throw new \Exception('The page requested does not exist');
88 85
 		 }
89 86
     }
Please login to merge, or discard this patch.
src/Webtrees/Mvc/MvcException.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 class MvcException extends \Exception {
18 18
 
19 19
     /** @var int[] $VALID_HTTP List of valid HTTP codes */
20
-    protected static $VALID_HTTP =  array(
20
+    protected static $VALID_HTTP = array(
21 21
         100, 101,
22 22
         200, 201, 202, 203, 204, 205, 206,
23 23
         300, 301, 302, 303, 304, 305, 306, 307,
@@ -58,9 +58,9 @@  discard block
 block discarded – undo
58 58
      * @throws InvalidArgumentException Thrown if not valid Http code
59 59
      */
60 60
     public function setHttpCode($http_code) {
61
-        if(!in_array($http_code, self::$VALID_HTTP))
61
+        if (!in_array($http_code, self::$VALID_HTTP))
62 62
             throw new \InvalidArgumentException('Invalid HTTP code');
63
-        $this->http_code= $http_code;
63
+        $this->http_code = $http_code;
64 64
     }   
65 65
 
66 66
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,9 @@
 block discarded – undo
58 58
      * @throws InvalidArgumentException Thrown if not valid Http code
59 59
      */
60 60
     public function setHttpCode($http_code) {
61
-        if(!in_array($http_code, self::$VALID_HTTP))
62
-            throw new \InvalidArgumentException('Invalid HTTP code');
61
+        if(!in_array($http_code, self::$VALID_HTTP)) {
62
+                    throw new \InvalidArgumentException('Invalid HTTP code');
63
+        }
63 64
         $this->http_code= $http_code;
64 65
     }   
65 66
 
Please login to merge, or discard this patch.
src/Webtrees/Module/HooksModule.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,8 +68,7 @@
 block discarded – undo
68 68
         try {
69 69
             Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
70 70
             return true;
71
-        }
72
-        catch (\Exception $ex) { }
71
+        } catch (\Exception $ex) { }
73 72
         return false;
74 73
     }
75 74
     
Please login to merge, or discard this patch.
src/Webtrees/Module/GeoDispersionModule.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,8 +79,7 @@
 block discarded – undo
79 79
             Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
80 80
             
81 81
             return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
82
-        }
83
-        catch (\Exception $ex) {  }
82
+        } catch (\Exception $ex) {  }
84 83
         return false;
85 84
     }
86 85
     
Please login to merge, or discard this patch.