dvdoug / PHPCoord

src/CoordinateSystem/Ellipsoidal.php

Spacing +1 added lines, -1 removed lines

@@ -180,6 +180,6 @@
 
     public static function getSupportedSRIDs(): array
     {
-        return array_map(function ($sridData) {return $sridData['name']; }, static::$sridData);
+        return array_map(function($sridData) {return $sridData['name']; }, static::$sridData);
     }
 }

src/EPSG/Import/ASTPrettyPrinter.php

Spacing +4 added lines, -4 removed lines

@@ -18,21 +18,21 @@
 {
     protected function pExpr_Array(Array_ $node)
     {
-        return '[' . $this->pCommaSeparatedMultiline($node->items, true) . $this->nl . ']';
+        return '['.$this->pCommaSeparatedMultiline($node->items, true).$this->nl.']';
     }
 
     protected function pStmt_ClassConst(ClassConst $node): string
     {
-        return parent::pStmt_ClassConst($node) . "\n";
+        return parent::pStmt_ClassConst($node)."\n";
     }
 
     protected function pStmt_Property(Property $node): string
     {
-        return parent::pStmt_Property($node) . "\n";
+        return parent::pStmt_Property($node)."\n";
     }
 
     protected function pStmt_ClassMethod(ClassMethod $node): string
     {
-        return parent::pStmt_ClassMethod($node) . "\n";
+        return parent::pStmt_ClassMethod($node)."\n";
     }
 }

src/EPSG/Import/EPSGImporter.php

Spacing +52 added lines, -52 removed lines

@@ -36,32 +36,32 @@ 
 
     public function __construct()
     {
-        $this->resourceDir = __DIR__ . '/../../../resources';
+        $this->resourceDir = __DIR__.'/../../../resources';
         $this->sourceDir = dirname(__DIR__, 2);
     }
 
     public function createSQLiteDB(): void
     {
         //remove old file if any
-        if (file_exists($this->resourceDir . '/epsg/epsg.sqlite')) {
-            unlink($this->resourceDir . '/epsg/epsg.sqlite');
+        if (file_exists($this->resourceDir.'/epsg/epsg.sqlite')) {
+            unlink($this->resourceDir.'/epsg/epsg.sqlite');
         }
 
         $sqlite = new SQLite3(
-        $this->resourceDir . '/epsg/epsg.sqlite',
+        $this->resourceDir.'/epsg/epsg.sqlite',
         SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE
         );
 
         $sqlite->enableExceptions(true);
         $sqlite->exec('PRAGMA journal_mode=WAL'); //WAL is faster
 
-        $tableSchema = file_get_contents($this->resourceDir . '/epsg/PostgreSQL_Table_Script.sql');
+        $tableSchema = file_get_contents($this->resourceDir.'/epsg/PostgreSQL_Table_Script.sql');
         if (strpos($tableSchema, self::BOM) === 0) {
             $tableSchema = substr($tableSchema, 3);
         }
         $sqlite->exec($tableSchema);
 
-        $tableData = file_get_contents($this->resourceDir . '/epsg/PostgreSQL_Data_Script.sql');
+        $tableData = file_get_contents($this->resourceDir.'/epsg/PostgreSQL_Data_Script.sql');
         if (strpos($tableData, self::BOM) === 0) {
             $tableData = substr($tableData, 3);
         }
@@ -75,7 +75,7 @@ 
     public function doCodeGeneration(): void
     {
         $sqlite = new SQLite3(
-        $this->resourceDir . '/epsg/epsg.sqlite',
+        $this->resourceDir.'/epsg/epsg.sqlite',
         SQLITE3_OPEN_READONLY
         );
 
@@ -120,7 +120,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/UnitOfMeasure/Angle/Angle.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/UnitOfMeasure/Angle/Angle.php', $constants, 'public');
 
         $sql = "
             SELECT
@@ -141,7 +141,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/UnitOfMeasure/Length/Length.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/UnitOfMeasure/Length/Length.php', $constants, 'public');
 
         $sql = "
             SELECT
@@ -162,7 +162,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/UnitOfMeasure/Scale/Scale.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/UnitOfMeasure/Scale/Scale.php', $constants, 'public');
 
         $sql = "
             SELECT
@@ -182,7 +182,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/UnitOfMeasure/Time/Time.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/UnitOfMeasure/Time/Time.php', $constants, 'public');
 
         $sql = "
             SELECT
@@ -202,7 +202,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/UnitOfMeasure/Rate.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/UnitOfMeasure/Rate.php', $constants, 'public');
 
         $sql = "
             SELECT
@@ -222,7 +222,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/UnitOfMeasure/UnitOfMeasure.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/UnitOfMeasure/UnitOfMeasure.php', $constants, 'public');
     }
 
     public function generateDataUnitsOfMeasure(SQLite3 $sqlite): void
@@ -245,7 +245,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/UnitOfMeasure/Angle/Angle.php', $data);
+        $this->updateFileData($this->sourceDir.'/UnitOfMeasure/Angle/Angle.php', $data);
 
         $sql = "
             SELECT
@@ -266,7 +266,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/UnitOfMeasure/Length/Length.php', $data);
+        $this->updateFileData($this->sourceDir.'/UnitOfMeasure/Length/Length.php', $data);
 
         $sql = "
             SELECT
@@ -287,7 +287,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/UnitOfMeasure/Scale/Scale.php', $data);
+        $this->updateFileData($this->sourceDir.'/UnitOfMeasure/Scale/Scale.php', $data);
 
         $sql = "
             SELECT
@@ -307,7 +307,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/UnitOfMeasure/Time/Time.php', $data);
+        $this->updateFileData($this->sourceDir.'/UnitOfMeasure/Time/Time.php', $data);
 
         $sql = "
             SELECT
@@ -327,7 +327,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/UnitOfMeasure/Rate.php', $data);
+        $this->updateFileData($this->sourceDir.'/UnitOfMeasure/Rate.php', $data);
 
         $sql = "
             SELECT
@@ -347,7 +347,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/UnitOfMeasure/UnitOfMeasureFactory.php', $data);
+        $this->updateFileData($this->sourceDir.'/UnitOfMeasure/UnitOfMeasureFactory.php', $data);
     }
 
     public function generateConstantsPrimeMeridians(SQLite3 $sqlite): void
@@ -370,7 +370,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/Datum/PrimeMeridian.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/Datum/PrimeMeridian.php', $constants, 'public');
     }
 
     public function generateDataPrimeMeridians(SQLite3 $sqlite): void
@@ -394,7 +394,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/Datum/PrimeMeridian.php', $data);
+        $this->updateFileData($this->sourceDir.'/Datum/PrimeMeridian.php', $data);
     }
 
     public function generateConstantsEllipsoids(SQLite3 $sqlite): void
@@ -419,7 +419,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/Datum/Ellipsoid.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/Datum/Ellipsoid.php', $constants, 'public');
     }
 
     public function generateDataEllipsoids(SQLite3 $sqlite): void
@@ -450,7 +450,7 @@ 
             unset($data[$row['urn']]['inv_flattening']);
         }
 
-        $this->updateFileData($this->sourceDir . '/Datum/Ellipsoid.php', $data);
+        $this->updateFileData($this->sourceDir.'/Datum/Ellipsoid.php', $data);
     }
 
     public function generateConstantsDatums(SQLite3 $sqlite): void
@@ -476,7 +476,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/Datum/Datum.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/Datum/Datum.php', $constants, 'public');
     }
 
     public function generateDataDatums(SQLite3 $sqlite): void
@@ -520,7 +520,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/Datum/Datum.php', $data);
+        $this->updateFileData($this->sourceDir.'/Datum/Datum.php', $data);
     }
 
     public function generateConstantsCoordinateSystems(SQLite3 $sqlite): void
@@ -549,7 +549,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateSystem/Cartesian.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateSystem/Cartesian.php', $constants, 'public');
 
         /*
          * ellipsoidal
@@ -575,7 +575,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateSystem/Ellipsoidal.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateSystem/Ellipsoidal.php', $constants, 'public');
 
         /*
          * vertical
@@ -601,7 +601,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateSystem/Vertical.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateSystem/Vertical.php', $constants, 'public');
 
         /*
          * other
@@ -627,7 +627,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateSystem/CoordinateSystem.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateSystem/CoordinateSystem.php', $constants, 'public');
     }
 
     public function generateDataCoordinateSystems(SQLite3 $sqlite): void
@@ -672,7 +672,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateSystem/Cartesian.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateSystem/Cartesian.php', $data);
 
         /*
          * ellipsoidal
@@ -714,7 +714,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateSystem/Ellipsoidal.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateSystem/Ellipsoidal.php', $data);
 
         /*
          * vertical
@@ -756,7 +756,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateSystem/Vertical.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateSystem/Vertical.php', $data);
 
         /*
          * other
@@ -799,7 +799,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateSystem/CoordinateSystem.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateSystem/CoordinateSystem.php', $data);
     }
 
     public function generateConstantsCoordinateReferenceSystems(SQLite3 $sqlite): void
@@ -831,7 +831,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateReferenceSystem/Compound.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateReferenceSystem/Compound.php', $constants, 'public');
 
         /*
          * geocentric
@@ -860,7 +860,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateReferenceSystem/Geocentric.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateReferenceSystem/Geocentric.php', $constants, 'public');
 
         /*
          * geographic 2D
@@ -889,7 +889,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateReferenceSystem/Geographic2D.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateReferenceSystem/Geographic2D.php', $constants, 'public');
 
         /*
          * geographic 3D
@@ -918,7 +918,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateReferenceSystem/Geographic3D.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateReferenceSystem/Geographic3D.php', $constants, 'public');
 
         /*
          * projected
@@ -948,7 +948,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateReferenceSystem/Projected.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateReferenceSystem/Projected.php', $constants, 'public');
 
         /*
          * vertical
@@ -977,7 +977,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateReferenceSystem/Vertical.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateReferenceSystem/Vertical.php', $constants, 'public');
 
         /*
          * other
@@ -1006,7 +1006,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateReferenceSystem/CoordinateReferenceSystem.php', $constants, 'public');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateReferenceSystem/CoordinateReferenceSystem.php', $constants, 'public');
     }
 
     public function generateDataCoordinateReferenceSystems(SQLite3 $sqlite): void
@@ -1038,7 +1038,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateReferenceSystem/Compound.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateReferenceSystem/Compound.php', $data);
 
         /*
          * geocentric
@@ -1066,7 +1066,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateReferenceSystem/Geocentric.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateReferenceSystem/Geocentric.php', $data);
 
         /*
          * geographic 2D
@@ -1094,7 +1094,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateReferenceSystem/Geographic2D.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateReferenceSystem/Geographic2D.php', $data);
 
         /*
          * geographic 3D
@@ -1122,7 +1122,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateReferenceSystem/Geographic3D.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateReferenceSystem/Geographic3D.php', $data);
 
         /*
          * projected
@@ -1150,7 +1150,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateReferenceSystem/Projected.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateReferenceSystem/Projected.php', $data);
 
         /*
          * vertical
@@ -1178,7 +1178,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateReferenceSystem/Vertical.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateReferenceSystem/Vertical.php', $data);
 
         /*
          * other
@@ -1207,7 +1207,7 @@ 
             unset($data[$row['urn']]['urn']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateReferenceSystem/CoordinateReferenceSystem.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateReferenceSystem/CoordinateReferenceSystem.php', $data);
     }
 
     public function generateConstantsCoordinateOperationMethods(SQLite3 $sqlite): void
@@ -1263,7 +1263,7 @@ 
             $constants[] = $row;
         }
 
-        $this->updateFileConstants($this->sourceDir . '/CoordinateOperation/CoordinateOperationMethods.php', $constants, 'protected');
+        $this->updateFileConstants($this->sourceDir.'/CoordinateOperation/CoordinateOperationMethods.php', $constants, 'protected');
     }
 
     public function generateDataCoordinateOperations(SQLite3 $sqlite): void
@@ -1407,7 +1407,7 @@ 
             unset($data[$row['urn']]['bbox_west_bound_longitude']);
         }
 
-        $this->updateFileData($this->sourceDir . '/CoordinateOperation/CoordinateOperation.php', $data);
+        $this->updateFileData($this->sourceDir.'/CoordinateOperation/CoordinateOperation.php', $data);
     }
 
     private function updateFileConstants(string $fileName, array $classConstants, string $visibility): void
@@ -1450,7 +1450,7 @@ 
         $prettyPrinter = new ASTPrettyPrinter();
         file_put_contents($fileName, $prettyPrinter->printFormatPreserving($newStmts, $oldStmts, $oldTokens));
         $this->csFixFile($fileName);
-        echo 'done' . PHP_EOL;
+        echo 'done'.PHP_EOL;
     }
 
     private function updateFileData(string $fileName, array $data): void
@@ -1495,13 +1495,13 @@ 
         $prettyPrinter = new ASTPrettyPrinter();
         file_put_contents($fileName, $prettyPrinter->printFormatPreserving($newStmts, $oldStmts, $oldTokens));
         $this->csFixFile($fileName);
-        echo 'done' . PHP_EOL;
+        echo 'done'.PHP_EOL;
     }
 
     private function csFixFile(string $fileName): void
     {
         /** @var Config $config */
-        $config = require __DIR__ . '/../../../.php_cs.dist';
+        $config = require __DIR__.'/../../../.php_cs.dist';
 
         $resolver = new ConfigurationResolver(
             $config,

src/EPSG/Import/AddNewConstantsVisitor.php

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
                     $comment .= "/**\n";
                     $helpLines = explode("\n", wordwrap($row['constant_help'], 112));
                     foreach ($helpLines as $helpLine) {
-                        $comment .= '* ' . trim($helpLine) . "\n";
+                        $comment .= '* '.trim($helpLine)."\n";
                     }
                     if ($row['deprecated']) {
                         $comment .= "* @deprecated\n";
@@ -75,7 +75,7 @@ 
                     $comment .= " */\n";
                 }
 
-                $constName = strtoupper('EPSG_' . $name);
+                $constName = strtoupper('EPSG_'.$name);
                 $constValue = is_string($row['constant_value']) ? new Node\Scalar\String_($row['constant_value']) : new Node\Scalar\LNumber($row['constant_value']);
                 $constComment = new Doc($comment);
                 $const = new Node\Const_($constName, $constValue);

src/EPSG/Import/import.php

Spacing +4 added lines, -4 removed lines

@@ -10,14 +10,14 @@
 
 use PHPCoord\EPSG\Import\EPSGImporter;
 
-require __DIR__ . '/../../../vendor/autoload.php';
+require __DIR__.'/../../../vendor/autoload.php';
 
 /**
  * Imports raw EPSG Dataset from Postgres format.
  */
 $importer = new EPSGImporter();
-echo '--CREATING SQLITE DB--' . PHP_EOL;
+echo '--CREATING SQLITE DB--'.PHP_EOL;
 $importer->createSQLiteDB();
-echo '--PERFORMING CODEGEN--' . PHP_EOL;
+echo '--PERFORMING CODEGEN--'.PHP_EOL;
 $importer->doCodeGeneration();
-echo '--IMPORT COMPLETE--' . PHP_EOL;
+echo '--IMPORT COMPLETE--'.PHP_EOL;

src/GeographicPoint.php

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
             }
         }
 
-        return '(' . implode(', ', $values) . ')';
+        return '('.implode(', ', $values).')';
     }
 
     /**

src/Exception/UnknownSRIDException.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
 {
     public function __construct(string $srid)
     {
-        parent::__construct('Unknown SRID: ' . $srid);
+        parent::__construct('Unknown SRID: '.$srid);
     }
 }

src/Exception/InvalidAxesException.php

Spacing +2 added lines, -2 removed lines

@@ -20,10 +20,10 @@
      */
     public function __construct(array $allowedAxes)
     {
-        $axisNames = array_map(static function ($allowedAxis) {
+        $axisNames = array_map(static function($allowedAxis) {
             return $allowedAxis->getName();
         }, $allowedAxes);
 
-        parent::__construct('This CRS has axes: ' . implode(', ', $axisNames));
+        parent::__construct('This CRS has axes: '.implode(', ', $axisNames));
     }
 }

src/BritishNationalGridPoint.php

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
         $minorLetter = substr(self::GRID_LETTERS, $minorLetterIndex, 1);
 
         return [
-            $majorLetter . $minorLetter,
+            $majorLetter.$minorLetter,
             substr($easting, 1, $halfLength),
             substr($northing, 1, $halfLength),
         ];