Inspection of "Fix CreateUser return type" - mmainstreet/jodel-web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( af5052...240863 )

by mains

created 2016-11-22 14:14 UTC

Status

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -33,6 +33,9 @@
 block discarded – undo
         return $this->random_str(64, 'abcdef0123456789');
     }
     
+    /**
+     * @param integer $length
+     */
     private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
     {
         $str = '';

Please login to merge, or discard this patch.

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

@@ -1,53 +1,53 @@  discard block
 block discarded – undo
 <?php
 
 class CreateUser extends AbstractRequest {
-    /**
-     * @var Location
-     */
-    private $location;
-    private $deviceUid;
-    /**
-     * @return Location
-     */
-    private function getLocation()
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation(Location $location)
-    {
-        $this->location = $location;
-    }
-    private function getDeviceUid()
-    {
+	/**
+	 * @var Location
+	 */
+	private $location;
+	private $deviceUid;
+	/**
+	 * @return Location
+	 */
+	private function getLocation()
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation(Location $location)
+	{
+		$this->location = $location;
+	}
+	private function getDeviceUid()
+	{
 		return $this->deviceUid;
 	}
 	public function setDeviceUid($deviceUid)
-    {
+	{
 			$this->deviceUid = $deviceUid;
 	}
-    private function generateDeviceUid()
-    {
-        return $this->random_str(64, 'abcdef0123456789');
-    }
+	private function generateDeviceUid()
+	{
+		return $this->random_str(64, 'abcdef0123456789');
+	}
     
-    private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
-    {
-        $str = '';
-        $max = mb_strlen($keyspace, '8bit') - 1;
-        for ($i = 0; $i < $length; ++$i) {
-            $str .= $keyspace[random_int(0, $max)];
-        }
-        return $str;
-    }
-    public function getApiEndPoint()
-    {
-        return '/v2/users';
-    }
-    public function getPayload()
-    {
+	private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+	{
+		$str = '';
+		$max = mb_strlen($keyspace, '8bit') - 1;
+		for ($i = 0; $i < $length; ++$i) {
+			$str .= $keyspace[random_int(0, $max)];
+		}
+		return $str;
+	}
+	public function getApiEndPoint()
+	{
+		return '/v2/users';
+	}
+	public function getPayload()
+	{
 			if(!isset($this->deviceUid))
 			{
 				$this->setDeviceUid($this->generateDeviceUid());
@@ -58,9 +58,9 @@  discard block
 block discarded – undo
 					"client_id" => self::CLIENTID,
 					"device_uid" => $this->getDeviceUid(),
 			);
-    }
-    public function getMethod()
-    {
-        return 'POST';
-    }
+	}
+	public function getMethod()
+	{
+		return 'POST';
+	}
 }

Please login to merge, or discard this patch.

php/Requests/AbstractRequest.php 1 patch

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

@@ -2,19 +2,19 @@  discard block
 block discarded – undo
 
 abstract class AbstractRequest
 {	
-    CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
-    CONST APIURL = 'https://api.go-tellm.com/api';
-    const SECRET = "VwJHzYUbPjGiXWauoVNaHoCWsaacTmnkGwNtHhjy";
-    const USERAGENT = "Jodel/4.27.1 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
-    const CLIENT_TYPE = 'android_4.27.1';
+	CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
+	CONST APIURL = 'https://api.go-tellm.com/api';
+	const SECRET = "VwJHzYUbPjGiXWauoVNaHoCWsaacTmnkGwNtHhjy";
+	const USERAGENT = "Jodel/4.27.1 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
+	const CLIENT_TYPE = 'android_4.27.1';
     
-    /**
-     * @var string
-     */
-    private $accessToken = null;
-    private $payLoad;
-    public function execute()
-    {
+	/**
+	 * @var string
+	 */
+	private $accessToken = null;
+	private $payLoad;
+	public function execute()
+	{
 		$result = new \stdClass();
 		        
 		$this->payLoad = $this->getPayload();
@@ -24,71 +24,71 @@  discard block
 block discarded – undo
 		}
 				
 				
-        $this->payLoad = json_encode($this->payLoad);
-        $header = $this->getSignHeaders();
-        $url = $this->getFullUrl();
+		$this->payLoad = json_encode($this->payLoad);
+		$header = $this->getSignHeaders();
+		$url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
-            $header['Authorization'] = "Bearer " . $this->getAccessToken();
-        }
-        //Comment out to debug the Request:
-        /*
+		if ($this->getAccessToken()) {
+			$header['Authorization'] = "Bearer " . $this->getAccessToken();
+		}
+		//Comment out to debug the Request:
+		/*
         *var_dump($url);
         *var_dump($header);
         *var_dump($this->payLoad);
         */
         
 
-        switch ($this->getMethod()) {
-            case 'POST':
-                $result = Requests::post($url, $header, $this->payLoad);
-                break;
-            case 'GET':
-                $result = Requests::get($url, $header);
-                break;
-            case 'PUT':
-                $result = Requests::put($url, $header, $this->payLoad);
-                break;
-        }
-        switch ($result->status_code) {
-            case 200:
-                $result = json_decode($result->body, true);
-                break;
-            case 204:
-                $result = "Success";
-                break;
-            case 401:
+		switch ($this->getMethod()) {
+			case 'POST':
+				$result = Requests::post($url, $header, $this->payLoad);
+				break;
+			case 'GET':
+				$result = Requests::get($url, $header);
+				break;
+			case 'PUT':
+				$result = Requests::put($url, $header, $this->payLoad);
+				break;
+		}
+		switch ($result->status_code) {
+			case 200:
+				$result = json_decode($result->body, true);
+				break;
+			case 204:
+				$result = "Success";
+				break;
+			case 401:
 				throw new \Exception('Unauthorized');
-                break;
-            case 404:
-                echo "Es wurde bereits gevoted";
+				break;
+			case 404:
+				echo "Es wurde bereits gevoted";
 			case 477:
-                echo "Es wurde bereits gevoted";
-                throw  new \Exception('Signing failed!');
-                break;
-            default:
-                throw  new \Exception('Unknown Error: '.$result->status_code);
-        }
+				echo "Es wurde bereits gevoted";
+				throw  new \Exception('Signing failed!');
+				break;
+			default:
+				throw  new \Exception('Unknown Error: '.$result->status_code);
+		}
 
-        if($device_uid != "")
-        {
+		if($device_uid != "")
+		{
 			$result[0] = $result;
 			$result[1] = $device_uid;
 		}
 
-        /*
+		/*
         var_dump($result);
         */
 
-        return $result;
-    }
-    abstract function getPayload();
-    /**
-     * Gets Sign headers
-     * @return array headers
-     */
-    private function getSignHeaders()
-    {
+		return $result;
+	}
+	abstract function getPayload();
+	/**
+	 * Gets Sign headers
+	 * @return array headers
+	 */
+	private function getSignHeaders()
+	{
 			if($this->getAccessToken() == null) {
 				$payload_accessToken = "";
 			}
@@ -97,54 +97,54 @@  discard block
 block discarded – undo
 			}
 			
 			
-        $headers = array(
-            "Connection" => "keep-alive",
-            "Accept-Encoding" => "gzip",
-            "Content-Type" => "application/json; charset=UTF-8",
-            "User-Agent" => self::USERAGENT
-        );
-        $timestamp = new DateTime();
-        $timestamp = $timestamp->format(DateTime::ATOM);
-        $timestamp = substr($timestamp, 0, -6);
-        $timestamp .= "Z";
-        $urlParts = parse_url($this->getFullUrl());
-        $url2 = "";
-        $req = [$this->getMethod(),
-            $urlParts['host'],
-            "443",
-            $urlParts['path'],
-            $payload_accessToken,
-            $timestamp,
-            $url2,
-            $this->payLoad];
-        $reqString = implode("%", $req);
-        $secret = self::SECRET;
-        $signature = hash_hmac('sha1', $reqString, $secret);
-        $signature = strtoupper($signature);
-        $headers['X-Authorization'] = 'HMAC ' . $signature;
-        $headers['X-Client-Type'] = self::CLIENT_TYPE;
-        $headers['X-Timestamp'] = $timestamp;
-        $headers['X-Api-Version'] = '0.2';
-        return $headers;
-    }
-    private function getFullUrl()
-    {
-        return self::APIURL . $this->getApiEndPoint();
-    }
-    abstract function getApiEndPoint();
-    abstract function getMethod();
-    /**
-     * @return string
-     */
-    private function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-    /**
-     * @param string $accessToken
-     */
-    public function setAccessToken(string $accessToken)
-    {
-        $this->accessToken = $accessToken;
-    }
+		$headers = array(
+			"Connection" => "keep-alive",
+			"Accept-Encoding" => "gzip",
+			"Content-Type" => "application/json; charset=UTF-8",
+			"User-Agent" => self::USERAGENT
+		);
+		$timestamp = new DateTime();
+		$timestamp = $timestamp->format(DateTime::ATOM);
+		$timestamp = substr($timestamp, 0, -6);
+		$timestamp .= "Z";
+		$urlParts = parse_url($this->getFullUrl());
+		$url2 = "";
+		$req = [$this->getMethod(),
+			$urlParts['host'],
+			"443",
+			$urlParts['path'],
+			$payload_accessToken,
+			$timestamp,
+			$url2,
+			$this->payLoad];
+		$reqString = implode("%", $req);
+		$secret = self::SECRET;
+		$signature = hash_hmac('sha1', $reqString, $secret);
+		$signature = strtoupper($signature);
+		$headers['X-Authorization'] = 'HMAC ' . $signature;
+		$headers['X-Client-Type'] = self::CLIENT_TYPE;
+		$headers['X-Timestamp'] = $timestamp;
+		$headers['X-Api-Version'] = '0.2';
+		return $headers;
+	}
+	private function getFullUrl()
+	{
+		return self::APIURL . $this->getApiEndPoint();
+	}
+	abstract function getApiEndPoint();
+	abstract function getMethod();
+	/**
+	 * @return string
+	 */
+	private function getAccessToken()
+	{
+		return $this->accessToken;
+	}
+	/**
+	 * @param string $accessToken
+	 */
+	public function setAccessToken(string $accessToken)
+	{
+		$this->accessToken = $accessToken;
+	}
 }

Please login to merge, or discard this patch.

		@@ -33,6 +33,9 @@
		block discarded – undo
33	33	return $this->random_str(64, 'abcdef0123456789');
34	34	}
35	35
	36	+ /**
	37	+ * @param integer $length
	38	+ */
36	39	private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
37	40	{
38	41	$str = '';

		@@ -1,53 +1,53 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3	3	class CreateUser extends AbstractRequest {
4		- /**
5		- * @var Location
6		- */
7		- private $location;
8		- private $deviceUid;
9		- /**
10		- * @return Location
11		- */
12		- private function getLocation()
13		- {
14		- return $this->location;
15		- }
16		- /**
17		- * @param Location $location
18		- */
19		- public function setLocation(Location $location)
20		- {
21		- $this->location = $location;
22		- }
23		- private function getDeviceUid()
24		- {
	4	+ /**
	5	+ * @var Location
	6	+ */
	7	+ private $location;
	8	+ private $deviceUid;
	9	+ /**
	10	+ * @return Location
	11	+ */
	12	+ private function getLocation()
	13	+ {
	14	+ return $this->location;
	15	+ }
	16	+ /**
	17	+ * @param Location $location
	18	+ */
	19	+ public function setLocation(Location $location)
	20	+ {
	21	+ $this->location = $location;
	22	+ }
	23	+ private function getDeviceUid()
	24	+ {
25	25	return $this->deviceUid;
26	26	}
27	27	public function setDeviceUid($deviceUid)
28		- {
	28	+ {
29	29	$this->deviceUid = $deviceUid;
30	30	}
31		- private function generateDeviceUid()
32		- {
33		- return $this->random_str(64, 'abcdef0123456789');
34		- }
	31	+ private function generateDeviceUid()
	32	+ {
	33	+ return $this->random_str(64, 'abcdef0123456789');
	34	+ }
35	35
36		- private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
37		- {
38		- $str = '';
39		- $max = mb_strlen($keyspace, '8bit') - 1;
40		- for ($i = 0; $i < $length; ++$i) {
41		- $str .= $keyspace[random_int(0, $max)];
42		- }
43		- return $str;
44		- }
45		- public function getApiEndPoint()
46		- {
47		- return '/v2/users';
48		- }
49		- public function getPayload()
50		- {
	36	+ private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
	37	+ {
	38	+ $str = '';
	39	+ $max = mb_strlen($keyspace, '8bit') - 1;
	40	+ for ($i = 0; $i < $length; ++$i) {
	41	+ $str .= $keyspace[random_int(0, $max)];
	42	+ }
	43	+ return $str;
	44	+ }
	45	+ public function getApiEndPoint()
	46	+ {
	47	+ return '/v2/users';
	48	+ }
	49	+ public function getPayload()
	50	+ {
51	51	if(!isset($this->deviceUid))
52	52	{
53	53	$this->setDeviceUid($this->generateDeviceUid());
		@@ -58,9 +58,9 @@ discard block
		block discarded – undo
58	58	"client_id" => self::CLIENTID,
59	59	"device_uid" => $this->getDeviceUid(),
60	60	);
61		- }
62		- public function getMethod()
63		- {
64		- return 'POST';
65		- }
	61	+ }
	62	+ public function getMethod()
	63	+ {
	64	+ return 'POST';
	65	+ }
66	66	}

		@@ -2,19 +2,19 @@ discard block
		block discarded – undo
2	2
3	3	abstract class AbstractRequest
4	4	{
5		- CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
6		- CONST APIURL = 'https://api.go-tellm.com/api';
7		- const SECRET = "VwJHzYUbPjGiXWauoVNaHoCWsaacTmnkGwNtHhjy";
8		- const USERAGENT = "Jodel/4.27.1 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
9		- const CLIENT_TYPE = 'android_4.27.1';
	5	+ CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
	6	+ CONST APIURL = 'https://api.go-tellm.com/api';
	7	+ const SECRET = "VwJHzYUbPjGiXWauoVNaHoCWsaacTmnkGwNtHhjy";
	8	+ const USERAGENT = "Jodel/4.27.1 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
	9	+ const CLIENT_TYPE = 'android_4.27.1';
10	10
11		- /**
12		- * @var string
13		- */
14		- private $accessToken = null;
15		- private $payLoad;
16		- public function execute()
17		- {
	11	+ /**
	12	+ * @var string
	13	+ */
	14	+ private $accessToken = null;
	15	+ private $payLoad;
	16	+ public function execute()
	17	+ {
18	18	$result = new \stdClass();
19	19
20	20	$this->payLoad = $this->getPayload();
		@@ -24,71 +24,71 @@ discard block
		block discarded – undo
24	24	}
25	25
26	26
27		- $this->payLoad = json_encode($this->payLoad);
28		- $header = $this->getSignHeaders();
29		- $url = $this->getFullUrl();
	27	+ $this->payLoad = json_encode($this->payLoad);
	28	+ $header = $this->getSignHeaders();
	29	+ $url = $this->getFullUrl();
30	30
31		- if ($this->getAccessToken()) {
32		- $header['Authorization'] = "Bearer " . $this->getAccessToken();
33		- }
34		- //Comment out to debug the Request:
35		- /*
	31	+ if ($this->getAccessToken()) {
	32	+ $header['Authorization'] = "Bearer " . $this->getAccessToken();
	33	+ }
	34	+ //Comment out to debug the Request:
	35	+ /*
36	36	*var_dump($url);
37	37	*var_dump($header);
38	38	*var_dump($this->payLoad);
39	39	*/
40	40
41	41
42		- switch ($this->getMethod()) {
43		- case 'POST':
44		- $result = Requests::post($url, $header, $this->payLoad);
45		- break;
46		- case 'GET':
47		- $result = Requests::get($url, $header);
48		- break;
49		- case 'PUT':
50		- $result = Requests::put($url, $header, $this->payLoad);
51		- break;
52		- }
53		- switch ($result->status_code) {
54		- case 200:
55		- $result = json_decode($result->body, true);
56		- break;
57		- case 204:
58		- $result = "Success";
59		- break;
60		- case 401:
	42	+ switch ($this->getMethod()) {
	43	+ case 'POST':
	44	+ $result = Requests::post($url, $header, $this->payLoad);
	45	+ break;
	46	+ case 'GET':
	47	+ $result = Requests::get($url, $header);
	48	+ break;
	49	+ case 'PUT':
	50	+ $result = Requests::put($url, $header, $this->payLoad);
	51	+ break;
	52	+ }
	53	+ switch ($result->status_code) {
	54	+ case 200:
	55	+ $result = json_decode($result->body, true);
	56	+ break;
	57	+ case 204:
	58	+ $result = "Success";
	59	+ break;
	60	+ case 401:
61	61	throw new \Exception('Unauthorized');
62		- break;
63		- case 404:
64		- echo "Es wurde bereits gevoted";
	62	+ break;
	63	+ case 404:
	64	+ echo "Es wurde bereits gevoted";
65	65	case 477:
66		- echo "Es wurde bereits gevoted";
67		- throw new \Exception('Signing failed!');
68		- break;
69		- default:
70		- throw new \Exception('Unknown Error: '.$result->status_code);
71		- }
	66	+ echo "Es wurde bereits gevoted";
	67	+ throw new \Exception('Signing failed!');
	68	+ break;
	69	+ default:
	70	+ throw new \Exception('Unknown Error: '.$result->status_code);
	71	+ }
72	72
73		- if($device_uid != "")
74		- {
	73	+ if($device_uid != "")
	74	+ {
75	75	$result[0] = $result;
76	76	$result[1] = $device_uid;
77	77	}
78	78
79		- /*
	79	+ /*
80	80	var_dump($result);
81	81	*/
82	82
83		- return $result;
84		- }
85		- abstract function getPayload();
86		- /**
87		- * Gets Sign headers
88		- * @return array headers
89		- */
90		- private function getSignHeaders()
91		- {
	83	+ return $result;
	84	+ }
	85	+ abstract function getPayload();
	86	+ /**
	87	+ * Gets Sign headers
	88	+ * @return array headers
	89	+ */
	90	+ private function getSignHeaders()
	91	+ {
92	92	if($this->getAccessToken() == null) {
93	93	$payload_accessToken = "";
94	94	}
		@@ -97,54 +97,54 @@ discard block
		block discarded – undo
97	97	}
98	98
99	99
100		- $headers = array(
101		- "Connection" => "keep-alive",
102		- "Accept-Encoding" => "gzip",
103		- "Content-Type" => "application/json; charset=UTF-8",
104		- "User-Agent" => self::USERAGENT
105		- );
106		- $timestamp = new DateTime();
107		- $timestamp = $timestamp->format(DateTime::ATOM);
108		- $timestamp = substr($timestamp, 0, -6);
109		- $timestamp .= "Z";
110		- $urlParts = parse_url($this->getFullUrl());
111		- $url2 = "";
112		- $req = [$this->getMethod(),
113		- $urlParts['host'],
114		- "443",
115		- $urlParts['path'],
116		- $payload_accessToken,
117		- $timestamp,
118		- $url2,
119		- $this->payLoad];
120		- $reqString = implode("%", $req);
121		- $secret = self::SECRET;
122		- $signature = hash_hmac('sha1', $reqString, $secret);
123		- $signature = strtoupper($signature);
124		- $headers['X-Authorization'] = 'HMAC ' . $signature;
125		- $headers['X-Client-Type'] = self::CLIENT_TYPE;
126		- $headers['X-Timestamp'] = $timestamp;
127		- $headers['X-Api-Version'] = '0.2';
128		- return $headers;
129		- }
130		- private function getFullUrl()
131		- {
132		- return self::APIURL . $this->getApiEndPoint();
133		- }
134		- abstract function getApiEndPoint();
135		- abstract function getMethod();
136		- /**
137		- * @return string
138		- */
139		- private function getAccessToken()
140		- {
141		- return $this->accessToken;
142		- }
143		- /**
144		- * @param string $accessToken
145		- */
146		- public function setAccessToken(string $accessToken)
147		- {
148		- $this->accessToken = $accessToken;
149		- }
	100	+ $headers = array(
	101	+ "Connection" => "keep-alive",
	102	+ "Accept-Encoding" => "gzip",
	103	+ "Content-Type" => "application/json; charset=UTF-8",
	104	+ "User-Agent" => self::USERAGENT
	105	+ );
	106	+ $timestamp = new DateTime();
	107	+ $timestamp = $timestamp->format(DateTime::ATOM);
	108	+ $timestamp = substr($timestamp, 0, -6);
	109	+ $timestamp .= "Z";
	110	+ $urlParts = parse_url($this->getFullUrl());
	111	+ $url2 = "";
	112	+ $req = [$this->getMethod(),
	113	+ $urlParts['host'],
	114	+ "443",
	115	+ $urlParts['path'],
	116	+ $payload_accessToken,
	117	+ $timestamp,
	118	+ $url2,
	119	+ $this->payLoad];
	120	+ $reqString = implode("%", $req);
	121	+ $secret = self::SECRET;
	122	+ $signature = hash_hmac('sha1', $reqString, $secret);
	123	+ $signature = strtoupper($signature);
	124	+ $headers['X-Authorization'] = 'HMAC ' . $signature;
	125	+ $headers['X-Client-Type'] = self::CLIENT_TYPE;
	126	+ $headers['X-Timestamp'] = $timestamp;
	127	+ $headers['X-Api-Version'] = '0.2';
	128	+ return $headers;
	129	+ }
	130	+ private function getFullUrl()
	131	+ {
	132	+ return self::APIURL . $this->getApiEndPoint();
	133	+ }
	134	+ abstract function getApiEndPoint();
	135	+ abstract function getMethod();
	136	+ /**
	137	+ * @return string
	138	+ */
	139	+ private function getAccessToken()
	140	+ {
	141	+ return $this->accessToken;
	142	+ }
	143	+ /**
	144	+ * @param string $accessToken
	145	+ */
	146	+ public function setAccessToken(string $accessToken)
	147	+ {
	148	+ $this->accessToken = $accessToken;
	149	+ }
150	150	}

mmainstreet / jodel-web

Push — master ( af5052...240863 )

Status

Category

Doc Comments +3 added lines patch added patch discarded remove patch

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

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