Skip to content

Commit 11e2801

Browse files
committed
Upgrade dev depedencices and wrkflow/php-get-typed-value to 0.8.2
1 parent 06543bc commit 11e2801

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"php-http/discovery": "^1.14",
1717
"psr/http-client": "^1.0.1",
1818
"psr/http-message": "^1.0.1",
19-
"wrkflow/php-get-typed-value": "^0.8.0"
19+
"wrkflow/php-get-typed-value": "^0.8.2"
2020
},
2121
"require-dev": {
2222
"ext-simplexml": "*",
@@ -27,13 +27,13 @@
2727
"league/flysystem": "^3.14",
2828
"mockery/mockery": "^1.5.1",
2929
"nyholm/psr7": "^1.8.0",
30-
"phpstan/phpstan": "^1.10.14",
30+
"phpstan/phpstan": "1.10.26",
3131
"phpstan/phpstan-deprecation-rules": "^1.1.3",
3232
"phpstan/phpstan-mockery": "^1.1.1",
33-
"phpstan/phpstan-phpunit": "^1.3.11",
34-
"phpunit/phpunit": "^9.5.20",
35-
"rector/rector": "^0.15.25",
36-
"symplify/easy-coding-standard": "^11.3.2"
33+
"phpstan/phpstan-phpunit": "1.3.13",
34+
"phpunit/phpunit": "9.5.21",
35+
"rector/rector": "0.17.7",
36+
"symplify/easy-coding-standard": "11.5.0"
3737
},
3838
"suggest": {
3939
"laravel/framework": "SDKs work great with Laravel - solid container.",

rector.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
declare(strict_types=1);
44

5-
use Rector\CodingStyle\Rector\ClassConst\VarConstantCommentRector;
5+
use Rector\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector;
66
use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
77
use Rector\Config\RectorConfig;
88
use Rector\Core\ValueObject\PhpVersion;
99
use Rector\Set\ValueObject\LevelSetList;
1010
use Rector\Set\ValueObject\SetList;
11-
use Rector\Strict\Rector\AbstractFalsyScalarRuleFixerRector;
1211
use Rector\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector;
1312
use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
1413

@@ -22,18 +21,20 @@
2221
$config->import(SetList::CODING_STYLE);
2322
$config->importNames();
2423

25-
$config->rule(rectorClass: AddVoidReturnTypeWhereNoReturnRector::class);
24+
$config->ruleWithConfiguration(AddVoidReturnTypeWhereNoReturnRector::class, [
25+
AddVoidReturnTypeWhereNoReturnRector::USE_PHPDOC => false,
26+
]);
2627
$config->ruleWithConfiguration(
2728
rectorClass: BooleanInBooleanNotRuleFixerRector::class,
2829
configuration: [
29-
AbstractFalsyScalarRuleFixerRector::TREAT_AS_NON_EMPTY => false,
30+
BooleanInBooleanNotRuleFixerRector::TREAT_AS_NON_EMPTY => false,
3031
]
3132
);
3233

3334
$config->skip([
3435
AddVoidReturnTypeWhereNoReturnRector::class => [__DIR__ . '/src/Testing/Response.php'],
35-
VarConstantCommentRector::class,
3636
// Collides with ECS ClassAttributesSeparationFixer
3737
NewlineAfterStatementRector::class,
38+
SimplifyBoolIdenticalTrueRector::class,
3839
]);
3940
};

src/Laravel/LaravelServiceProvider.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function boot(): void
7777
}
7878
}
7979

80-
public static function getConfig(Container $container): ApiSdkConfig
80+
protected static function getConfig(Container $container): ApiSdkConfig
8181
{
8282
return $container->make(ApiSdkConfig::class);
8383
}
@@ -127,7 +127,7 @@ protected function bindLogs(): void
127127
$this->app->singleton(
128128
abstract: FileLogger::class,
129129
concrete: static fn (Application $application) => new FileLogger(
130-
filesystemOperator: self::getFileSystemOperator($application),
130+
filesystemOperator: static::getFileSystemOperator($application),
131131
logger: $application->make(LoggerInterface::class),
132132
fileLogPathService: $application->make(FileLogPathService::class),
133133
getExtensionFromContentTypeAction: $application->make(GetExtensionFromContentTypeAction::class),
@@ -136,7 +136,7 @@ protected function bindLogs(): void
136136
);
137137

138138
$this->app->bind(ClearFileLogsAction::class, static fn (Application $application) => new ClearFileLogsAction(
139-
filesystemOperator: self::getFileSystemOperator($application),
139+
filesystemOperator: static::getFileSystemOperator($application),
140140
fileLogPathService: $application->make(FileLogPathService::class),
141141
logger: $application->make(LoggerInterface::class),
142142
));
@@ -193,10 +193,11 @@ protected function passEventsToTelescopeHttpCatcher(ApiSdkConfig $config): void
193193
);
194194
}
195195

196-
private static function getFileSystemOperator(Application $application): FilesystemOperator
196+
protected static function getFileSystemOperator(Application $application): FilesystemOperator
197197
{
198-
/** @var FilesystemManager $fileManager */
199198
$fileManager = $application->make(FilesystemManager::class);
199+
assert($fileManager instanceof FilesystemManager);
200+
200201
$disk = $fileManager->disk();
201202
if ($disk instanceof FilesystemAdapter === false) {
202203
throw new LogicException(

0 commit comments

Comments
 (0)