Skip to content

Commit 91ff927

Browse files
peter279kpeter279k
committed
Using PSR-2 coding style for this source code
1 parent 064f3ac commit 91ff927

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+159
-211
lines changed

‎.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ php:
77

88
before_script:
99
- composer install
10+
- ./vendor/bin/phpcs -n --standard=PSR2 src/ tests/
1011

11-
script: phpunit --coverage-text
12+
script:
13+
- phpunit --coverage-text

‎composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"ext-mbstring": "*"
2424
},
2525
"require-dev": {
26-
"phpunit/phpunit": "^6.5"
26+
"phpunit/phpunit": "^6.5",
27+
"squizlabs/php_codesniffer": "^3"
2728
}
2829
}

‎src/Attribute.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function __construct(Validation $validation, $key, $alias = null, array $
2626
$this->validation = $validation;
2727
$this->alias = $alias;
2828
$this->key = $key;
29-
foreach($rules as $rule) {
29+
foreach ($rules as $rule) {
3030
$this->addRule($rule);
3131
}
3232
}
@@ -49,7 +49,7 @@ public function getPrimaryAttribute()
4949
public function setOtherAttributes(array $otherAttributes)
5050
{
5151
$this->otherAttributes = [];
52-
foreach($otherAttributes as $otherAttribute) {
52+
foreach ($otherAttributes as $otherAttribute) {
5353
$this->addOtherAttribute($otherAttribute);
5454
}
5555
}
@@ -149,7 +149,7 @@ public function getHumanizedKey()
149149
// Resolve key from array validation
150150
if ($primaryAttribute) {
151151
$split = explode('.', $key);
152-
$key = implode(' ', array_map(function($word) {
152+
$key = implode(' ', array_map(function ($word) {
153153
if (is_numeric($word)) {
154154
$word = $word + 1;
155155
}
@@ -169,5 +169,4 @@ public function getAlias()
169169
{
170170
return $this->alias;
171171
}
172-
173172
}

‎src/ErrorBag.php

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function has($key)
3838
if (!$ruleName) {
3939
return !empty($messages);
4040
} else {
41-
return !empty($messages) AND isset($messages[$ruleName]);
41+
return !empty($messages) and isset($messages[$ruleName]);
4242
}
4343
}
4444
}
@@ -71,15 +71,17 @@ public function get($key, $format = ':message')
7171
$results = [];
7272
if ($this->isWildcardKey($key)) {
7373
$messages = $this->filterMessagesForWildcardKey($key, $ruleName);
74-
foreach($messages as $explicitKey => $keyMessages) {
74+
foreach ($messages as $explicitKey => $keyMessages) {
7575
foreach ($keyMessages as $rule => $message) {
7676
$results[$explicitKey][$rule] = $this->formatMessage($message, $format);
7777
}
7878
}
7979
} else {
8080
$keyMessages = isset($this->messages[$key])? $this->messages[$key] : [];
81-
foreach($keyMessages as $rule => $message) {
82-
if ($ruleName AND $ruleName != $rule) continue;
81+
foreach ($keyMessages as $rule => $message) {
82+
if ($ruleName and $ruleName != $rule) {
83+
continue;
84+
}
8385
$results[$rule] = $this->formatMessage($message, $format);
8486
}
8587
}
@@ -91,8 +93,8 @@ public function all($format = ':message')
9193
{
9294
$messages = $this->messages;
9395
$results = [];
94-
foreach($messages as $key => $keyMessages) {
95-
foreach($keyMessages as $message) {
96+
foreach ($messages as $key => $keyMessages) {
97+
foreach ($keyMessages as $message) {
9698
$results[] = $this->formatMessage($message, $format);
9799
}
98100
}
@@ -103,7 +105,7 @@ public function firstOfAll($format = ':message', $dotNotation = false)
103105
{
104106
$messages = $this->messages;
105107
$results = [];
106-
foreach($messages as $key => $keyMessages) {
108+
foreach ($messages as $key => $keyMessages) {
107109
if ($dotNotation) {
108110
$results[$key] = $this->formatMessage(array_shift($messages[$key]), $format);
109111
} else {
@@ -144,8 +146,10 @@ protected function filterMessagesForWildcardKey($key, $ruleName = null)
144146
continue;
145147
}
146148

147-
foreach($keyMessages as $rule => $message) {
148-
if ($ruleName AND $rule != $ruleName) continue;
149+
foreach ($keyMessages as $rule => $message) {
150+
if ($ruleName and $rule != $ruleName) {
151+
continue;
152+
}
149153
$filteredMessages[$k][$rule] = $message;
150154
}
151155
}
@@ -157,5 +161,4 @@ protected function formatMessage($message, $format)
157161
{
158162
return str_replace(':message', $message, $format);
159163
}
160-
161164
}

‎src/Helper.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,5 +204,4 @@ public static function snakeCase($value, $delimiter = '_')
204204

205205
return $value;
206206
}
207-
208207
}

‎src/MimeTypeGuesser.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,5 +788,4 @@ public function getMimeType($extension)
788788
$key = array_search($extension, $this->mimeTypes);
789789
return $key ?: null;
790790
}
791-
792791
}

‎src/Rule.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ abstract class Rule
1616

1717
protected $params = [];
1818

19-
protected $fillable_params = [];
19+
protected $fillableParams = [];
2020

2121
protected $message = "The :attribute is invalid";
2222

@@ -66,8 +66,10 @@ public function setParameter($key, $value)
6666

6767
public function fillParameters(array $params)
6868
{
69-
foreach($this->fillable_params as $key) {
70-
if (empty($params)) break;
69+
foreach ($this->fillableParams as $key) {
70+
if (empty($params)) {
71+
break;
72+
}
7173
$this->params[$key] = array_shift($params);
7274
}
7375
return $this;
@@ -101,12 +103,11 @@ public function getMessage()
101103

102104
protected function requireParameters(array $params)
103105
{
104-
foreach($params as $param) {
106+
foreach ($params as $param) {
105107
if (!isset($this->params[$param])) {
106108
$rule = $this->getKey();
107109
throw new MissingRequiredParameterException("Missing required parameter '{$param}' on rule '{$rule}'");
108110
}
109111
}
110112
}
111-
112113
}

‎src/Rules/Accepted.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ public function check($value)
1515
$acceptables = ['yes', 'on', '1', 1, true, 'true'];
1616
return in_array($value, $acceptables, true);
1717
}
18-
1918
}

‎src/Rules/After.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ class After extends Rule
1111

1212
protected $message = "The :attribute must be a date after :time.";
1313

14-
protected $fillable_params = ['time'];
14+
protected $fillableParams = ['time'];
1515

1616
public function check($value)
1717
{
18-
$this->requireParameters($this->fillable_params);
18+
$this->requireParameters($this->fillableParams);
1919
$time = $this->parameter('time');
2020

21-
if (!$this->isValidDate($value)){
21+
if (!$this->isValidDate($value)) {
2222
throw $this->throwException($value);
2323
}
2424

‎src/Rules/Alpha.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ public function check($value)
1313
{
1414
return is_string($value) && preg_match('/^[\pL\pM]+$/u', $value);
1515
}
16-
1716
}

0 commit comments

Comments
 (0)