Passed
Branch master (85d3b8)
by vahid
03:46
created
src/RespondServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 		$lang = \App::getLocale();
18 18
 
19 19
 		$this->publishes([
20
-			__DIR__.'/../errors/lang/' . $lang . '.php' => config_path( $lang . '.php' ),
20
+			__DIR__ . '/../errors/lang/' . $lang . '.php' => config_path($lang . '.php'),
21 21
 		]);
22 22
 
23 23
 	}
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	private function registerMessages()
39 39
 	{
40 40
 
41
-		$this->app->bind( 'Vahid\Respond\Messages', function() {
41
+		$this->app->bind('Vahid\Respond\Messages', function() {
42 42
 
43 43
 			return new Messages();
44 44
 
Please login to merge, or discard this patch.
src/Messages.php 1 patch
Spacing   +63 added lines, -63 removed lines patch added patch discarded remove patch
@@ -14,11 +14,11 @@  discard block
 block discarded – undo
14 14
      * @see
15 15
      * @author Shima Payro <[email protected]>
16 16
      */
17
-	public function succeed( $data ) {
17
+	public function succeed($data) {
18 18
 
19
-		return $this->setStatusCode( 200 )
20
-					->setStatusText( 'success' )
21
-					->respondWithResult( $data );
19
+		return $this->setStatusCode(200)
20
+					->setStatusText('success')
21
+					->respondWithResult($data);
22 22
 
23 23
 	}
24 24
 
@@ -31,14 +31,14 @@  discard block
 block discarded – undo
31 31
      * @see
32 32
      * @author Shima Payro <[email protected]>
33 33
      */
34
-	public function deleteSucceeded( $message = null ) {
34
+	public function deleteSucceeded($message = null) {
35 35
 
36
-		if ( is_null( $message ) )
36
+		if (is_null($message))
37 37
 			$message = $this->config[ 'success' ][ 'delete' ];
38 38
 
39
-		return $this->setStatusCode( 200 )
40
-					->setStatusText( 'success' )
41
-					->respondWithMessage( $message );
39
+		return $this->setStatusCode(200)
40
+					->setStatusText('success')
41
+					->respondWithMessage($message);
42 42
 
43 43
 	}
44 44
 
@@ -51,14 +51,14 @@  discard block
 block discarded – undo
51 51
      * @see
52 52
      * @author Shima Payro <[email protected]>
53 53
      */
54
-	public function updateSucceeded( $message = null ) {
54
+	public function updateSucceeded($message = null) {
55 55
 
56
-		if ( is_null( $message ) )
56
+		if (is_null($message))
57 57
 			$message = $this->config[ 'success' ][ 'update' ];
58 58
 
59
-		return $this->setStatusCode( 200 )
60
-					->setStatusText( 'success' )
61
-					->respondWithMessage( $message );
59
+		return $this->setStatusCode(200)
60
+					->setStatusText('success')
61
+					->respondWithMessage($message);
62 62
 
63 63
 	}
64 64
 
@@ -71,14 +71,14 @@  discard block
 block discarded – undo
71 71
      * @see
72 72
      * @author Shima Payro <[email protected]>
73 73
      */
74
-	public function insertSucceeded( $message = null ) {
74
+	public function insertSucceeded($message = null) {
75 75
 
76
-		if ( is_null( $message ) )
76
+		if (is_null($message))
77 77
 			$message = $this->config[ 'success' ][ 'insert' ];
78 78
 
79
-		return $this->setStatusCode( 200 )
80
-					->setStatusText( 'success' )
81
-					->respondWithMessage( $message );
79
+		return $this->setStatusCode(200)
80
+					->setStatusText('success')
81
+					->respondWithMessage($message);
82 82
 
83 83
 	}
84 84
 
@@ -91,15 +91,15 @@  discard block
 block discarded – undo
91 91
      * @see
92 92
      * @author Shima Payro <[email protected]>
93 93
      */
94
-	public function deleteFaild( $message = null ) {
94
+	public function deleteFaild($message = null) {
95 95
 
96
-		if ( is_null( $message ) )
96
+		if (is_null($message))
97 97
 			$message = $this->config[ 'fail' ][ 'delete' ];
98 98
 
99
-		return $this->setStatusCode( 447 )
100
-					->setStatusText( 'fail' )
101
-					->setErrorCode( 5447 )
102
-					->respondWithMessage( $message );
99
+		return $this->setStatusCode(447)
100
+					->setStatusText('fail')
101
+					->setErrorCode(5447)
102
+					->respondWithMessage($message);
103 103
 
104 104
 	}
105 105
 
@@ -112,15 +112,15 @@  discard block
 block discarded – undo
112 112
      * @see
113 113
      * @author Shima Payro <[email protected]>
114 114
      */
115
-	public function updateFaild( $message = null ) {
115
+	public function updateFaild($message = null) {
116 116
 
117
-		if ( is_null( $message ) )
117
+		if (is_null($message))
118 118
 			$message = $this->config[ 'fail' ][ 'update' ];
119 119
 
120
-		return $this->setStatusCode( 449 )
121
-					->setStatusText( 'fail' )
122
-					->setErrorCode( 5449 )
123
-					->respondWithMessage( $message );
120
+		return $this->setStatusCode(449)
121
+					->setStatusText('fail')
122
+					->setErrorCode(5449)
123
+					->respondWithMessage($message);
124 124
 
125 125
 	}
126 126
 
@@ -133,15 +133,15 @@  discard block
 block discarded – undo
133 133
      * @see
134 134
      * @author Shima Payro <[email protected]>
135 135
      */
136
-	public function insertFaild( $message = null ) {
136
+	public function insertFaild($message = null) {
137 137
 
138
-		if ( is_null( $message ) )
138
+		if (is_null($message))
139 139
 			$message = $this->config[ 'fail' ][ 'insert' ];
140 140
 
141
-		return $this->setStatusCode( 448 )
142
-					->setStatusText( 'fail' )
143
-					->setErrorCode( 5448 )
144
-					->respondWithMessage( $message );
141
+		return $this->setStatusCode(448)
142
+					->setStatusText('fail')
143
+					->setErrorCode(5448)
144
+					->respondWithMessage($message);
145 145
 
146 146
 	}
147 147
 
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
      */
156 156
 	public function connectionRefused() {
157 157
 
158
-		return $this->setStatusCode( 445 )
159
-					->setStatusText( 'fail' )
160
-					->setErrorCode( 5445 )
158
+		return $this->setStatusCode(445)
159
+					->setStatusText('fail')
160
+					->setErrorCode(5445)
161 161
 					->respondWithMessage();
162 162
 
163 163
 	}
@@ -173,9 +173,9 @@  discard block
 block discarded – undo
173 173
      */
174 174
 	public function notFound() {
175 175
 
176
-		return $this->setStatusCode( 404 )
177
-					->setStatusText( 'fail' )
178
-					->setErrorCode( 5404 )
176
+		return $this->setStatusCode(404)
177
+					->setStatusText('fail')
178
+					->setErrorCode(5404)
179 179
 					->respondWithMessage();
180 180
 
181 181
 	}
@@ -191,9 +191,9 @@  discard block
 block discarded – undo
191 191
      */
192 192
 	public function wrongParameters() {
193 193
 
194
-		return $this->setStatusCode( 406 )
195
-					->setStatusText( 'fail' )
196
-					->setErrorCode( 5406 )
194
+		return $this->setStatusCode(406)
195
+					->setStatusText('fail')
196
+					->setErrorCode(5406)
197 197
 					->respondWithMessage();
198 198
 
199 199
 	}
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
209 209
      */
210 210
 	public function methodNotAllowed() {
211 211
 
212
-		return $this->setStatusCode( 405 )
213
-					->setStatusText( 'fail' )
214
-					->setErrorCode( 5405 )
212
+		return $this->setStatusCode(405)
213
+					->setStatusText('fail')
214
+					->setErrorCode(5405)
215 215
 					->respondWithMessage();
216 216
 
217 217
 	}
@@ -225,12 +225,12 @@  discard block
 block discarded – undo
225 225
      * @see
226 226
      * @author Shima Payro <[email protected]>
227 227
      */
228
-	public function validationErrors( $message = null ) {
228
+	public function validationErrors($message = null) {
229 229
 
230
-		return $this->setStatusCode( 420 )
231
-					->setStatusText( 'fail' )
232
-					->setErrorCode( 5420 )
233
-					->respondWithResult( $message );
230
+		return $this->setStatusCode(420)
231
+					->setStatusText('fail')
232
+					->setErrorCode(5420)
233
+					->respondWithResult($message);
234 234
 
235 235
 	}
236 236
 
@@ -245,9 +245,9 @@  discard block
 block discarded – undo
245 245
      */
246 246
 	public function requestFieldNotFound() {
247 247
 
248
-		return $this->setStatusCode( 446 )
249
-					->setStatusText( 'fail' )
250
-					->setErrorCode( 1001 )
248
+		return $this->setStatusCode(446)
249
+					->setStatusText('fail')
250
+					->setErrorCode(1001)
251 251
 					->respondWithMessage();
252 252
 
253 253
 	}
@@ -260,8 +260,8 @@  discard block
 block discarded – undo
260 260
 	 */
261 261
 	public function requestFieldDuplicated() {
262 262
 
263
-	  return $this->setStatusCode( 400 )
264
-					->setStatusText( 'fail' )
263
+	  return $this->setStatusCode(400)
264
+					->setStatusText('fail')
265 265
 					->SetErrorCode(1004)
266 266
 					->respondWithMessage();
267 267
 
@@ -274,11 +274,11 @@  discard block
 block discarded – undo
274 274
 	 * @param $code integer
275 275
 	 * @return mixed
276 276
 	 */
277
-	public function error( $code ) {
277
+	public function error($code) {
278 278
 
279
-	  return $this->setStatusCode( 400 )
280
-					->setStatusText( 'fail' )
281
-					->setErrorCode( $code )
279
+	  return $this->setStatusCode(400)
280
+					->setStatusText('fail')
281
+					->setErrorCode($code)
282 282
 					->respondWithMessage();
283 283
 
284 284
 	}
Please login to merge, or discard this patch.
src/Main.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	 * Haeders
33 33
 	 * @var array
34 34
 	 */
35
-	protected $headers = [];
35
+	protected $headers = [ ];
36 36
 
37 37
 	/**
38 38
 	 * @var string
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 		$this->lang = \App::getLocale();
55 55
 
56
-		if(! file_exists(config_path($this->lang . '.php'))){
56
+		if (!file_exists(config_path($this->lang . '.php'))) {
57 57
             $this->config = include __DIR__ . '/../errors/lang/' . $this->lang . '.php';
58 58
         } else {
59 59
             $this->config = include config_path($this->lang . '.php');
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 	 * @uses
84 84
 	 * @see
85 85
 	 */
86
-	public function setStatusCode( $statusCode ) {
86
+	public function setStatusCode($statusCode) {
87 87
 
88 88
 		$this->statusCode = $statusCode;
89 89
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	 * @uses
114 114
 	 * @see
115 115
 	 */
116
-	public function setStatusText( $statusText ) {
116
+	public function setStatusText($statusText) {
117 117
 
118 118
 		$this->statusText = $statusText;
119 119
 
@@ -130,15 +130,15 @@  discard block
 block discarded – undo
130 130
 	 * @uses
131 131
 	 * @see
132 132
 	 */
133
-	public function respond( $data ) {
133
+	public function respond($data) {
134 134
 
135
-		$result = array_filter( $this->getHeaders() );
135
+		$result = array_filter($this->getHeaders());
136 136
 
137
-		if ( empty( $result ) )
138
-			return response()->json( $data, $this->getStatusCode() );
137
+		if (empty($result))
138
+			return response()->json($data, $this->getStatusCode());
139 139
 
140
-		return response()->json( $data, $this->getStatusCode() )
141
-						->withHeaders( $this->getHeaders() );
140
+		return response()->json($data, $this->getStatusCode())
141
+						->withHeaders($this->getHeaders());
142 142
 
143 143
 	}
144 144
 
@@ -151,16 +151,16 @@  discard block
 block discarded – undo
151 151
 	 * @uses
152 152
 	 * @see
153 153
 	 */
154
-	public function respondWithMessage( $message = null ) {
154
+	public function respondWithMessage($message = null) {
155 155
 
156 156
 		$res[ 'status' ] = $this->getStatusText();
157 157
 
158 158
 		//if it's about failure
159
-		if ( $this->getErrorCode() ) {
159
+		if ($this->getErrorCode()) {
160 160
 
161 161
 			$res[ 'error' ] = $this->getErrorCode();
162 162
 
163
-			if ( is_null( $message ) )
163
+			if (is_null($message))
164 164
 		     $res[ 'message' ] = $this->getErrorMessage();
165 165
 		    else
166 166
 		     $res[ 'message' ] = $message;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 
172 172
 		}
173 173
 
174
-		return $this->respond( $res );
174
+		return $this->respond($res);
175 175
 
176 176
 	}
177 177
 
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 	 * @param $errorCode integer
183 183
 	 * @return $this
184 184
 	 */
185
-	public function setErrorCode( $errorCode ) {
185
+	public function setErrorCode($errorCode) {
186 186
 
187 187
 		$this->error = $this->config[ $errorCode ];
188 188
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 	 */
213 213
 	public function getErrorMessage() {
214 214
 
215
-		return $this->error['message'];
215
+		return $this->error[ 'message' ];
216 216
 
217 217
 	}
218 218
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	 * @since Sep 13, 2016
235 235
 	 * @return $this
236 236
 	 */
237
-	public function setHeaders( $headers = [] ) {
237
+	public function setHeaders($headers = [ ]) {
238 238
 
239 239
 		$this->headers = $headers;
240 240
 
@@ -251,12 +251,12 @@  discard block
 block discarded – undo
251 251
 	 * @uses
252 252
 	 * @see
253 253
 	 */
254
-	 public function respondWithResult( $data = NULL ) {
254
+	 public function respondWithResult($data = NULL) {
255 255
 
256 256
 		$res[ 'status' ] = $this->getStatusText();
257 257
 
258 258
 		//if it's about laravel validation error
259
-		if ( $this->getErrorCode() && $this->getStatusCode() == 420 ) {
259
+		if ($this->getErrorCode() && $this->getStatusCode() == 420) {
260 260
 
261 261
 			$res[ 'error' ] = $this->getErrorCode();
262 262
 			$res[ 'message' ] = $data;
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 
268 268
 		}
269 269
 
270
-		return $this->respond( $res );
270
+		return $this->respond($res);
271 271
 
272 272
 	}
273 273
 
Please login to merge, or discard this patch.