Skip to content

Commit 1c6c80f

Browse files
inxilproStyleCIBot
authored andcommitted
Apply fixes from StyleCI
1 parent 1bab8eb commit 1c6c80f

31 files changed

+1907
-1907
lines changed

config/addressing.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

33
return [
4-
/*
4+
/*
55
|--------------------------------------------------------------------------
66
| Route Configuration
77
|--------------------------------------------------------------------------
88
*/
9-
'routes' => [
10-
'enabled' => true,
11-
'prefix' => 'galahad/addressing',
12-
],
9+
'routes' => [
10+
'enabled' => true,
11+
'prefix' => 'galahad/addressing',
12+
],
1313
];

lang/en/validation.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

33
return [
4-
'country' => 'The :attribute field is not a valid country.',
5-
'country_name' => 'The :attribute field is not a valid country name.',
6-
'country_code' => 'The :attribute field is not a valid country code.',
7-
'administrative_area' => 'The :attribute field is not a valid :type.',
8-
'administrative_area_code' => 'The :attribute field is not a valid :type code.',
9-
'administrative_area_name' => 'The :attribute field is not a valid :type name.',
10-
'postal_code' => 'The :attribute field does not seem to be a valid :type.',
4+
'country' => 'The :attribute field is not a valid country.',
5+
'country_name' => 'The :attribute field is not a valid country name.',
6+
'country_code' => 'The :attribute field is not a valid country code.',
7+
'administrative_area' => 'The :attribute field is not a valid :type.',
8+
'administrative_area_code' => 'The :attribute field is not a valid :type code.',
9+
'administrative_area_name' => 'The :attribute field is not a valid :type name.',
10+
'postal_code' => 'The :attribute field does not seem to be a valid :type.',
1111
];

lang/pt-br/validation.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

33
return [
4-
'country' => 'O campo :attribute não possui um nome de país válido.',
5-
'country_name' => 'O campo :attribute não possui um nome de país válido.',
6-
'country_code' => 'O campo :attribute não possui um código de país válido.',
7-
'administrative_area' => 'O campo :attribute não possui uma área administrativa válida.',
8-
'administrative_area_code' => 'O campo :attribute não possui um código válido de área administrativa.',
9-
'administrative_area_name' => 'O campo :attribute não possui um nome válido de área administrativa.',
10-
'postal_code' => 'O campo :attribute para não ter um código postal válido.',
4+
'country' => 'O campo :attribute não possui um nome de país válido.',
5+
'country_name' => 'O campo :attribute não possui um nome de país válido.',
6+
'country_code' => 'O campo :attribute não possui um código de país válido.',
7+
'administrative_area' => 'O campo :attribute não possui uma área administrativa válida.',
8+
'administrative_area_code' => 'O campo :attribute não possui um código válido de área administrativa.',
9+
'administrative_area_name' => 'O campo :attribute não possui um nome válido de área administrativa.',
10+
'postal_code' => 'O campo :attribute para não ter um código postal válido.',
1111
];

src/Collection/AdministrativeAreaCollection.php

+82-82
Original file line numberDiff line numberDiff line change
@@ -6,95 +6,95 @@
66

77
class AdministrativeAreaCollection extends SubdivisionCollection
88
{
9-
/**
10-
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea[]
11-
*/
12-
public function all(): array
13-
{
14-
return parent::all();
15-
}
9+
/**
10+
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea[]
11+
*/
12+
public function all(): array
13+
{
14+
return parent::all();
15+
}
1616

17-
/**
18-
* @param string $key
19-
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea|null $default
20-
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea|null
21-
*/
22-
public function get($key, $default = null): ?Subdivision
23-
{
24-
return parent::get($key, $default);
25-
}
17+
/**
18+
* @param string $key
19+
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea|null $default
20+
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea|null
21+
*/
22+
public function get($key, $default = null): ?Subdivision
23+
{
24+
return parent::get($key, $default);
25+
}
2626

27-
/**
28-
* @param callable|null $callback
29-
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea $default
30-
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea|null
31-
*/
32-
public function last(callable $callback = null, $default = null): ?Subdivision
33-
{
34-
return parent::last($callback, $default);
35-
}
27+
/**
28+
* @param callable|null $callback
29+
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea $default
30+
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea|null
31+
*/
32+
public function last(callable $callback = null, $default = null): ?Subdivision
33+
{
34+
return parent::last($callback, $default);
35+
}
3636

37-
/**
38-
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea|null
39-
*/
40-
public function pop(): ?Subdivision
41-
{
42-
return parent::pop();
43-
}
37+
/**
38+
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea|null
39+
*/
40+
public function pop(): ?Subdivision
41+
{
42+
return parent::pop();
43+
}
4444

45-
/**
46-
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea $value
47-
* @param null $key
48-
* @return \Galahad\LaravelAddressing\Collection\AdministrativeAreaCollection
49-
*/
50-
public function prepend($value, $key = null): SubdivisionCollection
51-
{
52-
return parent::prepend($value, $key);
53-
}
45+
/**
46+
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea $value
47+
* @param null $key
48+
* @return \Galahad\LaravelAddressing\Collection\AdministrativeAreaCollection
49+
*/
50+
public function prepend($value, $key = null): SubdivisionCollection
51+
{
52+
return parent::prepend($value, $key);
53+
}
5454

55-
/**
56-
* @param string $key
57-
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea|null $default
58-
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea|null
59-
*/
60-
public function pull($key, $default = null): ?Subdivision
61-
{
62-
return parent::pull($key, $default);
63-
}
55+
/**
56+
* @param string $key
57+
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea|null $default
58+
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea|null
59+
*/
60+
public function pull($key, $default = null): ?Subdivision
61+
{
62+
return parent::pull($key, $default);
63+
}
6464

65-
/**
66-
* @param string $key
67-
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea $value
68-
* @return \Galahad\LaravelAddressing\Collection\AdministrativeAreaCollection
69-
*/
70-
public function put($key, $value): SubdivisionCollection
71-
{
72-
return parent::put($key, $value);
73-
}
65+
/**
66+
* @param string $key
67+
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea $value
68+
* @return \Galahad\LaravelAddressing\Collection\AdministrativeAreaCollection
69+
*/
70+
public function put($key, $value): SubdivisionCollection
71+
{
72+
return parent::put($key, $value);
73+
}
7474

75-
/**
76-
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea[]
77-
*/
78-
public function toArray(): array
79-
{
80-
return parent::toArray();
81-
}
75+
/**
76+
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea[]
77+
*/
78+
public function toArray(): array
79+
{
80+
return parent::toArray();
81+
}
8282

83-
/**
84-
* @param string $key
85-
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea|null
86-
*/
87-
public function offsetGet($key): ?Subdivision
88-
{
89-
return parent::offsetGet($key);
90-
}
83+
/**
84+
* @param string $key
85+
* @return \Galahad\LaravelAddressing\Entity\AdministrativeArea|null
86+
*/
87+
public function offsetGet($key): ?Subdivision
88+
{
89+
return parent::offsetGet($key);
90+
}
9191

92-
/**
93-
* @param string $key
94-
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea $value
95-
*/
96-
public function offsetSet($key, $value): void
97-
{
98-
parent::offsetSet($key, $value);
99-
}
92+
/**
93+
* @param string $key
94+
* @param \Galahad\LaravelAddressing\Entity\AdministrativeArea $value
95+
*/
96+
public function offsetSet($key, $value): void
97+
{
98+
parent::offsetSet($key, $value);
99+
}
100100
}

src/Collection/CountryCollection.php

+70-70
Original file line numberDiff line numberDiff line change
@@ -7,85 +7,85 @@
77

88
class CountryCollection extends Collection
99
{
10-
/**
11-
* @return \Galahad\LaravelAddressing\Entity\Country[]
12-
*/
13-
public function all(): array
14-
{
15-
return parent::all();
16-
}
10+
/**
11+
* @return \Galahad\LaravelAddressing\Entity\Country[]
12+
*/
13+
public function all(): array
14+
{
15+
return parent::all();
16+
}
1717

18-
public function get($key, $default = null): ?Country
19-
{
20-
return parent::get($key, $default);
21-
}
18+
public function get($key, $default = null): ?Country
19+
{
20+
return parent::get($key, $default);
21+
}
2222

23-
public function keys(): Collection
24-
{
25-
return new Collection(array_keys($this->items));
26-
}
23+
public function keys(): Collection
24+
{
25+
return new Collection(array_keys($this->items));
26+
}
2727

28-
public function last(callable $callback = null, $default = null): ?Country
29-
{
30-
return parent::last($callback, $default);
31-
}
28+
public function last(callable $callback = null, $default = null): ?Country
29+
{
30+
return parent::last($callback, $default);
31+
}
3232

33-
public function pop($count = 1): ?Country
34-
{
35-
return parent::pop($count);
36-
}
33+
public function pop($count = 1): ?Country
34+
{
35+
return parent::pop($count);
36+
}
3737

38-
/**
39-
* @param \Galahad\LaravelAddressing\Entity\Country $value
40-
* @param null $key
41-
* @return \Galahad\LaravelAddressing\Collection\CountryCollection
42-
*/
43-
public function prepend($value, $key = null): self
44-
{
45-
return parent::prepend($value, $key);
46-
}
38+
/**
39+
* @param \Galahad\LaravelAddressing\Entity\Country $value
40+
* @param null $key
41+
* @return \Galahad\LaravelAddressing\Collection\CountryCollection
42+
*/
43+
public function prepend($value, $key = null): self
44+
{
45+
return parent::prepend($value, $key);
46+
}
4747

48-
public function pull($key, $default = null): ?Country
49-
{
50-
return parent::pull($key, $default);
51-
}
48+
public function pull($key, $default = null): ?Country
49+
{
50+
return parent::pull($key, $default);
51+
}
5252

53-
/**
54-
* @param mixed $key
55-
* @param Country $value
56-
* @return \Galahad\LaravelAddressing\Collection\CountryCollection
57-
*/
58-
public function put($key, $value): self
59-
{
60-
return parent::put($key, $value);
61-
}
53+
/**
54+
* @param mixed $key
55+
* @param Country $value
56+
* @return \Galahad\LaravelAddressing\Collection\CountryCollection
57+
*/
58+
public function put($key, $value): self
59+
{
60+
return parent::put($key, $value);
61+
}
6262

63-
/**
64-
* @return \Galahad\LaravelAddressing\Entity\Country[]
65-
*/
66-
public function toArray(): array
67-
{
68-
return parent::toArray();
69-
}
63+
/**
64+
* @return \Galahad\LaravelAddressing\Entity\Country[]
65+
*/
66+
public function toArray(): array
67+
{
68+
return parent::toArray();
69+
}
7070

71-
public function toSelectArray(): array
72-
{
73-
return $this->mapWithKeys(static function (Country $country) {
74-
return [$country->getCountryCode() => $country->getName()];
75-
})->toArray();
76-
}
71+
public function toSelectArray(): array
72+
{
73+
return $this->mapWithKeys(static function (Country $country) {
74+
return [$country->getCountryCode() => $country->getName()];
75+
})->toArray();
76+
}
7777

78-
public function offsetGet($key): ?Country
79-
{
80-
return parent::offsetGet($key);
81-
}
78+
public function offsetGet($key): ?Country
79+
{
80+
return parent::offsetGet($key);
81+
}
8282

83-
/**
84-
* @param mixed $key
85-
* @param \Galahad\LaravelAddressing\Entity\Country $value
86-
*/
87-
public function offsetSet($key, $value): void
88-
{
89-
parent::offsetSet($key, $value);
90-
}
83+
/**
84+
* @param mixed $key
85+
* @param \Galahad\LaravelAddressing\Entity\Country $value
86+
*/
87+
public function offsetSet($key, $value): void
88+
{
89+
parent::offsetSet($key, $value);
90+
}
9191
}

0 commit comments

Comments
 (0)