Skip to content

Commit e46cc5f

Browse files
TomasVotrubaTomasVotruba
committed
misc
1 parent f9aea3e commit e46cc5f

10 files changed

+51
-42
lines changed

‎ecs.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
return ECSConfig::configure()
88
->withPaths([__DIR__ . '/src', __DIR__ . '/tests'])
9-
->withPreparedSets(psr12: true);
9+
->withPreparedSets(psr12: true, common: true);

‎src/CakePHP/PortedInflector.php

+18-18
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ final class PortedInflector
1414
*
1515
* @var array<string, mixed[]>
1616
*/
17-
protected static $_plural = array(
18-
'rules' => array(
17+
private static $_plural = [
18+
'rules' => [
1919
'/(s)tatus$/i' => '\1tatuses',
2020
'/(quiz)$/i' => '\1zes',
2121
'/^(ox)$/i' => '\1\2en',
@@ -38,8 +38,8 @@ final class PortedInflector
3838
'/s$/' => 's',
3939
'/^$/' => '',
4040
'/$/' => 's',
41-
),
42-
'uninflected' => array(
41+
],
42+
'uninflected' => [
4343
'.*[nrlm]ese',
4444
'.*data',
4545
'.*deer',
@@ -50,9 +50,9 @@ final class PortedInflector
5050
'.*sheep',
5151
'people',
5252
'feedback',
53-
'stadia'
54-
),
55-
'irregular' => array(
53+
'stadia',
54+
],
55+
'irregular' => [
5656
'atlas' => 'atlases',
5757
'beef' => 'beefs',
5858
'brief' => 'briefs',
@@ -92,16 +92,16 @@ final class PortedInflector
9292
'tooth' => 'teeth',
9393
'goose' => 'geese',
9494
'foot' => 'feet',
95-
'sieve' => 'sieves'
96-
)
97-
);
95+
'sieve' => 'sieves',
96+
],
97+
];
9898

9999
/**
100100
* Words that should not be inflected
101101
*
102102
* @var array
103103
*/
104-
protected static $_uninflected = array(
104+
private static $_uninflected = [
105105
'Amoyese',
106106
'bison',
107107
'Borghese',
@@ -181,15 +181,15 @@ final class PortedInflector
181181
'Wenchowese',
182182
'whiting',
183183
'wildebeest',
184-
'Yengeese'
185-
);
184+
'Yengeese',
185+
];
186186

187187
/**
188188
* Method cache array.
189189
*
190190
* @var array
191191
*/
192-
protected static $_cache = array();
192+
private static $_cache = [];
193193

194194
/**
195195
* Returns corresponding table name for given model $className. ("people" for the model class "Person").
@@ -200,7 +200,7 @@ final class PortedInflector
200200
*/
201201
public static function tableize($className)
202202
{
203-
return PortedInflector::pluralize(PortedInflector::underscore($className));
203+
return self::pluralize(self::underscore($className));
204204
}
205205

206206
/**
@@ -216,18 +216,18 @@ public static function pluralize($word)
216216
return static::$_cache['pluralize'][$word];
217217
}
218218

219-
if (!isset(static::$_plural['merged']['irregular'])) {
219+
if (! isset(static::$_plural['merged']['irregular'])) {
220220
static::$_plural['merged']['irregular'] = static::$_plural['irregular'];
221221
}
222222

223-
if (!isset(static::$_plural['merged']['uninflected'])) {
223+
if (! isset(static::$_plural['merged']['uninflected'])) {
224224
static::$_plural['merged']['uninflected'] = array_merge(
225225
static::$_plural['uninflected'],
226226
static::$_uninflected
227227
);
228228
}
229229

230-
if (!isset(static::$_plural['cacheUninflected']) || !isset(static::$_plural['cacheIrregular'])) {
230+
if (! isset(static::$_plural['cacheUninflected']) || ! isset(static::$_plural['cacheIrregular'])) {
231231
static::$_plural['cacheUninflected'] = '(?:' . implode(
232232
'|',
233233
static::$_plural['merged']['uninflected']

‎src/ClassMethodExtension/ModelMethodExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static function (
7070
return $methodReflection->getName() === $methodName;
7171
}
7272
);
73-
if (!$methodReflections) {
73+
if (! $methodReflections) {
7474
throw new Exception('Method not found');
7575
}
7676
return reset($methodReflections);

‎src/ClassPropertyExtension/ClassComponentPropertyExtension.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function __construct(ReflectionProvider $reflectionProvider)
2828

2929
public function hasProperty(ClassReflection $classReflection, string $propertyName): bool
3030
{
31-
if (!array_filter($this->getContainingClassNames(), [$classReflection, 'is'])) {
31+
if (! array_filter($this->getContainingClassNames(), [$classReflection, 'is'])) {
3232
return false;
3333
}
3434

@@ -37,7 +37,7 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
3737
static fn (string $componentName): bool => $componentName === $propertyName
3838
);
3939

40-
if (!$isDefinedInComponentsProperty) {
40+
if (! $isDefinedInComponentsProperty) {
4141
return false;
4242
}
4343

@@ -80,15 +80,15 @@ private function getDefinedComponentsAsList(ClassReflection $classReflection): a
8080
$definedComponents = [];
8181

8282
foreach (array_merge([$classReflection], $classReflection->getParents()) as $class) {
83-
if (!$class->hasProperty('components')) {
83+
if (! $class->hasProperty('components')) {
8484
continue;
8585
}
8686

8787
$defaultValue = $class->getNativeProperty('components')
8888
->getNativeReflection()
8989
->getDefaultValueExpression();
9090

91-
if (!$defaultValue instanceof Array_) {
91+
if (! $defaultValue instanceof Array_) {
9292
continue;
9393
}
9494

‎src/ModelBehaviorMethodExtractor.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private function filterBehaviorMethods(
6969
ExtendedMethodReflection $methodReflection
7070
): bool {
7171
return $methodReflection->isPublic()
72-
&& !$methodReflection->isStatic()
72+
&& ! $methodReflection->isStatic()
7373
&& array_filter(
7474
$methodReflection->getVariants(),
7575
[$this, 'filterBehaviorMethodVariants']
@@ -87,7 +87,7 @@ private function filterBehaviorMethodVariants(
8787
/** @var ParameterReflection|null $firstParameter */
8888
$firstParameter = array_shift($parameters);
8989

90-
if (!$firstParameter) {
90+
if (! $firstParameter) {
9191
return false;
9292
}
9393

‎src/Reflection/ClassReflectionFinder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private function getClassNamesFromPaths(
6161
$classPaths = [];
6262
foreach ($paths as $path) {
6363
$filePaths = glob($path);
64-
if (!is_array($filePaths)) {
64+
if (! is_array($filePaths)) {
6565
throw new Exception(sprintf('glob(%s) caused an error', $path));
6666
}
6767
$classPaths = array_merge($classPaths, $filePaths);

‎src/ReturnTypeExtension/ClassRegistryInitExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
4949
{
5050
$argumentType = $scope->getType($methodCall->getArgs()[0]->value);
5151

52-
if (!$argumentType instanceof ConstantStringType) {
52+
if (! $argumentType instanceof ConstantStringType) {
5353
return $this->getDefaultType();
5454
}
5555

‎src/ReturnTypeExtension/LoadComponentOnFlyMethodReturnTypeExtension.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
3636
{
3737
$arg = $methodCall->getArgs()[0]->value;
3838

39-
if (!$arg instanceof String_) {
39+
if (! $arg instanceof String_) {
4040
return null;
4141
}
4242

4343
$componentName = $arg->value . 'Component';
4444

45-
if (!$this->reflectionProvider->hasClass($componentName)) {
45+
if (! $this->reflectionProvider->hasClass($componentName)) {
4646
return null;
4747
}
4848

49-
if (!$this->reflectionProvider->getClass($componentName)->is('Component')) {
49+
if (! $this->reflectionProvider->getClass($componentName)->is('Component')) {
5050
return null;
5151
}
5252

‎src/Service/SchemaService.php

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ final class SchemaService
3131
private ?array $tableSchemas = null;
3232

3333
/**
34-
* @param ReflectionProvider $reflectionProvider
3534
* @param array<string> $schemaPaths
3635
*/
3736
public function __construct(

‎tests/Source/Config/Schema/app.php

+20-10
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,38 @@ class AppSchema extends CakeSchema
77
/**
88
* @var array<string, mixed>
99
*/
10-
public $basic_models = array(
11-
'id' => array(
10+
public $basic_models = [
11+
'id' => [
1212
'type' => 'integer',
1313
'null' => false,
1414
'default' => null,
1515
'length' => 10,
1616
'key' => 'primary',
17-
),
18-
'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)),
19-
);
17+
],
18+
'indexes' => [
19+
'PRIMARY' => [
20+
'column' => 'id',
21+
'unique' => 1,
22+
],
23+
],
24+
];
2025

2126
/**
2227
* @var array<string, mixed>
2328
*/
24-
public $table_without_models = array(
25-
'id' => array(
29+
public $table_without_models = [
30+
'id' => [
2631
'type' => 'integer',
2732
'null' => false,
2833
'default' => null,
2934
'length' => 10,
3035
'key' => 'primary',
31-
),
32-
'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)),
33-
);
36+
],
37+
'indexes' => [
38+
'PRIMARY' => [
39+
'column' => 'id',
40+
'unique' => 1,
41+
],
42+
],
43+
];
3444
}

0 commit comments

Comments
 (0)