Skip to content

Commit 7ede6a3

Browse files
committed
Fix mess
- run php-cs-fixer - adjustment to phpmd - refactor Field class
1 parent 3970823 commit 7ede6a3

File tree

14 files changed

+258
-458
lines changed

14 files changed

+258
-458
lines changed

phpmd.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<ruleset name="My first PHPMD rule set"
2+
<ruleset name="PHP Mess Detector"
33
xmlns="http://pmd.sf.net/ruleset/1.0.0"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
@@ -62,7 +62,6 @@
6262
</rule>
6363

6464
<rule ref="rulesets/codesize.xml">
65-
<exclude name="TooManyPublicMethods"/>
6665
</rule>
6766

6867
<rule ref="rulesets/controversial.xml">

src/Data/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function model(AbstractModel $model): Collection
6464
* @throws SimplesRunTimeError
6565
* @link http://php.net/manual/en/language.oop5.overloading.php#language.oop5.overloading.members
6666
*/
67-
function __get($name): Collection
67+
public function __get($name): Collection
6868
{
6969
if (!method_exists($this, $name)) {
7070
throw new SimplesRunTimeError("Method '{$name}' not found");

src/Data/Error/SimplesValidationError.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ class SimplesValidationError extends SimplesRunTimeError
2222
*/
2323
public function __construct(array $details = [], string $message = '')
2424
{
25-
parent::__construct('Validation error' . ($message ? 'in `' . $message . '`' : '') , $details);
25+
parent::__construct('Validation error' . ($message ? 'in `' . $message . '`' : ''), $details);
2626
}
2727
}

src/Data/Record.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ public function getIterator()
322322
* which is a value of any type other than a resource.
323323
* @since 5.4.0
324324
*/
325-
function jsonSerialize()
325+
public function jsonSerialize()
326326
{
327327
return $this->public;
328328
}

src/Data/Validators/DatabaseValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function isNullable($value)
3434
* @param $value
3535
* @return bool
3636
*/
37-
public function isReject ($value): bool
37+
public function isReject($value): bool
3838
{
3939
return empty($value);
4040
}

src/Http/Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ public function withRequestTarget($requestTarget)
522522
public function withMethod($method)
523523
{
524524
if (!in_array($method, Http::METHODS)) {
525-
525+
throw new \InvalidArgumentException("The method `{$method}` is not valid");
526526
}
527527
$copy = clone $this;
528528
$copy->method = $method;

src/Kernel/HttpHandler.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ private function controller($callback)
167167
}
168168

169169
if (isset($class) && isset($method) && method_exists($class, $method)) {
170-
171170
/** @var \Simples\Core\Http\Controller $controller */
172171
$controller = Container::box()->make($class);
173172
if (!($controller instanceof Controller)) {
@@ -207,7 +206,6 @@ private function parameters($callable, $method = null)
207206
private function call($callback, $parameters)
208207
{
209208
ob_start();
210-
211209
try {
212210
$result = call_user_func_array($callback, $parameters);
213211
} catch (Throwable $throw) {

src/Message/Mail.php

Lines changed: 26 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,7 @@ public function schedule(): bool
199199
* @param $filename
200200
* @return Mail
201201
*/
202-
public
203-
static function load($filename): Mail
202+
public static function load($filename): Mail
204203
{
205204
$instance = new static();
206205
if (File::exists($filename)) {
@@ -217,8 +216,7 @@ static function load($filename): Mail
217216
/**
218217
* @return string
219218
*/
220-
public
221-
function json()
219+
public function json()
222220
{
223221
$properties = [];
224222
foreach ($this as $key => $value) {
@@ -232,8 +230,7 @@ function json()
232230
* @param $address
233231
* @param string $name
234232
*/
235-
public
236-
function addCC($address, $name = '')
233+
public function addCC($address, $name = '')
237234
{
238235
$this->ccs[] = (object)['address' => $address, 'name' => $name];
239236
}
@@ -243,8 +240,7 @@ function addCC($address, $name = '')
243240
* @param string $description
244241
* @return bool
245242
*/
246-
public
247-
function addAttachment($filename, $description = '')
243+
public function addAttachment($filename, $description = '')
248244
{
249245
if (File::exists($filename)) {
250246
$this->attachments[] = (object)['filename' => $filename, 'description' => $description];
@@ -256,197 +252,175 @@ function addAttachment($filename, $description = '')
256252
/**
257253
* @return string
258254
*/
259-
public
260-
function getSubject()
255+
public function getSubject()
261256
{
262257
return $this->subject;
263258
}
264259

265260
/**
266261
* @param string $subject
267262
*/
268-
public
269-
function setSubject($subject)
263+
public function setSubject($subject)
270264
{
271265
$this->subject = $subject;
272266
}
273267

274268
/**
275269
* @return string
276270
*/
277-
public
278-
function getMessage()
271+
public function getMessage()
279272
{
280273
return $this->message;
281274
}
282275

283276
/**
284277
* @param string $message
285278
*/
286-
public
287-
function setMessage($message)
279+
public function setMessage($message)
288280
{
289281
$this->message = $message;
290282
}
291283

292284
/**
293285
* @return string
294286
*/
295-
public
296-
function getToAddress()
287+
public function getToAddress()
297288
{
298289
return $this->toAddress;
299290
}
300291

301292
/**
302293
* @param string $toAddress
303294
*/
304-
public
305-
function setToAddress($toAddress)
295+
public function setToAddress($toAddress)
306296
{
307297
$this->toAddress = $toAddress;
308298
}
309299

310300
/**
311301
* @return string
312302
*/
313-
public
314-
function getToName()
303+
public function getToName()
315304
{
316305
return $this->toName;
317306
}
318307

319308
/**
320309
* @param string $toName
321310
*/
322-
public
323-
function setToName($toName)
311+
public function setToName($toName)
324312
{
325313
$this->toName = $toName;
326314
}
327315

328316
/**
329317
* @return string
330318
*/
331-
public
332-
function getAlt()
319+
public function getAlt()
333320
{
334321
return $this->alt;
335322
}
336323

337324
/**
338325
* @param string $alt
339326
*/
340-
public
341-
function setAlt($alt)
327+
public function setAlt($alt)
342328
{
343329
$this->alt = $alt;
344330
}
345331

346332
/**
347333
* @return string
348334
*/
349-
public
350-
function getFromAddress()
335+
public function getFromAddress()
351336
{
352337
return $this->fromAddress;
353338
}
354339

355340
/**
356341
* @param string $fromAddress
357342
*/
358-
public
359-
function setFromAddress($fromAddress)
343+
public function setFromAddress($fromAddress)
360344
{
361345
$this->fromAddress = $fromAddress;
362346
}
363347

364348
/**
365349
* @return string
366350
*/
367-
public
368-
function getFromName()
351+
public function getFromName()
369352
{
370353
return $this->fromName;
371354
}
372355

373356
/**
374357
* @param string $fromName
375358
*/
376-
public
377-
function setFromName($fromName)
359+
public function setFromName($fromName)
378360
{
379361
$this->fromName = $fromName;
380362
}
381363

382364
/**
383365
* @return string
384366
*/
385-
public
386-
function getReplyToAddress()
367+
public function getReplyToAddress()
387368
{
388369
return $this->replyToAddress;
389370
}
390371

391372
/**
392373
* @param string $replyToAddress
393374
*/
394-
public
395-
function setReplyToAddress($replyToAddress)
375+
public function setReplyToAddress($replyToAddress)
396376
{
397377
$this->replyToAddress = $replyToAddress;
398378
}
399379

400380
/**
401381
* @return string
402382
*/
403-
public
404-
function getReplyToName()
383+
public function getReplyToName()
405384
{
406385
return $this->replyToName;
407386
}
408387

409388
/**
410389
* @param string $replyToName
411390
*/
412-
public
413-
function setReplyToName($replyToName)
391+
public function setReplyToName($replyToName)
414392
{
415393
$this->replyToName = $replyToName;
416394
}
417395

418396
/**
419397
* @return array
420398
*/
421-
public
422-
function getAttachments()
399+
public function getAttachments()
423400
{
424401
return $this->attachments;
425402
}
426403

427404
/**
428405
* @param array $attachments
429406
*/
430-
public
431-
function setAttachments($attachments)
407+
public function setAttachments($attachments)
432408
{
433409
$this->attachments = $attachments;
434410
}
435411

436412
/**
437413
* @return array
438414
*/
439-
public
440-
function getCcs()
415+
public function getCcs()
441416
{
442417
return $this->ccs;
443418
}
444419

445420
/**
446421
* @param array $ccs
447422
*/
448-
public
449-
function setCcs($ccs)
423+
public function setCcs($ccs)
450424
{
451425
$this->ccs = $ccs;
452426
}

0 commit comments

Comments
 (0)