Simplify Field Interface

Author: nyamsprod

src/Schema/CustomFieldTest.php

@@ -67,26 +67,6 @@ public function testEvaluateUsesParse(): void
     // score()
     // --------------------------------------------------------
 
-    public function testScoreUsesCustomParsingLogic(): void
-    {
-        $field = new CustomField(
-            fn ($value) => is_int($value) ? $value : null,
-            'custom',
-        );
-
-        $score = $field->score([
-            1,
-            2,
-            '3',
-            null,
-            '',
-        ]);
-
-        // valid = 2 (1,2)
-        // counted = 3 (1,2,'3')
-        self::assertSame(2 / 3, $score);
-    }
-
     // --------------------------------------------------------
     // type()
     // --------------------------------------------------------

src/Schema/Field.php

@@ -29,17 +29,6 @@ public function name(): string;
      */
     public function confidenceThreshold(): float;
 
-    /**
-     * Scores a sample of values to estimate type confidence.
-     *
-     * IMPORTANT:
-     * The iterable is expected to be a *representative sample* of the dataset,
-     * not the full dataset. Implementations may assume limited size for performance.
-     *
-     * @param iterable $values Sample of dataset values
-     */
-    public function score(iterable $values): float;
-
     /**
      * Score a single value to estimate its type.
      *

src/Schema/FieldEvaluator.php

@@ -39,26 +39,6 @@ final protected static function filterConfidenceThreshold(float $confidenceThres
         return $confidenceThreshold;
     }
 
-    public function score(iterable $values): float
-    {
-        $valid = 0;
-        $counted = 0;
-
-        foreach ($values as $value) {
-            $eval = $this->evaluate($value);
-            if (0 === $eval) {
-                continue;
-            }
-
-            $counted++;
-            if (1 === $eval) {
-                $valid++;
-            }
-        }
-
-        return 0 < $counted ? $valid / $counted : 0.0;
-    }
-
     /**
      * @return int<-1, 1>
      */

src/Schema/FieldEvaluatorTest.php

@@ -70,56 +70,6 @@ public function testEvaluateReturnsMinusOneForInvalidValue(): void
 
         self::assertSame(-1, $field->evaluate('invAlid'));
     }
-
-    // --------------------------------------------------------
-    // score()
-    // --------------------------------------------------------
-
-    public function testScoreIgnoresNullAndEmptyValues(): void
-    {
-        $field = new DummyField();
-
-        $score = $field->score([
-            null,
-            '',
-            '   ',
-            'valid-1',
-            'invalid',
-        ]);
-
-        self::assertSame(1.0, $score);
-    }
-
-    public function testScoreReturnsZeroWhenNoCountedValues(): void
-    {
-        $field = new DummyField();
-
-        self::assertSame(0.0, $field->score([
-            null,
-            '',
-            '   ',
-        ]));
-    }
-
-    public function testScoreIsPerfectWhenAllValid(): void
-    {
-        $field = new DummyField();
-
-        self::assertSame(1.0, $field->score([
-            'valid-1',
-            'valid-2',
-        ]));
-    }
-
-    public function testScoreIsZeroWhenAllInvalid(): void
-    {
-        $field = new DummyField();
-
-        self::assertSame(0.0, $field->score([
-            'invAlid-1',
-            'invAlid-2',
-        ]));
-    }
 }
 
 final class DummyField extends FieldEvaluator

src/Schema/FieldListTest.php

@@ -58,11 +58,6 @@ public function confidenceThreshold(): float
                 return 0.5;
             }
 
-            public function score(iterable $values): float
-            {
-                return 1.0;
-            }
-
             public function parse(mixed $value): mixed
             {
                 return $value;

src/Schema/NumericField.php

@@ -13,6 +13,8 @@
 
 namespace League\Csv\Schema;
 
+use ValueError;
+
 use function filter_var;
 use function is_float;
 use function is_int;
@@ -30,7 +32,7 @@ public function __construct(
         float $confidenceThreshold = 0.8
     ) {
         if (null !== $min && null !== $max && $min > $max) {
-            throw new \ValueError('Minimum length can not be greater than maximum length.');
+            throw new ValueError('Minimum length can not be greater than maximum length.');
         }
 
         parent::__construct($confidenceThreshold);

src/Schema/StringField.php

@@ -126,20 +126,15 @@ public function metadata(): FieldMetadata
      */
     public function evaluate(mixed $value): int
     {
-        return match (true) {
-            null !== $this->constraint => parent::evaluate($value),
-            is_string($value) => 1,
-            default => 0,
-        };
-    }
-
-    public function score(iterable $values): float
-    {
-        return null === $this->constraint ? 1.0 : parent::score($values);
+        return null === $this->constraint
+            ? (is_string($value) ? 1 : 0)
+            : parent::evaluate($value);
     }
 
     public function confidenceThreshold(): float
     {
-        return null === $this->constraint ? 0.0 : parent::confidenceThreshold();
+        return null === $this->constraint
+            ? 0.0
+            : parent::confidenceThreshold();
     }
 }

src/Schema/StringFieldTest.php

@@ -93,17 +93,6 @@ public function testEvaluate(mixed $input, int $expected): void
         self::assertSame($expected, $this->field->evaluate($input));
     }
 
-    // --------------------------------------------------------
-    // score()
-    // --------------------------------------------------------
-
-    public function testScoreAlwaysReturnsOne(): void
-    {
-        self::assertSame(1.0, $this->field->score(['a', 'b', 'c']));
-        self::assertSame(1.0, $this->field->score([1, 2, 3]));
-        self::assertSame(1.0, $this->field->score([]));
-    }
-
     // --------------------------------------------------------
     // type()
     // --------------------------------------------------------

src/Schema/StringLengthConstraint.php

@@ -89,7 +89,7 @@ public function fieldTypeName(): string
         $range = (null === $this->min && null === $this->max)
             ? '' :
             (
-            $this->min === $this->max
+                $this->min === $this->max
                 ? '['.$this->min.']'
                 : '['.$this->min.','.$this->max.']'
             );