Adding Writer::noEnclosure method

CHANGELOG.md

@@ -19,6 +19,7 @@ All Notable changes to `Csv` will be documented in this file
 ### Fixed
 
 - `JsonConverter::formatter` now accepts callable before only `Closure` where accepted.
+- The protected property `Writer::$enclose_all` is no longer a boolean but an integer
 
 ### Removed
 

docs/9.0/converter/html.md

@@ -44,7 +44,6 @@ This method sets the optional attribute name for the field name on the HTML `td`
 
 <p class="message-info">If none is used or an empty string is given, the field name information won't be exported to the HTML table.</p>
 
-
 ### HTMLConverter::formatter
 
 <p class="message-info">New feature introduced in version <code>9.20.0</code></p>

docs/9.0/converter/xml.md

@@ -54,7 +54,7 @@ public XMLConverter::formatter(?callback $formatter): mixed
 ```
 
 This method allow to apply a callback prior to converting your collection individual item.
-This callback allows you to specify how each item will be converted. The formatter should 
+This callback allows you to specify how each item will be converted. The formatter should
 return an associative array suitable for conversion.
 
 ## Conversion

docs/9.0/writer/index.md

@@ -137,18 +137,18 @@ public Writer::forceEnclosure(): self
 public Writer::relaxEnclosure(): self
 public Writer::noEnclosure(): self
 public Writer::encloseAll(): bool
-public Writer::encloseRelax(): bool
+public Writer::encloseSelective(): bool
 public Writer::encloseNone(): bool
 ```
 
 By default, the `Writer` adds enclosures only around records that requires them. For all other records no enclosure character is present,
 With this feature, you can:
 
-- force the enclosure to be present on every record entry or CSV cell. 
-- completely remove the presence of enclosure
+- force the enclosure to be present on every record entry or CSV cell;
+- completely remove the presence of enclosure;
 
 <p class="message-warning">When this feature is activated the <code>$escape</code> character is completely ignored (it is the same as setting it to the empty string.)</p>
-<p class="message-warning">When no enclosure is used, the library DOES NOT CHECK for multiline fields.</p>
+<p class="message-warning">When no enclosure is used, the library <strong>DO NOT CHECK</strong> for multiline fields.</p>
 
 ```php
 <?php

src/HTMLConverter.php

@@ -13,6 +13,7 @@
 
 namespace League\Csv;
 
+use Closure;
 use Deprecated;
 use DOMDocument;
 use DOMElement;
@@ -30,8 +31,8 @@ class HTMLConverter
     /** table id attribute value. */
     protected string $id_value = '';
     protected XMLConverter $xml_converter;
-    /** @var ?callable(array, array-key): array */
-    protected mixed $formatter = null;
+    /** @var ?Closure(array, array-key): array */
+    protected ?Closure $formatter = null;
 
     public static function create(): self
     {
@@ -174,7 +175,7 @@ public function td(string $fieldname_attribute_name): self
     public function formatter(?callable $formatter): self
     {
         $clone = clone $this;
-        $clone->formatter = $formatter;
+        $clone->formatter = ($formatter instanceof Closure || null === $formatter) ? $formatter : $formatter(...);
 
         return $clone;
     }

src/JsonConverter.php

@@ -104,8 +104,8 @@ final class JsonConverter
     public readonly int $depth;
     /** @var int<1, max> */
     public readonly int $indentSize;
-    /** @var ?callable(T, array-key): mixed */
-    public readonly mixed $formatter;
+    /** @var ?Closure(T, array-key): mixed */
+    public readonly ?Closure $formatter;
     /** @var int<1, max> */
     public readonly int $chunkSize;
     /** @var non-empty-string */
@@ -151,7 +151,7 @@ private function __construct(int $flags, int $depth, int $indentSize, ?callable
         $this->flags = $flags;
         $this->depth = $depth;
         $this->indentSize = $indentSize;
-        $this->formatter = $formatter;
+        $this->formatter = ($formatter instanceof Closure || null === $formatter) ? $formatter : $formatter(...);
         $this->chunkSize = $chunkSize;
 
         // Initialize settings and closure to use for conversion.

src/Query/Constraint/Column.php

@@ -54,7 +54,7 @@ public static function filterOn(
         }
 
         if (is_callable($operator)) {
-            return new self($column, Closure::fromCallable($operator), $value);
+            return new self($column, $operator(...), $value);
         }
 
         return new self(

src/Query/Ordering/Column.php

@@ -68,15 +68,13 @@ public static function sortOn(
             default => throw new QueryException('Unknown or unsupported ordering operator value: '.$direction),
         };
 
-        if (is_callable($callback)) {
-            $callback = Closure::fromCallable($callback);
-        }
-
-        return new self(
-            $operator,
-            $column,
-            $callback ?? static fn (mixed $first, mixed $second): int => $first <=> $second
-        );
+        $callback = match (true) {
+            null === $callback => static fn (mixed $first, mixed $second): int => $first <=> $second,
+            $callback instanceof Closure => $callback,
+            default => $callback(...),
+        };
+
+        return new self($operator, $column, $callback);
     }
 
     /**

src/Writer.php

@@ -31,8 +31,8 @@
 class Writer extends AbstractCsv implements TabularDataWriter
 {
     protected const ENCLOSE_ALL = 1;
-    protected const ENCLOSE_RELAX = 2;
-    protected const ENCLOSE_NONE = 3;
+    protected const ENCLOSE_SELECTIVE = 0;
+    protected const ENCLOSE_NONE = -2;
 
     protected const STREAM_FILTER_MODE = STREAM_FILTER_WRITE;
     /** @var array<callable> callable collection to format the record before insertion. */
@@ -95,19 +95,20 @@ public function encloseAll(): bool
     }
 
     /**
-     * Tells whether new entries will all be enclosed on writing.
+     * Tells whether new entries will never be enclosed on writing.
      */
     public function encloseNone(): bool
     {
         return self::ENCLOSE_NONE === $this->enclose_all;
     }
 
     /**
-     * Tells whether new entries will all be enclosed on writing.
+     * Tells whether new entries will be selectively enclosed on writing
+     * if the field content requires encoding.
      */
-    public function encloseRelax(): bool
+    public function encloseSelective(): bool
     {
-        return self::ENCLOSE_RELAX === $this->enclose_all;
+        return self::ENCLOSE_SELECTIVE === $this->enclose_all;
     }
 
     /**
@@ -227,7 +228,7 @@ public function setFlushThreshold(?int $threshold): self
 
     public function relaxEnclosure(): self
     {
-        $this->enclose_all = self::ENCLOSE_RELAX;
+        $this->enclose_all = self::ENCLOSE_SELECTIVE;
         $this->resetProperties();
 
         return $this;

src/WriterTest.php

@@ -96,7 +96,7 @@ public function testInsertNormalFile(): void
 
         self::assertFalse($csv->encloseAll());
         self::assertFalse($csv->encloseNone());
-        self::assertTrue($csv->encloseRelax());
+        self::assertTrue($csv->encloseSelective());
         self::assertStringContainsString('jane,doe,[email protected]', $csv->toString());
     }
 
@@ -310,7 +310,7 @@ public function testEncloseAll(): void
 
         self::assertTrue($csv->encloseAll());
         self::assertFalse($csv->encloseNone());
-        self::assertFalse($csv->encloseRelax());
+        self::assertFalse($csv->encloseSelective());
         self::assertStringContainsString($expected, $csv->toString());
     }
 
@@ -344,7 +344,7 @@ public function testEncloseNothing(): void
 
         self::assertFalse($csv->encloseAll());
         self::assertTrue($csv->encloseNone());
-        self::assertFalse($csv->encloseRelax());
+        self::assertFalse($csv->encloseSelective());
         self::assertStringContainsString($expected, $csv->toString());
     }
 }

src/XMLConverter.php

@@ -13,6 +13,7 @@
 
 namespace League\Csv;
 
+use Closure;
 use DOMAttr;
 use DOMDocument;
 use DOMElement;
@@ -34,8 +35,8 @@ class XMLConverter
     protected string $column_attr = '';
     /** XML offset attribute name. */
     protected string $offset_attr = '';
-    /** @var ?callable(array, array-key): array */
-    public mixed $formatter = null;
+    /** @var ?Closure(array, array-key): array */
+    public ?Closure $formatter = null;
 
     public static function create(): self
     {
@@ -161,7 +162,7 @@ public function rootElement(string $node_name): self
     public function formatter(?callable $formatter): self
     {
         $clone = clone $this;
-        $clone->formatter = $formatter;
+        $clone->formatter = ($formatter instanceof Closure || null === $formatter) ? $formatter : $formatter(...);
 
         return $clone;
     }