Completed
Pull Request — develop (#295)
by John
04:45
created
Alpha/Controller/ControllerInterface.php 1 patch
Doc Comments   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -60,37 +60,36 @@  discard block
 block discarded – undo
60 60
     /**
61 61
      * Handles GET HTTP requests.
62 62
      *
63
-     * @param Alpha\Util\Http\Request $request
64 63
      *
65 64
      * @since Alpha\Util\Http\Response
66 65
      * @since 1.0
66
+     * @return \Alpha\Util\Http\Response|null
67 67
      */
68 68
     public function doGET($params);
69 69
 
70 70
     /**
71 71
      * Handles POST HTTP requests.
72 72
      *
73
-     * @param Alpha\Util\Http\Request $request
74 73
      *
75 74
      * @since Alpha\Util\Http\Response
76 75
      * @since 1.0
76
+     * @return \Alpha\Util\Http\Response|null
77 77
      */
78 78
     public function doPOST($params);
79 79
 
80 80
     /**
81 81
      * Handles PUT HTTP requests.
82 82
      *
83
-     * @param Alpha\Util\Http\Request $request
84 83
      *
85 84
      * @since Alpha\Util\Http\Response
86 85
      * @since 1.0
86
+     * @return \Alpha\Util\Http\Response
87 87
      */
88 88
     public function doPUT($params);
89 89
 
90 90
     /**
91 91
      * Handles PATCH HTTP requests.
92 92
      *
93
-     * @param Alpha\Util\Http\Request $request
94 93
      *
95 94
      * @since Alpha\Util\Http\Response
96 95
      * @since 1.0
@@ -100,30 +99,30 @@  discard block
 block discarded – undo
100 99
     /**
101 100
      * Handles DELETE HTTP requests.
102 101
      *
103
-     * @param Alpha\Util\Http\Request $request
104 102
      *
105 103
      * @since Alpha\Util\Http\Response
106 104
      * @since 1.0
105
+     * @return \Alpha\Util\Http\Response
107 106
      */
108 107
     public function doDELETE($params);
109 108
 
110 109
     /**
111 110
      * Handles OPTIONS HTTP requests.
112 111
      *
113
-     * @param Alpha\Util\Http\Request $request
114 112
      *
115 113
      * @since Alpha\Util\Http\Response
116 114
      * @since 1.0
115
+     * @return \Alpha\Util\Http\Response
117 116
      */
118 117
     public function doOPTIONS($params);
119 118
 
120 119
     /**
121 120
      * Handles TRACE HTTP requests.
122 121
      *
123
-     * @param Alpha\Util\Http\Request $request
124 122
      *
125 123
      * @since Alpha\Util\Http\Response
126 124
      * @since 2.0.2
125
+     * @return \Alpha\Util\Http\Response
127 126
      */
128 127
     public function doTRACE($params);
129 128
 }
Please login to merge, or discard this patch.
public/index.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -14,36 +14,36 @@
 block discarded – undo
14 14
 use Alpha\View\View;
15 15
 
16 16
 try {
17
-	$config = ConfigProvider::getInstance();
17
+    $config = ConfigProvider::getInstance();
18 18
 
19
-	set_exception_handler('Alpha\Util\ErrorHandlers::catchException');
20
-	set_error_handler('Alpha\Util\ErrorHandlers::catchError', $config->get('php.error.log.level'));
19
+    set_exception_handler('Alpha\Util\ErrorHandlers::catchException');
20
+    set_error_handler('Alpha\Util\ErrorHandlers::catchError', $config->get('php.error.log.level'));
21 21
 
22
-	$front = new FrontController();
22
+    $front = new FrontController();
23 23
 	
24
-	if ($config->get('security.client.blacklist.filter.enabled')) {
25
-		$front->registerFilter(new ClientBlacklistFilter());
26
-	}
24
+    if ($config->get('security.client.blacklist.filter.enabled')) {
25
+        $front->registerFilter(new ClientBlacklistFilter());
26
+    }
27 27
 
28
-	if ($config->get('security.ip.blacklist.filter.enabled')) {
29
-		$front->registerFilter(new IPBlacklistFilter());
30
-	}
28
+    if ($config->get('security.ip.blacklist.filter.enabled')) {
29
+        $front->registerFilter(new IPBlacklistFilter());
30
+    }
31 31
 
32
-	if ($config->get('security.client.temp.blacklist.filter.enabled')) {
33
-		$front->registerFilter(new ClientTempBlacklistFilter());
34
-	}
32
+    if ($config->get('security.client.temp.blacklist.filter.enabled')) {
33
+        $front->registerFilter(new ClientTempBlacklistFilter());
34
+    }
35 35
 
36
-	$request = new Request();
37
-	$response = $front->process($request);
36
+    $request = new Request();
37
+    $response = $front->process($request);
38 38
 
39 39
 } catch (ResourceNotFoundException $rnfe) {
40
-	$response = new Response(404, View::renderErrorPage(404, $rnfe->getMessage(), array('Content-Type' => 'text/html')));
40
+    $response = new Response(404, View::renderErrorPage(404, $rnfe->getMessage(), array('Content-Type' => 'text/html')));
41 41
 } catch (ResourceNotAllowedException $rnae) {
42
-	$response = new Response(403, View::renderErrorPage(403, $rnae->getMessage(), array('Content-Type' => 'text/html')));
42
+    $response = new Response(403, View::renderErrorPage(403, $rnae->getMessage(), array('Content-Type' => 'text/html')));
43 43
 }
44 44
 
45 45
 if ($config->get('security.http.header.x.frame.options') != '') {
46
-	$response->setHeader('X-Frame-Options', $config->get('security.http.header.x.frame.options'));
46
+    $response->setHeader('X-Frame-Options', $config->get('security.http.header.x.frame.options'));
47 47
 }
48 48
 
49 49
 echo $response->send();
Please login to merge, or discard this patch.