Skip to content

Commit 6cbfdaa

Browse files
committed
Merge branch 'update'
2 parents 139091e + e574238 commit 6cbfdaa

File tree

14 files changed

+82
-65
lines changed

14 files changed

+82
-65
lines changed

.phive/phars.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
3-
<phar name="lkrms/pretty-php" version="^0.4.48" installed="0.4.91" location="./tools/pretty-php" copy="true"/>
4-
<phar name="php-cs-fixer" version="^3.46.0" installed="3.69.1" location="./tools/php-cs-fixer" copy="true"/>
3+
<phar name="lkrms/pretty-php" version="^0.4.48" installed="0.4.92" location="./tools/pretty-php" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.46.0" installed="3.74.0" location="./tools/php-cs-fixer" copy="true"/>
55
<phar name="salient-labs/changelog" version="^1.0.5" installed="1.0.8" location="./tools/changelog" copy="true"/>
66
<phar name="composer-require-checker" version="^4.16.1" installed="4.16.1" location="./tools/composer-require-checker" copy="true"/>
77
</phive>

composer.lock

Lines changed: 43 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Toolkit/Core/Legacy/IntrospectionClass.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,8 +740,9 @@ final public function propertyActionIsAllowed(string $property, string $action):
740740
$property,
741741
$this->getWritableProperties()
742742
);
743-
}
744743

745-
return false;
744+
default:
745+
return false;
746+
}
746747
}
747748
}

src/Toolkit/Curler/CurlerHarRecorder.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class CurlerHarRecorder
3232
protected ?string $Uri;
3333
protected bool $IsRecording = false;
3434
/** @var int[] */
35-
protected array $ListenerIds;
35+
protected array $ListenerIds = [];
3636
protected ?RequestInterface $LastRequest = null;
3737
protected float $LastRequestTime;
3838
protected int $EntryCount = 0;
@@ -146,7 +146,7 @@ public function stop(): void
146146
foreach ($this->ListenerIds as $id) {
147147
Event::removeListener($id);
148148
}
149-
unset($this->ListenerIds);
149+
$this->ListenerIds = [];
150150

151151
$this->IsRecording = false;
152152
}
@@ -172,7 +172,6 @@ protected function handleCurlResponse(CurlResponseEvent $event): void
172172
$requestTime = $this->LastRequestTime;
173173

174174
$this->LastRequest = null;
175-
unset($this->LastRequestTime);
176175

177176
$handle = $event->getCurlHandle();
178177

src/Toolkit/Http/HttpServer.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ class HttpServer implements Immutable
2828
protected string $Host;
2929
protected int $Port;
3030
protected int $Timeout;
31-
protected string $ProxyHost;
32-
protected int $ProxyPort;
33-
protected bool $ProxyTls;
34-
protected string $ProxyBasePath;
31+
private string $ProxyHost;
32+
private int $ProxyPort;
33+
private bool $ProxyTls;
34+
private string $ProxyBasePath;
3535
private string $Socket;
3636
/** @var resource|null */
3737
private $Server;

src/Toolkit/Sli/Internal/Data/ClassData.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ public static function fromExtractor(
208208
if ($filter && !$filter($memberData, $type)) {
209209
$memberData->Hide = true;
210210
}
211+
// @phpstan-ignore assign.propertyType, assign.propertyType, assign.propertyType
211212
$data->$property[$name] = $memberData;
212213
}
213214
}
@@ -315,6 +316,7 @@ public static function fromReflection(
315316
if ($filter && !$filter($memberData, $type)) {
316317
$memberData->Hide = true;
317318
}
319+
// @phpstan-ignore assign.propertyType, assign.propertyType, assign.propertyType
318320
$data->$property[$member->getName()] = $memberData;
319321
}
320322
}
@@ -446,6 +448,7 @@ private function getInheritedMemberData($data, ClassDataFactory $factory)
446448
}
447449
}
448450

451+
// @phpstan-ignore return.type
449452
return $data;
450453
}
451454

src/Toolkit/Sync/AbstractSyncDefinition.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,7 @@ final protected function getPipelineToBackend(): PipelineInterface
504504
/** @var PipelineInterface<TEntity,mixed[],SyncPipelineArgument> */
505505
$pipeline = $pipeline->through(
506506
fn($payload, Closure $next) =>
507+
// @phpstan-ignore instanceof.alwaysFalse
507508
$payload instanceof SyncEntityInterface
508509
? $next($payload->toArray())
509510
: $next($payload)
@@ -539,6 +540,7 @@ final protected function getPipelineFromBackend(): PipelineInterface
539540
$ctx = null;
540541

541542
return $pipeline
543+
// @phpstan-ignore argument.type
542544
->then(function (
543545
array $data,
544546
PipelineInterface $pipeline,

src/Toolkit/Sync/Http/HttpSyncDefinition.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -535,14 +535,15 @@ protected function getClosure(int $operation): ?Closure
535535
->unlessIf(fn($entity) => $entity === null)
536536
->start();
537537
};
538-
}
539538

540-
// @codeCoverageIgnoreStart
541-
throw new LogicException(sprintf(
542-
'Invalid SyncOperation: %d',
543-
$operation,
544-
));
545-
// @codeCoverageIgnoreEnd
539+
default:
540+
// @codeCoverageIgnoreStart
541+
throw new LogicException(sprintf(
542+
'Invalid SyncOperation: %d',
543+
$operation,
544+
));
545+
// @codeCoverageIgnoreEnd
546+
}
546547
}
547548

548549
/**
@@ -559,7 +560,6 @@ private function getHttpOperationClosure(int $operation): Closure
559560
&& Env::getDryRun()
560561
) {
561562
/** @var Closure(CurlerInterface, mixed[]|null, mixed[]|null=): mixed[] */
562-
// @phpstan-ignore varTag.nativeType
563563
return fn(CurlerInterface $curler, ?array $query, ?array $payload = null) =>
564564
$payload ?? [];
565565
}

0 commit comments

Comments
 (0)