Revert removed import global namespace class

Author: nyamsprod

.travis.yml

@@ -22,29 +22,27 @@ matrix:
               - VALIDATE_CODING_STYLE=false
         - php: 7.4
           env:
-              - COLLECT_COVERAGE=false
+              - COLLECT_COVERAGE=true
+              - IGNORE_PLATFORMS=false
+              - RUN_PHPSTAN=true
               - VALIDATE_CODING_STYLE=false
-              - RUN_PHPSTAN=false
-              - IGNORE_PLATFORMS=true
         - php: nightly
           env:
               - COLLECT_COVERAGE=false
               - IGNORE_PLATFORMS=true
-              - RUN_PHPSTAN=true
+              - RUN_PHPSTAN=false
               - VALIDATE_CODING_STYLE=false
     allow_failures:
         - php: nightly
     fast_finish: true
 before_install:
     - travis_retry composer self-update
 install:
-    - if [ "$IGNORE_PLATFORMS" == "true" ]; then travis_retry composer update $COMPOSER_ARGS
-        --ignore-platform-reqs; fi
-    - if [ "$IGNORE_PLATFORMS" == "false" ]; then travis_retry composer update $COMPOSER_ARGS;
-        fi
+    - if [ "$IGNORE_PLATFORMS" == "true" ]; then travis_retry composer update $COMPOSER_ARGS --ignore-platform-reqs; fi
+    - if [ "$IGNORE_PLATFORMS" == "false" ]; then travis_retry composer update $COMPOSER_ARGS; fi
 script:
-    - if [ "$RUN_PHPSTAN" == "true" ]; then composer phpstan; fi
     - if [ "$VALIDATE_CODING_STYLE" == "true" ]; then composer phpcs; fi
+    - if [ "$RUN_PHPSTAN" == "true" ]; then composer phpstan; fi
     - composer phpunit
 after_script:
     - if [ "$COLLECT_COVERAGE" == "true" ]; then wget https://scrutinizer-ci.com/ocular.phar

composer.json

@@ -22,7 +22,6 @@
     },
     "require": {
         "php" : "^7.2",
-        "ext-dom" : "*",
         "ext-json" : "*",
         "ext-mbstring" : "*"
     },
@@ -69,7 +68,8 @@
         "test": "Runs full test suite"
     },
     "suggest": {
-        "ext-iconv" : "Needed to ease transcoding CSV using iconv stream filters"
+        "ext-iconv" : "Needed to ease transcoding CSV using iconv stream filters",
+        "ext-dom" : "Need to use the XMLConverter class"
     },
     "extra": {
         "branch-alias": {

docs/7.0/reading.md

@@ -203,5 +203,5 @@ $nbIteration = $reader->each(function ($row, $index, $iterator) use (&$res, $fun
     }
     $res[] = $row;
     return true;
-});
+})
 ~~~

docs/9.0/connections/bom.md

@@ -22,7 +22,7 @@ The `ByteSequence` interface provides the following constants :
 ### bom_match
 
 ~~~php
-function League\Csv\bom_match(string $str): string
+use function Csv\bom_match;function Leaguebom_match(string $str): string
 ~~~
 
 The `League\Csv\bom_match` function expects a string and returns the BOM sequence found at its start or an empty string otherwise.

docs/9.0/connections/controls.md

@@ -107,7 +107,7 @@ echo $csv->getEscape();    //display '\'
 ## Detecting the delimiter character
 
 ~~~php
-function League\Csv\delimiter_detect(Reader $csv, array $delimiters, $limit = 1): array
+use function Csv\delimiter_detect;function Leaguedelimiter_detect(Reader $csv, array $delimiters, $limit = 1): array
 ~~~
 
 The `delimiter_detect` function helps detect the possible delimiter character used by the CSV document. This function returns the number of CSV fields found in the document depending on the submitted delimiters given.
@@ -142,4 +142,4 @@ If the submitted delimiter **is invalid or not found** in the document, `0` will
 
 <p class="message-info">To detect the delimiters stats on the full CSV document you need to set <code>$limit</code> to <code>-1</code>.</p>
 <p class="message-notice">This function only returns hints. Only the CSV providers will validate the real CSV delimiter character.</p>
-<p class="message-warning">This function only test the delimiters you gave it.</p>
+<p class="message-warning">This function only test the delimiters you gave it.</p>

docs/9.0/upgrading.md

@@ -346,7 +346,7 @@ use League\Csv\Reader;
 $reader = Reader::createFromPath('/path/to/file.csv', 'r');
 foreach ($records->fetchColumn(0) as $value) {
     $value = strtoupper($value);
-};
+}
 ~~~
 
 ## Stream Filtering
@@ -495,4 +495,4 @@ use League\Csv\Writer;
 
 $csv = Writer::createFromPath('/path/to/file.csv');
 $csv->addValidator(new ColumnConsistency(), 'columns_consistency');
-~~~
+~~~

src/AbstractCsv.php

@@ -13,6 +13,8 @@
 
 namespace League\Csv;
 
+use Generator;
+use SplFileObject;
 use function filter_var;
 use function get_class;
 use function mb_strlen;
@@ -83,7 +85,7 @@ abstract class AbstractCsv implements ByteSequence
     /**
      * The CSV document.
      *
-     * @var \SplFileObject|Stream
+     * @var SplFileObject|Stream
      */
     protected $document;
 
@@ -97,7 +99,7 @@ abstract class AbstractCsv implements ByteSequence
     /**
      * New instance.
      *
-     * @param \SplFileObject|Stream $document The CSV Object instance
+     * @param SplFileObject|Stream $document The CSV Object instance
      */
     protected function __construct($document)
     {
@@ -134,7 +136,7 @@ public function __clone()
      *
      * @return static
      */
-    public static function createFromFileObject(\SplFileObject $file)
+    public static function createFromFileObject(SplFileObject $file)
     {
         return new static($file);
     }
@@ -222,7 +224,7 @@ public function getInputBOM(): string
             return $this->input_bom;
         }
 
-        $this->document->setFlags(\SplFileObject::READ_CSV);
+        $this->document->setFlags(SplFileObject::READ_CSV);
         $this->document->rewind();
         $this->input_bom = bom_match((string) $this->document->fread(4));
 
@@ -268,7 +270,7 @@ public function isInputBOMIncluded(): bool
      *
      * @throws Exception if the number of bytes is lesser than 1
      */
-    public function chunk(int $length): \Generator
+    public function chunk(int $length): Generator
     {
         if ($length < 1) {
             throw new InvalidArgument(sprintf('%s() expects the length to be a positive integer %d given', __METHOD__, $length));
@@ -357,12 +359,12 @@ protected function sendHeaders(string $filename): void
             $flag |= FILTER_FLAG_STRIP_HIGH;
         }
 
-        /** @var string $filteredName */
-        $filteredName = filter_var($filename, FILTER_SANITIZE_STRING, $flag);
-        $filenameFallback = str_replace('%', '', $filteredName);
+        /** @var string $filtered_name */
+        $filtered_name = filter_var($filename, FILTER_SANITIZE_STRING, $flag);
+        $filename_fallback = str_replace('%', '', $filtered_name);
 
-        $disposition = sprintf('attachment; filename="%s"', str_replace('"', '\\"', $filenameFallback));
-        if ($filename !== $filenameFallback) {
+        $disposition = sprintf('attachment; filename="%s"', str_replace('"', '\\"', $filename_fallback));
+        if ($filename !== $filename_fallback) {
             $disposition .= sprintf("; filename*=utf-8''%s", rawurlencode($filename));
         }
 

src/CharsetConverter.php

@@ -13,6 +13,8 @@
 
 namespace League\Csv;
 
+use OutOfRangeException;
+use php_user_filter;
 use function array_combine;
 use function array_map;
 use function array_walk;
@@ -33,7 +35,7 @@
 /**
  * Converts resource stream or tabular data content charset.
  */
-class CharsetConverter extends \php_user_filter
+class CharsetConverter extends php_user_filter
 {
     const FILTERNAME = 'convert.league.csv';
 
@@ -103,7 +105,7 @@ public static function getFiltername(string $input_encoding, string $output_enco
     /**
      * Filter encoding charset.
      *
-     * @throws \OutOfRangeException if the charset is malformed or unsupported
+     * @throws OutOfRangeException if the charset is malformed or unsupported
      */
     protected static function filterEncoding(string $encoding): string
     {
@@ -118,7 +120,7 @@ protected static function filterEncoding(string $encoding): string
             return $encoding_list[$key];
         }
 
-        throw new \OutOfRangeException(sprintf('The submitted charset %s is not supported by the mbstring extension', $encoding));
+        throw new OutOfRangeException(sprintf('The submitted charset %s is not supported by the mbstring extension', $encoding));
     }
 
     /**
@@ -139,7 +141,7 @@ public function onCreate(): bool
         try {
             $this->input_encoding = self::filterEncoding($matches['input']);
             $this->output_encoding = self::filterEncoding($matches['output']);
-        } catch (\OutOfRangeException $e) {
+        } catch (OutOfRangeException $e) {
             return false;
         }
 

src/EncloseField.php

@@ -13,6 +13,8 @@
 
 namespace League\Csv;
 
+use InvalidArgumentException;
+use php_user_filter;
 use function in_array;
 use function str_replace;
 use function strcspn;
@@ -28,7 +30,7 @@
  * @see https://tools.ietf.org/html/rfc4180#section-2
  * @see https://bugs.php.net/bug.php?id=38301
  */
-class EncloseField extends \php_user_filter
+class EncloseField extends php_user_filter
 {
     const FILTERNAME = 'convert.league.csv.enclosure';
 
@@ -82,14 +84,14 @@ public static function register(): void
     /**
      * Static method to add the stream filter to a {@link Writer} object.
      *
-     * @throws \InvalidArgumentException if the sequence is malformed
+     * @throws InvalidArgumentException if the sequence is malformed
      */
     public static function addTo(Writer $csv, string $sequence): Writer
     {
         self::register();
 
         if (!self::isValidSequence($sequence)) {
-            throw new \InvalidArgumentException('The sequence must contain at least one character to force enclosure');
+            throw new InvalidArgumentException('The sequence must contain at least one character to force enclosure');
         }
 
         $formatter = static function (array $record) use ($sequence): array {

src/EscapeFormula.php

@@ -13,6 +13,7 @@
 
 namespace League\Csv;
 
+use InvalidArgumentException;
 use function array_fill_keys;
 use function array_keys;
 use function array_map;
@@ -72,15 +73,15 @@ public function __construct(string $escape = "\t", array $special_chars = [])
      *
      * @param string ...$characters
      *
-     * @throws \InvalidArgumentException if the string is not a single character
+     * @throws InvalidArgumentException if the string is not a single character
      *
      * @return string[]
      */
     protected function filterSpecialCharacters(string ...$characters): array
     {
         foreach ($characters as $str) {
             if (1 != strlen($str)) {
-                throw new \InvalidArgumentException(sprintf('The submitted string %s must be a single character', $str));
+                throw new InvalidArgumentException(sprintf('The submitted string %s must be a single character', $str));
             }
         }