Updated codebase to PHP 8.0 (#53)

yokai-php · Feb 28, 2022 · 1a27b42 · 1a27b42
1 parent a0b377a
commit 1a27b42
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 40 deletions.
diff --git a/src/SkipInvalidItemProcessor.php b/src/SkipInvalidItemProcessor.php
@@ -16,33 +16,23 @@
  */
 final class SkipInvalidItemProcessor implements ItemProcessorInterface
 {
-    private ValidatorInterface $validator;
-
-    /**
-     * @var Constraint[]|null
-     */
-    private ?array $contraints;
-
-    /**
-     * @var string[]|null
-     */
-    private ?array $groups;
-
-    /**
-     * @param Constraint[]|null $contraints
-     * @param string[]|null     $groups
-     */
-    public function __construct(ValidatorInterface $validator, array $contraints = null, array $groups = null)
-    {
-        $this->validator = $validator;
-        $this->contraints = $contraints;
-        $this->groups = $groups;
+    public function __construct(
+        private ValidatorInterface $validator,
+        /**
+         * @var Constraint[]|null
+         */
+        private ?array $contraints = null,
+        /**
+         * @var string[]|null
+         */
+        private ?array $groups = null,
+    ) {
     }
 
     /**
      * @inheritDoc
      */
-    public function process($item)
+    public function process(mixed $item): mixed
     {
         $violations = $this->validator->validate($item, $this->contraints, $this->groups);
         if (\count($violations) === 0) {
@@ -63,7 +53,7 @@ public function process($item)
     private function normalizeConstraints(?array $constraints): Iterator
     {
         foreach ($constraints ?? [] as $constraint) {
-            yield \get_class($constraint);
+            yield $constraint::class;
         }
     }
 }
diff --git a/src/SkipItemOnViolations.php b/src/SkipItemOnViolations.php
@@ -16,23 +16,18 @@
  */
 final class SkipItemOnViolations implements SkipItemCauseInterface
 {
-    /**
-     * @phpstan-var ConstraintViolationListInterface<ConstraintViolationInterface>
-     */
-    private ConstraintViolationListInterface $violations;
-
-    /**
-     * @phpstan-param ConstraintViolationListInterface<ConstraintViolationInterface> $violations
-     */
-    public function __construct(ConstraintViolationListInterface $violations)
-    {
-        $this->violations = $violations;
+    public function __construct(
+        /**
+         * @phpstan-var ConstraintViolationListInterface<ConstraintViolationInterface>
+         */
+        private ConstraintViolationListInterface $violations
+    ) {
     }
 
     /**
      * @inheritdoc
      */
-    public function report(JobExecution $execution, $index, $item): void
+    public function report(JobExecution $execution, int|string $index, mixed $item): void
     {
         $execution->getSummary()->increment('invalid');
         $violations = [];
@@ -63,10 +58,7 @@ public function getViolations(): ConstraintViolationListInterface
         return $this->violations;
     }
 
-    /**
-     * @param mixed $invalidValue
-     */
-    private function normalizeInvalidValue($invalidValue): string
+    private function normalizeInvalidValue(mixed $invalidValue): string
     {
         if ($invalidValue === '') {
             return '""';
@@ -96,7 +88,7 @@ private function normalizeInvalidValue($invalidValue): string
                 return (string)$invalidValue;
             }
 
-            return \get_class($invalidValue);
+            return $invalidValue::class;
         }
 
         return \gettype($invalidValue);