Import fully qualified class names

Author: antonkomarev

src/Connectors/ConnectionFactory.php

@@ -3,9 +3,10 @@
 namespace Grimzy\LaravelMysqlSpatial\Connectors;
 
 use Grimzy\LaravelMysqlSpatial\MysqlConnection;
+use Illuminate\Database\Connectors\ConnectionFactory as IlluminateConnectionFactory;
 use PDO;
 
-class ConnectionFactory extends \Illuminate\Database\Connectors\ConnectionFactory
+class ConnectionFactory extends IlluminateConnectionFactory
 {
     /**
      * @param string       $driver

src/MysqlConnection.php

@@ -2,13 +2,18 @@
 
 namespace Grimzy\LaravelMysqlSpatial;
 
-class MysqlConnection extends \Illuminate\Database\MySqlConnection
+use Doctrine\DBAL\Types\Type as DoctrineType;
+use Grimzy\LaravelMysqlSpatial\Schema\Builder;
+use Grimzy\LaravelMysqlSpatial\Schema\Grammars\MySqlGrammar;
+use Illuminate\Database\MySqlConnection as IlluminateMySqlConnection;
+
+class MysqlConnection extends IlluminateMySqlConnection
 {
     public function __construct($pdo, $database = '', $tablePrefix = '', array $config = [])
     {
         parent::__construct($pdo, $database, $tablePrefix, $config);
 
-        if (class_exists('Doctrine\DBAL\Types\Type')) {
+        if (class_exists(DoctrineType::class)) {
             // Prevent geometry type fields from throwing a 'type not found' error when changing them
             $geometries = [
                 'geometry',
@@ -34,15 +39,20 @@ public function __construct($pdo, $database = '', $tablePrefix = '', array $conf
      */
     protected function getDefaultSchemaGrammar()
     {
-        return $this->withTablePrefix(new Schema\Grammars\MySqlGrammar());
+        return $this->withTablePrefix(new MySqlGrammar);
     }
 
+    /**
+     * Get a schema builder instance for the connection.
+     *
+     * @return \Illuminate\Database\Schema\MySqlBuilder
+     */
     public function getSchemaBuilder()
     {
         if (is_null($this->schemaGrammar)) {
             $this->useDefaultSchemaGrammar();
         }
 
-        return new Schema\Builder($this);
+        return new Builder($this);
     }
 }

src/Schema/Blueprint.php

@@ -2,7 +2,9 @@
 
 namespace Grimzy\LaravelMysqlSpatial\Schema;
 
-class Blueprint extends \Illuminate\Database\Schema\Blueprint
+use Illuminate\Database\Schema\Blueprint as IlluminateBlueprint;
+
+class Blueprint extends IlluminateBlueprint
 {
     /**
      * Add a geometry column on the table.

src/Schema/Grammars/MySqlGrammar.php

@@ -3,9 +3,10 @@
 namespace Grimzy\LaravelMysqlSpatial\Schema\Grammars;
 
 use Grimzy\LaravelMysqlSpatial\Schema\Blueprint;
+use Illuminate\Database\Schema\Grammars\MySqlGrammar as IlluminateMySqlGrammar;
 use Illuminate\Support\Fluent;
 
-class MySqlGrammar extends \Illuminate\Database\Schema\Grammars\MySqlGrammar
+class MySqlGrammar extends IlluminateMySqlGrammar
 {
     /**
      * Adds a statement to add a geometry column.

src/SpatialServiceProvider.php

@@ -2,7 +2,16 @@
 
 namespace Grimzy\LaravelMysqlSpatial;
 
+use Doctrine\DBAL\Types\Type as DoctrineType;
 use Grimzy\LaravelMysqlSpatial\Connectors\ConnectionFactory;
+use Grimzy\LaravelMysqlSpatial\Doctrine\Geometry;
+use Grimzy\LaravelMysqlSpatial\Doctrine\GeometryCollection;
+use Grimzy\LaravelMysqlSpatial\Doctrine\LineString;
+use Grimzy\LaravelMysqlSpatial\Doctrine\MultiLineString;
+use Grimzy\LaravelMysqlSpatial\Doctrine\MultiPoint;
+use Grimzy\LaravelMysqlSpatial\Doctrine\MultiPolygon;
+use Grimzy\LaravelMysqlSpatial\Doctrine\Point;
+use Grimzy\LaravelMysqlSpatial\Doctrine\Polygon;
 use Illuminate\Database\DatabaseManager;
 use Illuminate\Database\DatabaseServiceProvider;
 
@@ -32,22 +41,22 @@ public function register()
             return new DatabaseManager($app, $app['db.factory']);
         });
 
-        if (class_exists('Doctrine\DBAL\Types\Type')) {
+        if (class_exists(DoctrineType::class)) {
             // Prevent geometry type fields from throwing a 'type not found' error when changing them
             $geometries = [
-                'geometry'           => \Grimzy\LaravelMysqlSpatial\Doctrine\Geometry::class,
-                'point'              => \Grimzy\LaravelMysqlSpatial\Doctrine\Point::class,
-                'linestring'         => \Grimzy\LaravelMysqlSpatial\Doctrine\LineString::class,
-                'polygon'            => \Grimzy\LaravelMysqlSpatial\Doctrine\Polygon::class,
-                'multipoint'         => \Grimzy\LaravelMysqlSpatial\Doctrine\MultiPoint::class,
-                'multilinestring'    => \Grimzy\LaravelMysqlSpatial\Doctrine\MultiLineString::class,
-                'multipolygon'       => \Grimzy\LaravelMysqlSpatial\Doctrine\MultiPolygon::class,
-                'geometrycollection' => \Grimzy\LaravelMysqlSpatial\Doctrine\GeometryCollection::class,
+                'geometry'           => Geometry::class,
+                'point'              => Point::class,
+                'linestring'         => LineString::class,
+                'polygon'            => Polygon::class,
+                'multipoint'         => MultiPoint::class,
+                'multilinestring'    => MultiLineString::class,
+                'multipolygon'       => MultiPolygon::class,
+                'geometrycollection' => GeometryCollection::class,
             ];
-            $typeNames = array_keys(\Doctrine\DBAL\Types\Type::getTypesMap());
+            $typeNames = array_keys(DoctrineType::getTypesMap());
             foreach ($geometries as $type => $class) {
                 if (!in_array($type, $typeNames)) {
-                    \Doctrine\DBAL\Types\Type::addType($type, $class);
+                    DoctrineType::addType($type, $class);
                 }
             }
         }