remorhaz / php-ucd

src/PropertyRangeLoader.php

Spacing +9 added lines, -9 removed lines

@@ -27,12 +27,12 @@ 
     /**
      * @var RangeSetInterface[]
      */
-    private $cache = [];
+    private $cache=[];
 
     public static function create(): self
     {
         /** @psalm-var array<string,string> $index */
-        $index = require __DIR__ . '/../config/ranges.php';
+        $index=require __DIR__ . '/../config/ranges.php';
 
         return new self(__DIR__, $index);
     }
@@ -44,14 +44,14 @@ 
      */
     public function __construct(string $path, array $index)
     {
-        $this->path = $path;
-        $this->index = $index;
+        $this->path=$path;
+        $this->index=$index;
     }
 
     public function getRangeSet(string $propertyName): RangeSetInterface
     {
         if (!isset($this->cache[$propertyName])) {
-            $this->cache[$propertyName] = $this->loadRangeSet($propertyName);
+            $this->cache[$propertyName]=$this->loadRangeSet($propertyName);
         }
 
         return $this->cache[$propertyName];
@@ -64,20 +64,20 @@ 
         }
 
         /** @var mixed $file */
-        $file = $this->index[$propertyName];
+        $file=$this->index[$propertyName];
         if (!is_string($file)) {
             throw new Exception\InvalidPropertyConfigException($propertyName, $file);
         }
-        $fileName = $this->path . $file;
+        $fileName=$this->path . $file;
         error_clear_last();
         /**
          * @noinspection   PhpIncludeInspection
          * @psalm-suppress UnresolvableInclude
          * @var RangeSetInterface|false $rangeSet
          */
-        $rangeSet = @include $fileName;
+        $rangeSet=@include $fileName;
         if (false === $rangeSet) {
-            $lastError = error_get_last();
+            $lastError=error_get_last();
             if (isset($lastError)) {
                 throw new Exception\PropertyFileNotLoadedException(
                     $propertyName,

src/Exception/PropertyFileNotLoadedException.php

Spacing +5 added lines, -5 removed lines

@@ -29,17 +29,17 @@
         string $propertyName,
         string $propertyFile,
         ?string $errorMessage,
-        Throwable $previous = null
+        Throwable $previous=null
     ) {
-        $this->propertyName = $propertyName;
-        $this->propertyFile = $propertyFile;
-        $this->errorMessage = $errorMessage;
+        $this->propertyName=$propertyName;
+        $this->propertyFile=$propertyFile;
+        $this->errorMessage=$errorMessage;
         parent::__construct($this->buildMessage(), 0, $previous);
     }
 
     private function buildMessage(): string
     {
-        $message =
+        $message=
             "Failed to load range set for Unicode property '{$this->propertyName}' " .
             "from file {$this->propertyFile}";
 

src/Exception/InvalidPropertyConfigException.php

Spacing +4 added lines, -4 removed lines

@@ -29,16 +29,16 @@
      * @param mixed          $propertyFile
      * @param Throwable|null $previous
      */
-    public function __construct(string $propertyName, $propertyFile, Throwable $previous = null)
+    public function __construct(string $propertyName, $propertyFile, Throwable $previous=null)
     {
-        $this->propertyName = $propertyName;
-        $this->propertyFile = $propertyFile;
+        $this->propertyName=$propertyName;
+        $this->propertyFile=$propertyFile;
         parent::__construct($this->buildMessage(), 0, $previous);
     }
 
     private function buildMessage(): string
     {
-        $fileNameType = gettype($this->propertyFile);
+        $fileNameType=gettype($this->propertyFile);
 
         return
             "Invalid config for Unicode property '{$this->propertyName}': " .

src/Exception/PropertyRangeSetNotFoundException.php

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,9 @@
      */
     private $propertyName;
 
-    public function __construct(string $propertyName, Throwable $previous = null)
+    public function __construct(string $propertyName, Throwable $previous=null)
     {
-        $this->propertyName = $propertyName;
+        $this->propertyName=$propertyName;
         parent::__construct("Range set not found for Unicode property '{$this->propertyName}'", 0, $previous);
     }
 

src/Exception/InvalidPropertyRangeSetException.php

Spacing +6 added lines, -6 removed lines

@@ -38,20 +38,20 @@
      * @param mixed          $rangeSet
      * @param Throwable|null $previous
      */
-    public function __construct(string $propertyName, string $propertyFile, $rangeSet, Throwable $previous = null)
+    public function __construct(string $propertyName, string $propertyFile, $rangeSet, Throwable $previous=null)
     {
-        $this->propertyName = $propertyName;
-        $this->propertyFile = $propertyFile;
-        $this->rangeSet = $rangeSet;
+        $this->propertyName=$propertyName;
+        $this->propertyFile=$propertyFile;
+        $this->rangeSet=$rangeSet;
         parent::__construct($this->buildMessage(), 0, $previous);
     }
 
     private function buildMessage(): string
     {
-        $actualType = is_object($this->rangeSet)
+        $actualType=is_object($this->rangeSet)
             ? get_class($this->rangeSet)
             : gettype($this->rangeSet);
-        $expectedType = RangeSetInterface::class;
+        $expectedType=RangeSetInterface::class;
 
         return
             "Invalid range set loaded from {$this->propertyFile} for Unicode property '{$this->propertyName}':\n" .

tools/src/PropertyBuilder.php

Spacing +50 added lines, -50 removed lines

@@ -33,12 +33,12 @@ 
     /**
      * @var RangeSetInterface[]
      */
-    private $rangeSets = [];
+    private $rangeSets=[];
 
     /**
      * @var string[]
      */
-    private $scripts = [];
+    private $scripts=[];
 
     /**
      * @var BuilderFactory
@@ -53,12 +53,12 @@ 
     /**
      * @var RangeInterface[][]
      */
-    private $rangeBuffer = [];
+    private $rangeBuffer=[];
 
     public function __construct(PrettyPrinterAbstract $printer)
     {
-        $this->phpBuilder = new BuilderFactory();
-        $this->printer = $printer;
+        $this->phpBuilder=new BuilderFactory();
+        $this->printer=$printer;
     }
 
     public function parseUnicodeData(SplFileObject $file, callable $onProgress): void
@@ -70,9 +70,9 @@ 
 
     public function parseScripts(SplFileObject $file, callable $onProgress): void
     {
-        $otherProperties = array_keys($this->rangeBuffer);
+        $otherProperties=array_keys($this->rangeBuffer);
         $this->parseProperties($file, $onProgress);
-        $this->scripts = array_diff(array_keys($this->rangeBuffer), $otherProperties);
+        $this->scripts=array_diff(array_keys($this->rangeBuffer), $otherProperties);
     }
 
     public function parseProperties(SplFileObject $file, callable $onProgress): void
@@ -84,7 +84,7 @@ 
 
     private function addRangeToBuffer(string $prop, RangeInterface ...$ranges): void
     {
-        $this->rangeBuffer[$prop] = array_merge($this->rangeBuffer[$prop] ?? [], $ranges);
+        $this->rangeBuffer[$prop]=array_merge($this->rangeBuffer[$prop] ?? [], $ranges);
     }
 
     public function getRangeBufferSize(): int
@@ -99,17 +99,17 @@ 
 
     public function fetchBufferedRangeSets(callable $onProgress): void
     {
-        $count = 0;
+        $count=0;
         foreach ($this->rangeBuffer as $prop => $ranges) {
             $this->addRangeSet($prop, ...$ranges);
             $onProgress(++$count);
         }
-        $this->rangeBuffer = [];
+        $this->rangeBuffer=[];
     }
 
     public function buildUnicodeDataDerivatives(callable $onProgress): void
     {
-        $map = [
+        $map=[
             'C' => ['Cc', 'Cf', 'Co', 'Cs'],
             'L' => ['Ll', 'Lm', 'Lo', 'Lt', 'Lu'],
             'L&' => ['Lu', 'Ll', 'Lt'],
@@ -120,18 +120,18 @@ 
             'Z' => ['Zl', 'Zp', 'Zs'],
         ];
 
-        $notCnRanges = [];
+        $notCnRanges=[];
         foreach ($map as $targetProp => $sourceProps) {
             foreach ($sourceProps as $prop) {
-                $rangeSet = $this->getRangeSet($prop);
-                $notCnRanges = array_merge($notCnRanges, $rangeSet->getRanges());
+                $rangeSet=$this->getRangeSet($prop);
+                $notCnRanges=array_merge($notCnRanges, $rangeSet->getRanges());
                 $this->addRangeToBuffer($targetProp, ...$rangeSet->getRanges());
             }
         }
 
         try {
-            $targetProp = 'Any';
-            $anyRangeSet = RangeSet::createUnsafe(new Range(0x00, 0x10FFFF));
+            $targetProp='Any';
+            $anyRangeSet=RangeSet::createUnsafe(new Range(0x00, 0x10FFFF));
         } catch (Throwable $e) {
             throw new Exception\RangeSetNotBuiltException($targetProp, $e);
         }
@@ -139,10 +139,10 @@ 
         $this->addRangeToBuffer($targetProp, ...$anyRangeSet->getRanges());
 
         try {
-            $targetProp = 'Cn';
-            $notCnRangeSet = RangeSet::create(...$notCnRanges);
+            $targetProp='Cn';
+            $notCnRangeSet=RangeSet::create(...$notCnRanges);
             $onProgress();
-            $cnRanges = $notCnRangeSet
+            $cnRanges=$notCnRangeSet
                 ->createSymmetricDifference($anyRangeSet)
                 ->getRanges();
         } catch (Throwable $e) {
@@ -154,16 +154,16 @@ 
 
     public function buildScriptsDerivatives(callable $onProgress): void
     {
-        $knownRanges = [];
+        $knownRanges=[];
         foreach ($this->scripts as $prop) {
-            $knownRanges = array_merge($knownRanges, $this->getRangeSet($prop)->getRanges());
+            $knownRanges=array_merge($knownRanges, $this->getRangeSet($prop)->getRanges());
             $onProgress();
         }
         try {
-            $targetProp = 'Unknown';
-            $knownRangeSet = RangeSet::create(...$knownRanges);
+            $targetProp='Unknown';
+            $knownRangeSet=RangeSet::create(...$knownRanges);
             $onProgress();
-            $unknownRanges = $knownRangeSet
+            $unknownRanges=$knownRangeSet
                 ->createSymmetricDifference($this->getRangeSet('Any'))
                 ->getRanges();
         } catch (Throwable $e) {
@@ -179,7 +179,7 @@ 
             throw new Exception\RangeSetAlreadyExistsException($prop);
         }
         try {
-            $this->rangeSets[$prop] = RangeSet::create(...$ranges);
+            $this->rangeSets[$prop]=RangeSet::create(...$ranges);
         } catch (Throwable $e) {
             throw new Exception\RangeSetNotBuiltException($prop, $e);
         }
@@ -196,22 +196,22 @@ 
 
     public function writeFiles(string $targetIndexRootDir, string $targetRootDir, callable $onProgress): void
     {
-        $fileIndex = [];
+        $fileIndex=[];
         foreach ($this->rangeSets as $prop => $rangeSet) {
-            $baseName = "/Ranges/{$prop}.php";
-            $fileName = $targetRootDir . $baseName;
+            $baseName="/Ranges/{$prop}.php";
+            $fileName=$targetRootDir . $baseName;
             try {
-                $code = $this->buildPropertyFile($rangeSet);
+                $code=$this->buildPropertyFile($rangeSet);
                 \Safe\file_put_contents($fileName, $code);
             } catch (Throwable $e) {
                 throw new Exception\FileNotWrittenException($fileName);
             }
-            $fileIndex[$prop] = $baseName;
+            $fileIndex[$prop]=$baseName;
             $onProgress();
         }
-        $fileName = $targetIndexRootDir . "/ranges.php";
+        $fileName=$targetIndexRootDir . "/ranges.php";
         try {
-            $code = $this->buildIndexFile($fileIndex);
+            $code=$this->buildIndexFile($fileIndex);
             \Safe\file_put_contents($fileName, $code);
         } catch (Throwable $e) {
             throw new Exception\FileNotWrittenException($fileName);
@@ -221,40 +221,40 @@ 
 
     private function buildIndexFile(array $index): string
     {
-        $array = var_export($index, true);
+        $array=var_export($index, true);
 
         return "<?php\n\nreturn {$array};\n";
     }
 
     private function buildPropertyFile(RangeSetInterface $rangeSet): string
     {
-        $rangeSetClass = new ReflectionClass(RangeSet::class);
+        $rangeSetClass=new ReflectionClass(RangeSet::class);
 
-        $phpNodes = [];
-        $declare = new Declare_([new DeclareDeclare('strict_types', $this->phpBuilder->val(1))]);
+        $phpNodes=[];
+        $declare=new Declare_([new DeclareDeclare('strict_types', $this->phpBuilder->val(1))]);
         $declare->setDocComment(new Doc('/** @noinspection PhpUnhandledExceptionInspection */'));
-        $phpNodes[] = $declare;
-        $phpNodes[] = $this->phpBuilder->namespace(__NAMESPACE__ . '\\Properties')->getNode();
-        $phpNodes[] = $this->phpBuilder->use($rangeSetClass->getName())->getNode();
-        $phpRanges = [];
+        $phpNodes[]=$declare;
+        $phpNodes[]=$this->phpBuilder->namespace(__NAMESPACE__ . '\\Properties')->getNode();
+        $phpNodes[]=$this->phpBuilder->use($rangeSetClass->getName())->getNode();
+        $phpRanges=[];
 
         foreach ($rangeSet->getRanges() as $range) {
-            $rangeStart = $range->getStart();
-            $rangeFinish = $range->getFinish();
-            $phpRangeStart = $this->phpBuilder->val($rangeStart);
+            $rangeStart=$range->getStart();
+            $rangeFinish=$range->getFinish();
+            $phpRangeStart=$this->phpBuilder->val($rangeStart);
             $phpRangeStart->setAttribute('kind', LNumber::KIND_HEX);
-            $phpRangeArgs = [$phpRangeStart];
+            $phpRangeArgs=[$phpRangeStart];
             if ($rangeStart != $rangeFinish) {
-                $phpRangeFinish = $this->phpBuilder->val($rangeFinish);
+                $phpRangeFinish=$this->phpBuilder->val($rangeFinish);
                 $phpRangeFinish->setAttribute('kind', LNumber::KIND_HEX);
-                $phpRangeArgs[] = $phpRangeFinish;
+                $phpRangeArgs[]=$phpRangeFinish;
             }
-            $phpRanges[] = new Array_($phpRangeArgs, ['kind' => Array_::KIND_SHORT]);
+            $phpRanges[]=new Array_($phpRangeArgs, ['kind' => Array_::KIND_SHORT]);
         }
-        $import = $this
+        $import=$this
             ->phpBuilder
             ->staticCall($rangeSetClass->getShortName(), 'importRanges', $phpRanges);
-        $phpReturn = new Return_(
+        $phpReturn=new Return_(
             $this->phpBuilder->staticCall(
                 $rangeSetClass->getShortName(),
                 'createUnsafe',
@@ -262,7 +262,7 @@ 
             )
         );
         $phpReturn->setDocComment(new Doc('/** phpcs:disable Generic.Files.LineLength.TooLong */'));
-        $phpNodes[] = $phpReturn;
+        $phpNodes[]=$phpReturn;
 
         return $this->printer->prettyPrintFile($phpNodes);
     }

tools/src/Console/BuildPropertiesCommand.php

Spacing +36 added lines, -36 removed lines

@@ -23,15 +23,15 @@ 
 final class BuildPropertiesCommand extends Command
 {
 
-    private const OPTION_TARGET_ROOT_PATH = 'target-root-path';
-    private const OPTION_TARGET_INDEX_ROOT_PATH = 'target-index-root-path';
-    private const OPTION_SOURCE_ROOT_PATH = 'source-root-path';
-    private const OPTION_SOURCE_UNICODE_DATA = 'source-unicode-data';
-    private const OPTION_SOURCE_SCRIPTS = 'source-scripts';
-    private const OPTION_SOURCE_PROP_LIST = 'source-prop-list';
-    private const OPTION_SOURCE_DERIVED_CORE_PROPERTIES = 'source-derived-core-properties';
+    private const OPTION_TARGET_ROOT_PATH='target-root-path';
+    private const OPTION_TARGET_INDEX_ROOT_PATH='target-index-root-path';
+    private const OPTION_SOURCE_ROOT_PATH='source-root-path';
+    private const OPTION_SOURCE_UNICODE_DATA='source-unicode-data';
+    private const OPTION_SOURCE_SCRIPTS='source-scripts';
+    private const OPTION_SOURCE_PROP_LIST='source-prop-list';
+    private const OPTION_SOURCE_DERIVED_CORE_PROPERTIES='source-derived-core-properties';
 
-    protected static $defaultName = 'build';
+    protected static $defaultName='build';
 
     protected function configure()
     {
@@ -121,7 +121,7 @@ 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $output->writeln($this->getApplication()->getName());
-        $propertyBuilder = new PropertyBuilder(new Standard());
+        $propertyBuilder=new PropertyBuilder(new Standard());
         $this->parseUnicodeData($propertyBuilder, $input, $output);
         $this->parseScripts($propertyBuilder, $input, $output);
         $this->parsePropList($propertyBuilder, $input, $output);
@@ -136,13 +136,13 @@ 
         InputInterface $input,
         OutputInterface $output
     ): void {
-        $progressBar = new ProgressBar($output);
-        $progressIndicator = new ProgressIndicator($output);
+        $progressBar=new ProgressBar($output);
+        $progressIndicator=new ProgressIndicator($output);
 
         $output->writeln(' Parsing UnicodeData.txt...');
-        $unicodeData = new SplFileObject($this->getSourceUnicodeData($input));
+        $unicodeData=new SplFileObject($this->getSourceUnicodeData($input));
         $progressBar->setMaxSteps($unicodeData->getSize());
-        $onParseProgress = function (int $byteCount) use ($progressBar): void {
+        $onParseProgress=function(int $byteCount) use ($progressBar): void {
             $progressBar->advance($byteCount);
         };
         $progressBar->start();
@@ -153,7 +153,7 @@ 
         $this->fetchRangeSets($output, $propertyBuilder, $progressBar);
 
         $progressIndicator->start('Building UnicodeData derivatives...');
-        $onBuildProgress = function () use ($progressIndicator) {
+        $onBuildProgress=function() use ($progressIndicator) {
             $progressIndicator->advance();
         };
         $propertyBuilder->buildUnicodeDataDerivatives($onBuildProgress);
@@ -167,9 +167,9 @@ 
         ProgressBar $progressBar
     ): void {
         $output->writeln(' Creating range sets from buffer...');
-        $bufferSize = $propertyBuilder->getRangeBufferSize();
+        $bufferSize=$propertyBuilder->getRangeBufferSize();
         $progressBar->setMaxSteps($bufferSize);
-        $onFetchProgress = function (int $rangeSetIndex) use ($progressBar): void {
+        $onFetchProgress=function(int $rangeSetIndex) use ($progressBar): void {
             $progressBar->setProgress($rangeSetIndex);
         };
         $progressBar->start();
@@ -181,8 +181,8 @@ 
 
     private function getSourceRootPath(InputInterface $input): string
     {
-        $optionName = self::OPTION_SOURCE_ROOT_PATH;
-        $sourceRootPath = $input->getOption($optionName);
+        $optionName=self::OPTION_SOURCE_ROOT_PATH;
+        $sourceRootPath=$input->getOption($optionName);
         if (is_string($sourceRootPath)) {
             return $sourceRootPath;
         }
@@ -192,8 +192,8 @@ 
 
     private function getTargetRootPath(InputInterface $input): string
     {
-        $optionName = self::OPTION_TARGET_ROOT_PATH;
-        $targetRootPath = $input->getOption($optionName);
+        $optionName=self::OPTION_TARGET_ROOT_PATH;
+        $targetRootPath=$input->getOption($optionName);
         if (is_string($targetRootPath)) {
             return $targetRootPath;
         }
@@ -203,8 +203,8 @@ 
 
     private function getTargetIndexRootPath(InputInterface $input): string
     {
-        $optionName = self::OPTION_TARGET_INDEX_ROOT_PATH;
-        $targetRootPath = $input->getOption($optionName);
+        $optionName=self::OPTION_TARGET_INDEX_ROOT_PATH;
+        $targetRootPath=$input->getOption($optionName);
         if (is_string($targetRootPath)) {
             return $targetRootPath;
         }
@@ -234,7 +234,7 @@ 
 
     private function getSourceFile(string $optionName, InputInterface $input): string
     {
-        $sourceScripts = $input->getOption($optionName);
+        $sourceScripts=$input->getOption($optionName);
         if (is_string($sourceScripts)) {
             return $this->getSourceRootPath($input) . $sourceScripts;
         }
@@ -247,14 +247,14 @@ 
         InputInterface $input,
         OutputInterface $output
     ): void {
-        $progressBar = new ProgressBar($output);
-        $progressIndicator = new ProgressIndicator($output);
+        $progressBar=new ProgressBar($output);
+        $progressIndicator=new ProgressIndicator($output);
 
         $output->writeln(' Parsing Scripts.txt...');
 
-        $scripts = new SplFileObject($this->getSourceScripts($input));
+        $scripts=new SplFileObject($this->getSourceScripts($input));
         $progressBar->setMaxSteps($scripts->getSize());
-        $onParseProgress = function (int $byteCount) use ($progressBar): void {
+        $onParseProgress=function(int $byteCount) use ($progressBar): void {
             $progressBar->advance($byteCount);
         };
         $progressBar->start();
@@ -265,7 +265,7 @@ 
         $this->fetchRangeSets($output, $propertyBuilder, $progressBar);
 
         $progressIndicator->start('Building Scripts derivatives...');
-        $onBuildProgress = function () use ($progressIndicator) {
+        $onBuildProgress=function() use ($progressIndicator) {
             $progressIndicator->advance();
         };
         $propertyBuilder->buildScriptsDerivatives($onBuildProgress);
@@ -278,12 +278,12 @@ 
         InputInterface $input,
         OutputInterface $output
     ): void {
-        $progressBar = new ProgressBar($output);
+        $progressBar=new ProgressBar($output);
 
         $output->writeln(' Parsing PropList.txt...');
-        $propList = new SplFileObject($this->getSourcePropList($input));
+        $propList=new SplFileObject($this->getSourcePropList($input));
         $progressBar->setMaxSteps($propList->getSize());
-        $onParseProgress = function (int $byteCount) use ($progressBar): void {
+        $onParseProgress=function(int $byteCount) use ($progressBar): void {
             $progressBar->advance($byteCount);
         };
         $progressBar->start();
@@ -299,12 +299,12 @@ 
         InputInterface $input,
         OutputInterface $output
     ): void {
-        $progressBar = new ProgressBar($output);
+        $progressBar=new ProgressBar($output);
 
         $output->writeln(' Parsing DerivedCoreProperties.txt...');
-        $derivedCoreProperties = new SplFileObject($this->getSourceDerivedCoreProperties($input));
+        $derivedCoreProperties=new SplFileObject($this->getSourceDerivedCoreProperties($input));
         $progressBar->setMaxSteps($derivedCoreProperties->getSize());
-        $onParseProgress = function (int $byteCount) use ($progressBar): void {
+        $onParseProgress=function(int $byteCount) use ($progressBar): void {
             $progressBar->advance($byteCount);
         };
         $progressBar->start();
@@ -320,11 +320,11 @@ 
         InputInterface $input,
         OutputInterface $output
     ): void {
-        $progressBar = new ProgressBar($output);
+        $progressBar=new ProgressBar($output);
 
         $output->writeln(' Writing target files...');
         $progressBar->setMaxSteps($propertyBuilder->getFileCount());
-        $onWriteProgress = function () use ($progressBar): void {
+        $onWriteProgress=function() use ($progressBar): void {
             $progressBar->advance();
         };
         $progressBar->start();

tools/src/PropertiesRangeIterator.php

Spacing +12 added lines, -12 removed lines

@@ -25,14 +25,14 @@ 
 
     public function __construct(SplFileObject $file, callable $onProgress)
     {
-        $this->file = $file;
-        $this->onProgress = $onProgress;
+        $this->file=$file;
+        $this->onProgress=$onProgress;
     }
 
     public function getIterator(): Iterator
     {
         while (!$this->file->eof()) {
-            $line = $this->fetchNextLine($this->file);
+            $line=$this->fetchNextLine($this->file);
             if (!isset($line)) {
                 continue;
             }
@@ -44,7 +44,7 @@ 
 
     private function fetchNextLine(SplFileObject $file): ?string
     {
-        $line = $file->fgets();
+        $line=$file->fgets();
         if (false === $line) {
             throw new Exception\LineNotReadException($file->getFilename());
         }
@@ -54,20 +54,20 @@ 
 
     private function fetchPropertyRange(string $line): Iterator
     {
-        $dataWithComment = explode('#', $line, 2);
-        $data = trim($dataWithComment[0] ?? '');
+        $dataWithComment=explode('#', $line, 2);
+        $data=trim($dataWithComment[0] ?? '');
         if ('' == $data) {
             return;
         }
-        $rangeWithProp = explode(';', $data);
-        $unSplitRange = trim($rangeWithProp[0] ?? null);
-        $prop = trim($rangeWithProp[1] ?? null);
+        $rangeWithProp=explode(';', $data);
+        $unSplitRange=trim($rangeWithProp[0] ?? null);
+        $prop=trim($rangeWithProp[1] ?? null);
         if (!isset($unSplitRange, $prop)) {
             throw new Exception\InvalidLineException($line);
         }
-        $splitRange = explode('..', $unSplitRange);
-        $start = hexdec($splitRange[0]);
-        $finish = isset($splitRange[1])
+        $splitRange=explode('..', $unSplitRange);
+        $start=hexdec($splitRange[0]);
+        $finish=isset($splitRange[1])
             ? hexdec($splitRange[1])
             : $start;
 

tools/src/UnicodeDataRangeIterator.php

Spacing +22 added lines, -22 removed lines

@@ -32,28 +32,28 @@ 
 
     private $rangeStart;
 
-    private $namedStarts = [];
+    private $namedStarts=[];
 
     public function __construct(SplFileObject $file, callable $onProgress)
     {
-        $this->file = $file;
-        $this->onProgress = $onProgress;
+        $this->file=$file;
+        $this->onProgress=$onProgress;
     }
 
     public function getIterator(): Iterator
     {
         while (!$this->file->eof()) {
-            $line = $this->fetchNextLine($this->file);
+            $line=$this->fetchNextLine($this->file);
             if (!isset($line)) {
                 continue;
             }
-            $range = $this->fetchUnicodeDataRange($line);
+            $range=$this->fetchUnicodeDataRange($line);
             if (isset($range)) {
                 yield $this->lastProp => $range;
             }
 
-            $this->lastCode = $this->code;
-            $this->lastProp = $this->prop;
+            $this->lastCode=$this->code;
+            $this->lastProp=$this->prop;
 
             ($this->onProgress)(strlen($line));
         }
@@ -61,7 +61,7 @@ 
 
     private function fetchNextLine(SplFileObject $file): ?string
     {
-        $line = $file->fgets();
+        $line=$file->fgets();
         if (false === $line) {
             throw new Exception\LineNotReadException($file->getFilename());
         }
@@ -71,26 +71,26 @@ 
 
     private function parseUnicodeDataLineLine(string $line): void
     {
-        $splitLine = explode(';', $line);
-        $codeHex = $splitLine[0] ?? null;
-        $name = $splitLine[1] ?? null;
-        $prop = $splitLine[2] ?? null;
+        $splitLine=explode(';', $line);
+        $codeHex=$splitLine[0] ?? null;
+        $name=$splitLine[1] ?? null;
+        $prop=$splitLine[2] ?? null;
         if (!isset($codeHex, $name, $prop)) {
             throw new Exception\InvalidLineException($line);
         }
-        $this->code = hexdec($codeHex);
-        $this->name = $name;
-        $this->prop = $prop;
+        $this->code=hexdec($codeHex);
+        $this->name=$name;
+        $this->prop=$prop;
     }
 
     private function fetchUnicodeDataRange(string $line): ?RangeInterface
     {
         $this->parseUnicodeDataLineLine($line);
 
-        [$firstName, $lastName] = $this->parseRangeBoundary($this->name);
+        [$firstName, $lastName]=$this->parseRangeBoundary($this->name);
         if (isset($firstName)) {
-            $this->namedStarts[$firstName] = $this->code;
-            $this->rangeStart = null;
+            $this->namedStarts[$firstName]=$this->code;
+            $this->rangeStart=null;
 
             return null;
         }
@@ -111,11 +111,11 @@ 
             return null;
         }
 
-        $range = isset($this->rangeStart, $this->lastCode)
+        $range=isset($this->rangeStart, $this->lastCode)
             ? $this->createRange($this->rangeStart, $this->lastCode)
             : null;
 
-        $this->rangeStart = $this->code;
+        $this->rangeStart=$this->code;
 
         return $range;
     }
@@ -123,12 +123,12 @@ 
     private function parseRangeBoundary(string $name): array
     {
         try {
-            $isFirst = 1 === \Safe\preg_match('#^<(.+), First>$#', $name, $matches);
+            $isFirst=1 === \Safe\preg_match('#^<(.+), First>$#', $name, $matches);
             if ($isFirst) {
                 return [$matches[1] ?? null, null];
             }
 
-            $isLast = 1 === \Safe\preg_match('#^<(.+), Last>$#', $name, $matches);
+            $isLast=1 === \Safe\preg_match('#^<(.+), Last>$#', $name, $matches);
 
             return $isLast
                 ? [null, $matches[1] ?? null]