Inspection of "Code refactor" - akoSalman/Shorturl - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 1227c2...8eadee )

by Ako

created 2019-03-14 09:57 UTC

Status

Indentation +120 added lines, -120 removed lines patch added patch discarded remove patch

@@ -15,84 +15,84 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 					$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 @@  discard block
 block discarded – undo
 			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

Please login to merge, or discard this patch.

		@@ -15,84 +15,84 @@ discard block
		block discarded – undo
15	15	$this->main_str = $this->config['str_shuffled'];
16	16	$this->head = $this->main_str[0];
17	17	$this->tail = $this->main_str[strlen($this->main_str) - 1];
18		- $this->checkCaseSensitive ();
	18	+ $this->checkCaseSensitive ();
19	19	}
20	20
21		- /**
22		- * @param string $url
23		- *
24		- * @return string
25		- */
	21	+ /**
	22	+ * @param string $url
	23	+ *
	24	+ * @return string
	25	+ */
26	26	public function expand (string $url) :string
27	27	{
28		- $this->parseUrl($url);
29		- $link = Link::where("short_path", $this->path)->first();
30		- if ($link) {
31		- $link->increment("clicks");
32		- return $link->base_url . "/" . $link->long_path;
33		- }
	28	+ $this->parseUrl($url);
	29	+ $link = Link::where("short_path", $this->path)->first();
	30	+ if ($link) {
	31	+ $link->increment("clicks");
	32	+ return $link->base_url . "/" . $link->long_path;
	33	+ }
34	34	return "";
35	35	}
36	36
37		- /**
38		- * @param string $url
39		- *
40		- * @return string
41		- * @throws \Exception
42		- */
	37	+ /**
	38	+ * @param string $url
	39	+ *
	40	+ * @return string
	41	+ * @throws \Exception
	42	+ */
43	43	public function shorten (string $url) :string
44	44	{
45		- $this->parseUrl ($url);
46		-
47		- // Check if given url has been shorten previously
48		- $duplicate = Link::where(['long_path' => $this->path])->first();
49		- if ($duplicate)
50		- return $duplicate->base_url . "/" . $duplicate->short_path;
51		-
52		- $short_path = $this->getNextShortpath();
53		-
54		- try {
55		- Link::create([
56		- "long_path" => $this->path,
57		- "short_path" => $short_path,
58		- 'base_url' => $this->base_url,
59		- 'properties' => $this->props]
60		- );
61		- } catch (\Exception $e) {
62		- // If it is duplicate entry exception
63		- // try to insert a new entry
64		- if ($e instanceof \Illuminate\Database\QueryException && $e->getCode() == "23000") {
65		- return $this->shorten($url);
66		- }
67		- }
68		- return $this->base_url . "/" . $short_path;
69		- }
70		-
71		- /**
72		- * Git the first short url
73		- *
74		- * @return string
75		- */
76		- private function getFirstUrl () : string
77		- {
78		- $min_length = $this->config['min_length'];
79		- $short_path = "";
80		- for ($i = 0; $i < $min_length; $i++)
81		- $short_path .= $this->head;
82		- return $short_path;
83		- }
84		-
85		- /**
86		- *
87		- * Get the next short url based on the given item (it gets permutations one by one)
88		- *
89		- * @param string $current_perm
90		- * @return string
91		- */
92		- private function findNextPerm (string $current_perm) :string
	45	+ $this->parseUrl ($url);
	46	+
	47	+ // Check if given url has been shorten previously
	48	+ $duplicate = Link::where(['long_path' => $this->path])->first();
	49	+ if ($duplicate)
	50	+ return $duplicate->base_url . "/" . $duplicate->short_path;
	51	+
	52	+ $short_path = $this->getNextShortpath();
	53	+
	54	+ try {
	55	+ Link::create([
	56	+ "long_path" => $this->path,
	57	+ "short_path" => $short_path,
	58	+ 'base_url' => $this->base_url,
	59	+ 'properties' => $this->props]
	60	+ );
	61	+ } catch (\Exception $e) {
	62	+ // If it is duplicate entry exception
	63	+ // try to insert a new entry
	64	+ if ($e instanceof \Illuminate\Database\QueryException && $e->getCode() == "23000") {
	65	+ return $this->shorten($url);
	66	+ }
	67	+ }
	68	+ return $this->base_url . "/" . $short_path;
	69	+ }
	70	+
	71	+ /**
	72	+ * Git the first short url
	73	+ *
	74	+ * @return string
	75	+ */
	76	+ private function getFirstUrl () : string
	77	+ {
	78	+ $min_length = $this->config['min_length'];
	79	+ $short_path = "";
	80	+ for ($i = 0; $i < $min_length; $i++)
	81	+ $short_path .= $this->head;
	82	+ return $short_path;
	83	+ }
	84	+
	85	+ /**
	86	+ *
	87	+ * Get the next short url based on the given item (it gets permutations one by one)
	88	+ *
	89	+ * @param string $current_perm
	90	+ * @return string
	91	+ */
	92	+ private function findNextPerm (string $current_perm) :string
93	93	{
94	94	if (!strlen($current_perm))
95		- return $this->head;
	95	+ return $this->head;
96	96
97	97	$arr = array_reverse(str_split($current_perm));
98	98	foreach($arr as $key => $current_char) {
		@@ -100,7 +100,7 @@ discard block
		block discarded – undo
100	100	$current_perm = Str::replaceLast($current_char, "", $current_perm);
101	101	return $this->findNextPerm($current_perm) . $this->head;
102	102	}
103		- $next_char = str_split(Str::after($this->main_str, $current_char))[0];
	103	+ $next_char = str_split(Str::after($this->main_str, $current_char))[0];
104	104	return Str::replaceLast($current_char, $next_char, $current_perm);
105	105	}
106	106	}
		@@ -116,56 +116,56 @@ discard block
		block discarded – undo
116	116	return $this;
117	117	}
118	118
119		- private function parseUrl (string $url)
120		- {
121		- $parse = parse_url($url);
122		- $path = "";
123		- if ($parse['path'] ?? null)
124		- $path .= str::replaceFirst("/", "", $parse['path']);
125		- if ($parse['query'] ?? null)
126		- $path .= "?" . $parse['query'];
127		- if ($parse['fragment'] ?? null)
128		- $path .= "#" . $parse['fragment'];
129		-
130		- $this->base_url = str_replace("/" . $path, "", $url);
131		- $this->path = $path;
132		- }
133		-
134		- private function checkCaseSensitive ()
135		- {
136		- if ((!$this->config['case_sensitive'] ?? null)) {
137		- // Remove upper cases from main string
138		- $this->main_str = preg_replace("/(.)\\1+/", "$1", strtolower($this->main_str));
139		- }
140		- }
141		-
142		- /**
143		- * @return string
144		- */
145		- private function getNextShortpath () : string
146		- {
147		- $tbl = (new Link)->getTable();
148		- // Get latest short_path(s)
149		- // As multiple instances could be created at the same timestamp which we get
150		- // the latest one based on that
151		- // so we must find the latest one(short_path) in the permutation of the main_str
152		- $latest = collect(\DB::select("SELECT short_path FROM $tbl WHERE created_at = (SELECT MAX(created_at) FROM $tbl)"));
153		-
154		- if (!$latest->count())
155		- return $this->getFirstUrl();
156		-
157		- if ($latest->count() == 1) {
158		- return $this->findNextPerm($latest->first()->short_path);
159		- }
160		- else {
161		- foreach ($latest->reverse() as $key => $item) {
162		- $next = $this->findNextPerm($item->short_path);
163		-
164		- // If next permutation of current item is in fetched items
165		- // find next permutation of the next fetched one
166		- if (!$latest->contains("short_path", $next))
167		- return $next;
168		- }
169		- }
170		- }
	119	+ private function parseUrl (string $url)
	120	+ {
	121	+ $parse = parse_url($url);
	122	+ $path = "";
	123	+ if ($parse['path'] ?? null)
	124	+ $path .= str::replaceFirst("/", "", $parse['path']);
	125	+ if ($parse['query'] ?? null)
	126	+ $path .= "?" . $parse['query'];
	127	+ if ($parse['fragment'] ?? null)
	128	+ $path .= "#" . $parse['fragment'];
	129	+
	130	+ $this->base_url = str_replace("/" . $path, "", $url);
	131	+ $this->path = $path;
	132	+ }
	133	+
	134	+ private function checkCaseSensitive ()
	135	+ {
	136	+ if ((!$this->config['case_sensitive'] ?? null)) {
	137	+ // Remove upper cases from main string
	138	+ $this->main_str = preg_replace("/(.)\\1+/", "$1", strtolower($this->main_str));
	139	+ }
	140	+ }
	141	+
	142	+ /**
	143	+ * @return string
	144	+ */
	145	+ private function getNextShortpath () : string
	146	+ {
	147	+ $tbl = (new Link)->getTable();
	148	+ // Get latest short_path(s)
	149	+ // As multiple instances could be created at the same timestamp which we get
	150	+ // the latest one based on that
	151	+ // so we must find the latest one(short_path) in the permutation of the main_str
	152	+ $latest = collect(\DB::select("SELECT short_path FROM $tbl WHERE created_at = (SELECT MAX(created_at) FROM $tbl)"));
	153	+
	154	+ if (!$latest->count())
	155	+ return $this->getFirstUrl();
	156	+
	157	+ if ($latest->count() == 1) {
	158	+ return $this->findNextPerm($latest->first()->short_path);
	159	+ }
	160	+ else {
	161	+ foreach ($latest->reverse() as $key => $item) {
	162	+ $next = $this->findNextPerm($item->short_path);
	163	+
	164	+ // If next permutation of current item is in fetched items
	165	+ // find next permutation of the next fetched one
	166	+ if (!$latest->contains("short_path", $next))
	167	+ return $next;
	168	+ }
	169	+ }
	170	+ }
171	171	}
172	172	\ No newline at end of file

akoSalman / Shorturl

Push — master ( 1227c2...8eadee )

Status

Category

Indentation +120 added lines, -120 removed lines patch added patch discarded remove patch