akoSalman / Shorturl

config/shorturl.php

Indentation +16 added lines, -16 removed lines

@@ -5,25 +5,25 @@
 			"default" => "local",
 			
 			"local" => [
-			    'base_url'      => env('APP_URL', '127.0.0.1'),
+				'base_url'      => env('APP_URL', '127.0.0.1'),
 				'table_name'    => 'links',
-                'charset'       => 'latin1',
+				'charset'       => 'latin1',
 
-                // utf8_bin gives us case sensitive search to the DB
-                'collation'     => 'latin1_bin',
+				// utf8_bin gives us case sensitive search to the DB
+				'collation'     => 'latin1_bin',
 
-                /**
-                 * For making the urls unique in the DB, we must create an index or unique_key
-                 * for the column url
-                 * But based on different versions of mysql the size of the index key
-                 * is different as you can see here
-                 * https://dev.mysql.com/doc/refman/5.7/en/innodb-restrictions.html#innodb-maximums-minimums
-                 *
-                 * Possible values in byte could be (767, 3072) and based on the
-                 * charset and collation used for the database or the table, given values may differ
-                 * for example for a ** utf8mb4 ** charset the given values could be (767/4, 3072/4);
-                 *
-                 */
+				/**
+				 * For making the urls unique in the DB, we must create an index or unique_key
+				 * for the column url
+				 * But based on different versions of mysql the size of the index key
+				 * is different as you can see here
+				 * https://dev.mysql.com/doc/refman/5.7/en/innodb-restrictions.html#innodb-maximums-minimums
+				 *
+				 * Possible values in byte could be (767, 3072) and based on the
+				 * charset and collation used for the database or the table, given values may differ
+				 * for example for a ** utf8mb4 ** charset the given values could be (767/4, 3072/4);
+				 *
+				 */
 				'index_key_prefix_size'     => '767',
 
 				/**

src/drivers/BaseDriver.php

Spacing +2 added lines, -2 removed lines

@@ -10,12 +10,12 @@
 		 *

 		 * @return mixed

 		 */

-		function shorten (string $url) :string;

+		function shorten(string $url) :string;

 		

 		/**

 		 * @param string $url

 		 *

 		 * @return mixed

 		 */

-		function expand (string $url) :string;

+		function expand(string $url) :string;

 	}
\ No newline at end of file

src/ShorturlServiceProvider.php

Indentation +19 added lines, -19 removed lines

@@ -6,26 +6,26 @@
 

 class ShorturlServiceProvider extends ServiceProvider

 {

-    /**

-     * Register bindings in the container.

-     *

-     * @return void

-     */

-    public function register()

-    {

-        $this->app->singleton('shorturl', function ($app) {

-            return resolve("Ako\Shorturl\Shorturl");

-        });

+	/**

+	 * Register bindings in the container.

+	 *

+	 * @return void

+	 */

+	public function register()

+	{

+		$this->app->singleton('shorturl', function ($app) {

+			return resolve("Ako\Shorturl\Shorturl");

+		});

 

-        $this->mergeConfigFrom(__DIR__ . '/../config/shorturl.php', 'shorturl');

-    }

+		$this->mergeConfigFrom(__DIR__ . '/../config/shorturl.php', 'shorturl');

+	}

 

-    public function boot()

-    {

-        $this->publishes([

-            __DIR__.'/../config/shorturl.php' => config_path('shorturl.php')

-        ]);

+	public function boot()

+	{

+		$this->publishes([

+			__DIR__.'/../config/shorturl.php' => config_path('shorturl.php')

+		]);

 

-        $this->loadMigrationsFrom(__DIR__.'/../migrations');

-    }

+		$this->loadMigrationsFrom(__DIR__.'/../migrations');

+	}

 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
      */

     public function register()

     {

-        $this->app->singleton('shorturl', function ($app) {

+        $this->app->singleton('shorturl', function($app) {

             return resolve("Ako\Shorturl\Shorturl");

         });

 

@@ -23,9 +23,9 @@ 
     public function boot()

     {

         $this->publishes([

-            __DIR__.'/../config/shorturl.php' => config_path('shorturl.php')

+            __DIR__ . '/../config/shorturl.php' => config_path('shorturl.php')

         ]);

 

-        $this->loadMigrationsFrom(__DIR__.'/../migrations');

+        $this->loadMigrationsFrom(__DIR__ . '/../migrations');

     }

 }
\ No newline at end of file

src/Shorturl.php

Braces +3 added lines, -2 removed lines

@@ -53,8 +53,9 @@
 		

 		private function getDriverInstance ()

 		{

-			if (!$this->driver_instance)

-				$this->setDriverInstance();

+			if (!$this->driver_instance) {

+							$this->setDriverInstance();

+			}

 			

 			return $this->driver_instance;

 		}

Spacing +7 added lines, -7 removed lines

@@ -10,7 +10,7 @@ 
 		protected $driver;

 		private $driver_instance;

 

-		public function __construct (DriverFactory $factory)

+		public function __construct(DriverFactory $factory)

 		{

 			$this->factory = $factory;

 		}

@@ -20,7 +20,7 @@ 
 		 *

 		 * @return Shorturl

 		 */

-		public function onDriver (string $driver)

+		public function onDriver(string $driver)

 		{

 			$this->driver = $driver;

 			$this->setDriverInstance();

@@ -30,7 +30,7 @@ 
 		/**

 		 * @return void

 		 */

-		private function setDriverInstance ()

+		private function setDriverInstance()

 		{

 			$this->driver_instance = $this->factory->make($this->getDriver());

 		}

@@ -41,17 +41,17 @@ 
 		 *

 		 * @return string

 		 */

-		public function getDriver (): string

+		public function getDriver(): string

 		{

 			return $this->driver ?: config("shorturl.drivers.default");

 		}

 		

-		public function __call ($method, $args)

+		public function __call($method, $args)

 		{

-			return call_user_func_array(array ($this->getDriverInstance(), $method), $args);

+			return call_user_func_array(array($this->getDriverInstance(), $method), $args);

 		}

 		

-		private function getDriverInstance ()

+		private function getDriverInstance()

 		{

 			if (!$this->driver_instance)

 				$this->setDriverInstance();

src/Facades/Shorturl.php

Indentation +9 added lines, -9 removed lines

@@ -6,14 +6,14 @@
 

 class Shorturl extends Facade

 {

-    /**

-     * Get the registered name of the component.

-     *

-     * @return string

-     */

-    protected static function getFacadeAccessor()

-    {

-        return 'shorturl';

-    }

+	/**

+	 * Get the registered name of the component.

+	 *

+	 * @return string

+	 */

+	protected static function getFacadeAccessor()

+	{

+		return 'shorturl';

+	}

 

 }

src/DriverFactory.php

Indentation +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php

 	namespace Ako\Shorturl;

 

-    use Ako\Shorturl\Drivers\LocalDriver;

+	use Ako\Shorturl\Drivers\LocalDriver;

 

-    class DriverFactory

+	class DriverFactory

 	{

 		/**

 		 * @param string $driver

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 		 *

 		 * @return LocalDriver

 		 */

-		public function make (string $driver)

+		public function make(string $driver)

 		{

 			switch ($driver) {

 				case "local":

src/models/Link.php

Indentation +5 added lines, -5 removed lines

@@ -19,8 +19,8 @@
 		];
 
 		public function __construct(array $attributes = [])
-        {
-            $this->table = config('shorturl.drivers.local.table_name');
-            parent::__construct($attributes);
-        }
-    }
\ No newline at end of file
+		{
+			$this->table = config('shorturl.drivers.local.table_name');
+			parent::__construct($attributes);
+		}
+	}
\ No newline at end of file

migrations/2019_01_02_192950_create_links_table.php

Indentation +25 added lines, -25 removed lines

@@ -6,31 +6,31 @@
 
 class CreateLinksTable extends Migration
 {
-    /**
-     * Run the migrations.
-     */
-    public function up()
-    {
-        $local_conf = config('shorturl.drivers.local');
-        Schema::create($local_conf['table_name'], function (Blueprint $table) use ($local_conf) {
-            $table->charset = $local_conf['charset'] ?? "utf8";
-            $table->collation = $local_conf['collation'] ?? "utf8_bin";
-            $table->increments('id');
-            $table->string('long_path', $local_conf['index_key_prefix_size'])->unique();
-            $table->string('short_path', 10)->unique();
-            $table->string('base_url')->nullable();
-            $table->bigInteger('clicks')->nullable()->default(0);
-            $table->text('properties')->nullable();
-            $table->timestamps();
-        });
-    }
+	/**
+	 * Run the migrations.
+	 */
+	public function up()
+	{
+		$local_conf = config('shorturl.drivers.local');
+		Schema::create($local_conf['table_name'], function (Blueprint $table) use ($local_conf) {
+			$table->charset = $local_conf['charset'] ?? "utf8";
+			$table->collation = $local_conf['collation'] ?? "utf8_bin";
+			$table->increments('id');
+			$table->string('long_path', $local_conf['index_key_prefix_size'])->unique();
+			$table->string('short_path', 10)->unique();
+			$table->string('base_url')->nullable();
+			$table->bigInteger('clicks')->nullable()->default(0);
+			$table->text('properties')->nullable();
+			$table->timestamps();
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     */
-    public function down()
-    {
-        Schema::dropIfExists(config('shorturl.drivers.local.table_name'));
-    }
+	/**
+	 * Reverse the migrations.
+	 */
+	public function down()
+	{
+		Schema::dropIfExists(config('shorturl.drivers.local.table_name'));
+	}
 }
 

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     public function up()
     {
         $local_conf = config('shorturl.drivers.local');
-        Schema::create($local_conf['table_name'], function (Blueprint $table) use ($local_conf) {
+        Schema::create($local_conf['table_name'], function(Blueprint $table) use ($local_conf) {
             $table->charset = $local_conf['charset'] ?? "utf8";
             $table->collation = $local_conf['collation'] ?? "utf8_bin";
             $table->increments('id');

src/drivers/LocalDriver.php

Indentation +120 added lines, -120 removed lines

@@ -15,84 +15,84 @@ 
 			$this->main_str = $this->config['str_shuffled'];

 			$this->head = $this->main_str[0];

 			$this->tail = $this->main_str[strlen($this->main_str) - 1];

-            $this->checkCaseSensitive ();

+			$this->checkCaseSensitive ();

 		}

 

-        /**

-         * @param string $url

-         *

-         * @return string

-         */

+		/**

+		 * @param string $url

+		 *

+		 * @return string

+		 */

 		public function  expand (string $url) :string

 		{

-		    $this->parseUrl($url);

-		    $link = Link::where("short_path", $this->path)->first();

-		    if ($link) {

-		        $link->increment("clicks");

-		        return $link->base_url . "/" . $link->long_path;

-            }

+			$this->parseUrl($url);

+			$link = Link::where("short_path", $this->path)->first();

+			if ($link) {

+				$link->increment("clicks");

+				return $link->base_url . "/" . $link->long_path;

+			}

 			return "";

 		}

 

-        /**

-         * @param string $url

-         *

-         * @return string

-         * @throws \Exception

-         */

+		/**

+		 * @param string $url

+		 *

+		 * @return string

+		 * @throws \Exception

+		 */

 		public function shorten (string $url) :string

 		{

-            $this->parseUrl ($url);

-

-            // Check if given url has been shorten previously

-            $duplicate = Link::where(['long_path' => $this->path])->first();

-            if ($duplicate)

-                return $duplicate->base_url . "/" . $duplicate->short_path;

-

-            $short_path = $this->getNextShortpath();

-

-            try {

-                Link::create([

-                    "long_path" => $this->path,

-                    "short_path" => $short_path,

-                    'base_url' => $this->base_url,

-                    'properties' => $this->props]

-                );

-            } catch (\Exception $e) {

-                // If it is duplicate entry exception

-                // try to insert a new entry

-                if ($e instanceof \Illuminate\Database\QueryException && $e->getCode() == "23000") {

-                    return $this->shorten($url);

-                }

-            }

-            return $this->base_url . "/" . $short_path;

-        }

-

-        /**

-         * Git the first short url

-         *

-         * @return string

-         */

-        private function getFirstUrl () : string

-        {

-            $min_length = $this->config['min_length'];

-            $short_path = "";

-            for ($i = 0; $i < $min_length; $i++)

-                $short_path .= $this->head;

-            return $short_path;

-        }

-

-        /**

-         *

-         * Get the next short url based on the given item (it gets permutations one by one)

-         *

-         * @param string $current_perm

-         * @return string

-         */

-        private function findNextPerm (string $current_perm) :string

+			$this->parseUrl ($url);

+

+			// Check if given url has been shorten previously

+			$duplicate = Link::where(['long_path' => $this->path])->first();

+			if ($duplicate)

+				return $duplicate->base_url . "/" . $duplicate->short_path;

+

+			$short_path = $this->getNextShortpath();

+

+			try {

+				Link::create([

+					"long_path" => $this->path,

+					"short_path" => $short_path,

+					'base_url' => $this->base_url,

+					'properties' => $this->props]

+				);

+			} catch (\Exception $e) {

+				// If it is duplicate entry exception

+				// try to insert a new entry

+				if ($e instanceof \Illuminate\Database\QueryException && $e->getCode() == "23000") {

+					return $this->shorten($url);

+				}

+			}

+			return $this->base_url . "/" . $short_path;

+		}

+

+		/**

+		 * Git the first short url

+		 *

+		 * @return string

+		 */

+		private function getFirstUrl () : string

+		{

+			$min_length = $this->config['min_length'];

+			$short_path = "";

+			for ($i = 0; $i < $min_length; $i++)

+				$short_path .= $this->head;

+			return $short_path;

+		}

+

+		/**

+		 *

+		 * Get the next short url based on the given item (it gets permutations one by one)

+		 *

+		 * @param string $current_perm

+		 * @return string

+		 */

+		private function findNextPerm (string $current_perm) :string

 		{

 			if (!strlen($current_perm))

-			    return $this->head;

+				return $this->head;

 

 			$arr = array_reverse(str_split($current_perm));

 			foreach($arr as $key => $current_char) {

@@ -100,7 +100,7 @@ 
 					$current_perm = Str::replaceLast($current_char, "", $current_perm);

 					return $this->findNextPerm($current_perm) . $this->head;

 				}

-                $next_char = str_split(Str::after($this->main_str, $current_char))[0];

+				$next_char = str_split(Str::after($this->main_str, $current_char))[0];

 				return Str::replaceLast($current_char, $next_char, $current_perm);

 			}

 		}

@@ -116,56 +116,56 @@ 
 			return $this;

 		}

 

-        private function parseUrl (string $url)

-        {

-            $parse = parse_url($url);

-            $path = "";

-            if ($parse['path'] ?? null)

-                $path .= str::replaceFirst("/", "", $parse['path']);

-            if ($parse['query'] ?? null)

-                $path .= "?" . $parse['query'];

-            if ($parse['fragment'] ?? null)

-                $path .= "#" . $parse['fragment'];

-

-            $this->base_url = str_replace("/" . $path, "", $url);

-            $this->path = $path;

-        }

-

-        private function checkCaseSensitive ()

-        {

-            if ((!$this->config['case_sensitive'] ?? null)) {

-                // Remove upper cases from main string

-                $this->main_str = preg_replace("/(.)\\1+/", "$1", strtolower($this->main_str));

-            }

-        }

-

-        /**

-         * @return string

-         */

-        private function getNextShortpath () : string

-        {

-            $tbl = (new Link)->getTable();

-            // Get latest short_path(s)

-            // As multiple instances could be created at the same timestamp which we get

-            // the latest one based on that

-            // so we must find the latest one(short_path) in the permutation of the main_str

-            $latest = collect(\DB::select("SELECT short_path FROM $tbl WHERE created_at = (SELECT MAX(created_at) FROM $tbl)"));

-

-            if (!$latest->count())

-                return $this->getFirstUrl();

-

-            if ($latest->count() == 1) {

-                return $this->findNextPerm($latest->first()->short_path);

-            }

-            else {

-                foreach ($latest->reverse() as $key => $item) {

-                    $next = $this->findNextPerm($item->short_path);

-

-                    // If next permutation of current item is in fetched items

-                    // find next permutation of the next fetched one

-                    if (!$latest->contains("short_path", $next))

-                        return $next;

-                }

-            }

-        }

+		private function parseUrl (string $url)

+		{

+			$parse = parse_url($url);

+			$path = "";

+			if ($parse['path'] ?? null)

+				$path .= str::replaceFirst("/", "", $parse['path']);

+			if ($parse['query'] ?? null)

+				$path .= "?" . $parse['query'];

+			if ($parse['fragment'] ?? null)

+				$path .= "#" . $parse['fragment'];

+

+			$this->base_url = str_replace("/" . $path, "", $url);

+			$this->path = $path;

+		}

+

+		private function checkCaseSensitive ()

+		{

+			if ((!$this->config['case_sensitive'] ?? null)) {

+				// Remove upper cases from main string

+				$this->main_str = preg_replace("/(.)\\1+/", "$1", strtolower($this->main_str));

+			}

+		}

+

+		/**

+		 * @return string

+		 */

+		private function getNextShortpath () : string

+		{

+			$tbl = (new Link)->getTable();

+			// Get latest short_path(s)

+			// As multiple instances could be created at the same timestamp which we get

+			// the latest one based on that

+			// so we must find the latest one(short_path) in the permutation of the main_str

+			$latest = collect(\DB::select("SELECT short_path FROM $tbl WHERE created_at = (SELECT MAX(created_at) FROM $tbl)"));

+

+			if (!$latest->count())

+				return $this->getFirstUrl();

+

+			if ($latest->count() == 1) {

+				return $this->findNextPerm($latest->first()->short_path);

+			}

+			else {

+				foreach ($latest->reverse() as $key => $item) {

+					$next = $this->findNextPerm($item->short_path);

+

+					// If next permutation of current item is in fetched items

+					// find next permutation of the next fetched one

+					if (!$latest->contains("short_path", $next))

+						return $next;

+				}

+			}

+		}

 	}
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -9,13 +9,13 @@ 
 		protected  $props = [];

 		protected $config, $main_str, $head, $tail, $base_url, $path;

 		

-		public function __construct ()

+		public function __construct()

 		{

 			$this->config = config('shorturl.drivers.local');

 			$this->main_str = $this->config['str_shuffled'];

 			$this->head = $this->main_str[0];

 			$this->tail = $this->main_str[strlen($this->main_str) - 1];

-            $this->checkCaseSensitive ();

+            $this->checkCaseSensitive();

 		}

 

         /**

@@ -23,7 +23,7 @@ 
          *

          * @return string

          */

-		public function  expand (string $url) :string

+		public function  expand(string $url) :string

 		{

 		    $this->parseUrl($url);

 		    $link = Link::where("short_path", $this->path)->first();

@@ -40,9 +40,9 @@ 
          * @return string

          * @throws \Exception

          */

-		public function shorten (string $url) :string

+		public function shorten(string $url) :string

 		{

-            $this->parseUrl ($url);

+            $this->parseUrl($url);

 

             // Check if given url has been shorten previously

             $duplicate = Link::where(['long_path' => $this->path])->first();

@@ -73,7 +73,7 @@ 
          *

          * @return string

          */

-        private function getFirstUrl () : string

+        private function getFirstUrl() : string

         {

             $min_length = $this->config['min_length'];

             $short_path = "";

@@ -89,13 +89,13 @@ 
          * @param string $current_perm

          * @return string

          */

-        private function findNextPerm (string $current_perm) :string

+        private function findNextPerm(string $current_perm) :string

 		{

 			if (!strlen($current_perm))

 			    return $this->head;

 

 			$arr = array_reverse(str_split($current_perm));

-			foreach($arr as $key => $current_char) {

+			foreach ($arr as $key => $current_char) {

 				if ($current_char == $this->tail) {

 					$current_perm = Str::replaceLast($current_char, "", $current_perm);

 					return $this->findNextPerm($current_perm) . $this->head;

@@ -110,13 +110,13 @@ 
 		 *

 		 * @return LocalDriver

 		 */

-		public function withProperties (array $props = []) :LocalDriver

+		public function withProperties(array $props = []) :LocalDriver

 		{

 			$this->props = array_merge($this->props, $props);

 			return $this;

 		}

 

-        private function parseUrl (string $url)

+        private function parseUrl(string $url)

         {

             $parse = parse_url($url);

             $path = "";

@@ -131,7 +131,7 @@ 
             $this->path = $path;

         }

 

-        private function checkCaseSensitive ()

+        private function checkCaseSensitive()

         {

             if ((!$this->config['case_sensitive'] ?? null)) {

                 // Remove upper cases from main string

@@ -142,7 +142,7 @@ 
         /**

          * @return string

          */

-        private function getNextShortpath () : string

+        private function getNextShortpath() : string

         {

             $tbl = (new Link)->getTable();

             // Get latest short_path(s)

Braces +25 added lines, -18 removed lines

@@ -46,8 +46,9 @@ 
 

             // Check if given url has been shorten previously

             $duplicate = Link::where(['long_path' => $this->path])->first();

-            if ($duplicate)

-                return $duplicate->base_url . "/" . $duplicate->short_path;

+            if ($duplicate) {

+                            return $duplicate->base_url . "/" . $duplicate->short_path;

+            }

 

             $short_path = $this->getNextShortpath();

 

@@ -77,8 +78,9 @@ 
         {

             $min_length = $this->config['min_length'];

             $short_path = "";

-            for ($i = 0; $i < $min_length; $i++)

-                $short_path .= $this->head;

+            for ($i = 0; $i < $min_length; $i++) {

+                            $short_path .= $this->head;

+            }

             return $short_path;

         }

 

@@ -91,8 +93,9 @@ 
          */

         private function findNextPerm (string $current_perm) :string

 		{

-			if (!strlen($current_perm))

-			    return $this->head;

+			if (!strlen($current_perm)) {

+						    return $this->head;

+			}

 

 			$arr = array_reverse(str_split($current_perm));

 			foreach($arr as $key => $current_char) {

@@ -120,12 +123,15 @@ 
         {

             $parse = parse_url($url);

             $path = "";

-            if ($parse['path'] ?? null)

-                $path .= str::replaceFirst("/", "", $parse['path']);

-            if ($parse['query'] ?? null)

-                $path .= "?" . $parse['query'];

-            if ($parse['fragment'] ?? null)

-                $path .= "#" . $parse['fragment'];

+            if ($parse['path'] ?? null) {

+                            $path .= str::replaceFirst("/", "", $parse['path']);

+            }

+            if ($parse['query'] ?? null) {

+                            $path .= "?" . $parse['query'];

+            }

+            if ($parse['fragment'] ?? null) {

+                            $path .= "#" . $parse['fragment'];

+            }

 

             $this->base_url = str_replace("/" . $path, "", $url);

             $this->path = $path;

@@ -151,20 +157,21 @@ 
             // so we must find the latest one(short_path) in the permutation of the main_str

             $latest = collect(\DB::select("SELECT short_path FROM $tbl WHERE created_at = (SELECT MAX(created_at) FROM $tbl)"));

 

-            if (!$latest->count())

-                return $this->getFirstUrl();

+            if (!$latest->count()) {

+                            return $this->getFirstUrl();

+            }

 

             if ($latest->count() == 1) {

                 return $this->findNextPerm($latest->first()->short_path);

-            }

-            else {

+            } else {

                 foreach ($latest->reverse() as $key => $item) {

                     $next = $this->findNextPerm($item->short_path);

 

                     // If next permutation of current item is in fetched items

                     // find next permutation of the next fetched one

-                    if (!$latest->contains("short_path", $next))

-                        return $next;

+                    if (!$latest->contains("short_path", $next)) {

+                                            return $next;

+                    }

                 }

             }

         }