@@ -214,6 +214,7 @@ discard block |
||
214 | 214 | * Set the HTTP method for this request. |
215 | 215 | * |
216 | 216 | * @param string |
217 | + * @param string|null $method |
|
217 | 218 | * |
218 | 219 | * @return FacebookRequest |
219 | 220 | */ |
@@ -252,6 +253,7 @@ discard block |
||
252 | 253 | * Set the endpoint for this request. |
253 | 254 | * |
254 | 255 | * @param string |
256 | + * @param string|null $endpoint |
|
255 | 257 | * |
256 | 258 | * @return FacebookRequest |
257 | 259 | * |
@@ -511,7 +511,7 @@ discard block |
||
511 | 511 | $graphVersion = FacebookUrlManipulator::forceSlashPrefix($this->graphVersion); |
512 | 512 | $endpoint = FacebookUrlManipulator::forceSlashPrefix($this->getEndpoint()); |
513 | 513 | |
514 | - $url = $graphVersion . $endpoint; |
|
514 | + $url = $graphVersion.$endpoint; |
|
515 | 515 | |
516 | 516 | if ($this->getMethod() !== 'POST') { |
517 | 517 | $params = $this->getParams(); |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | public static function getDefaultHeaders() |
530 | 530 | { |
531 | 531 | return [ |
532 | - 'User-Agent' => 'fb-php-' . Facebook::VERSION, |
|
532 | + 'User-Agent' => 'fb-php-'.Facebook::VERSION, |
|
533 | 533 | 'Accept-Encoding' => '*', |
534 | 534 | ]; |
535 | 535 | } |
@@ -156,7 +156,7 @@ |
||
156 | 156 | * @param string $endpoint The endpoint to POST to. |
157 | 157 | * @param array $params The params to send with the request. |
158 | 158 | * |
159 | - * @return array |
|
159 | + * @return FacebookFile |
|
160 | 160 | */ |
161 | 161 | private function sendUploadRequest($endpoint, $params = []) |
162 | 162 | { |
@@ -25,7 +25,6 @@ |
||
25 | 25 | |
26 | 26 | use Facebook\Http\GraphRawResponse; |
27 | 27 | use Facebook\Exceptions\FacebookSDKException; |
28 | - |
|
29 | 28 | use GuzzleHttp\Client; |
30 | 29 | use GuzzleHttp\Message\ResponseInterface; |
31 | 30 | use GuzzleHttp\Ring\Exception\RingException; |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | 'body' => $body, |
57 | 57 | 'timeout' => $timeOut, |
58 | 58 | 'connect_timeout' => 10, |
59 | - 'verify' => __DIR__ . '/certs/DigiCertHighAssuranceEVRootCA.pem', |
|
59 | + 'verify' => __DIR__.'/certs/DigiCertHighAssuranceEVRootCA.pem', |
|
60 | 60 | ]; |
61 | 61 | $request = $this->guzzleClient->createRequest($method, $url, $options); |
62 | 62 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $headers = $response->getHeaders(); |
90 | 90 | $rawHeaders = []; |
91 | 91 | foreach ($headers as $name => $values) { |
92 | - $rawHeaders[] = $name . ": " . implode(", ", $values); |
|
92 | + $rawHeaders[] = $name.": ".implode(", ", $values); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | return implode("\r\n", $rawHeaders); |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * Remove params from a URL. |
35 | 35 | * |
36 | 36 | * @param string $url The URL to filter. |
37 | - * @param array $paramsToFilter The params to filter from the URL. |
|
37 | + * @param string[] $paramsToFilter The params to filter from the URL. |
|
38 | 38 | * |
39 | 39 | * @return string The URL with the params removed. |
40 | 40 | */ |
@@ -53,17 +53,17 @@ discard block |
||
53 | 53 | } |
54 | 54 | |
55 | 55 | if (count($params) > 0) { |
56 | - $query = '?' . http_build_query($params, null, '&'); |
|
56 | + $query = '?'.http_build_query($params, null, '&'); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 | |
60 | - $scheme = isset($parts['scheme']) ? $parts['scheme'] . '://' : ''; |
|
60 | + $scheme = isset($parts['scheme']) ? $parts['scheme'].'://' : ''; |
|
61 | 61 | $host = isset($parts['host']) ? $parts['host'] : ''; |
62 | - $port = isset($parts['port']) ? ':' . $parts['port'] : ''; |
|
62 | + $port = isset($parts['port']) ? ':'.$parts['port'] : ''; |
|
63 | 63 | $path = isset($parts['path']) ? $parts['path'] : ''; |
64 | - $fragment = isset($parts['fragment']) ? '#' . $parts['fragment'] : ''; |
|
64 | + $fragment = isset($parts['fragment']) ? '#'.$parts['fragment'] : ''; |
|
65 | 65 | |
66 | - return $scheme . $host . $port . $path . $query . $fragment; |
|
66 | + return $scheme.$host.$port.$path.$query.$fragment; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | /** |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | } |
82 | 82 | |
83 | 83 | if (strpos($url, '?') === false) { |
84 | - return $url . '?' . http_build_query($newParams, null, '&'); |
|
84 | + return $url.'?'.http_build_query($newParams, null, '&'); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | list($path, $query) = explode('?', $url, 2); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | // Sort for a predicable order |
95 | 95 | ksort($newParams); |
96 | 96 | |
97 | - return $path . '?' . http_build_query($newParams, null, '&'); |
|
97 | + return $path.'?'.http_build_query($newParams, null, '&'); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | return $string; |
151 | 151 | } |
152 | 152 | |
153 | - return strpos($string, '/') === 0 ? $string : '/' . $string; |
|
153 | + return strpos($string, '/') === 0 ? $string : '/'.$string; |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | /** |
@@ -162,6 +162,6 @@ discard block |
||
162 | 162 | */ |
163 | 163 | public static function baseGraphUrlEndpoint($urlToTrim) |
164 | 164 | { |
165 | - return '/' . preg_replace('/^https:\/\/.+\.facebook\.com(\/v.+?)?\//', '', $urlToTrim); |
|
165 | + return '/'.preg_replace('/^https:\/\/.+\.facebook\.com(\/v.+?)?\//', '', $urlToTrim); |
|
166 | 166 | } |
167 | 167 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | public function __construct($headers, $body, $httpStatusCode = null) |
56 | 56 | { |
57 | 57 | if (is_numeric($httpStatusCode)) { |
58 | - $this->httpResponseCode = (int)$httpStatusCode; |
|
58 | + $this->httpResponseCode = (int) $httpStatusCode; |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | if (is_array($headers)) { |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | public function setHttpResponseCodeFromHeader($rawResponseHeader) |
106 | 106 | { |
107 | 107 | preg_match('|HTTP/\d\.\d\s+(\d+)\s+.*|', $rawResponseHeader, $match); |
108 | - $this->httpResponseCode = (int)$match[1]; |
|
108 | + $this->httpResponseCode = (int) $match[1]; |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | /** |
@@ -128,7 +128,7 @@ |
||
128 | 128 | */ |
129 | 129 | public function asArray() |
130 | 130 | { |
131 | - return array_map(function ($value) { |
|
131 | + return array_map(function($value) { |
|
132 | 132 | return $value instanceof Collection ? $value->asArray() : $value; |
133 | 133 | }, $this->items); |
134 | 134 | } |
@@ -84,7 +84,7 @@ |
||
84 | 84 | { |
85 | 85 | $items = $this->asArray(); |
86 | 86 | |
87 | - return array_map(function ($v) { |
|
87 | + return array_map(function($v) { |
|
88 | 88 | if ($v instanceof \DateTime) { |
89 | 89 | return $v->format(\DateTime::ISO8601); |
90 | 90 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public function getCurrentUrl() |
37 | 37 | { |
38 | - return $this->getHttpScheme() . '://' . $this->getHostName() . $this->getServerVar('REQUEST_URI'); |
|
38 | + return $this->getHttpScheme().'://'.$this->getHostName().$this->getServerVar('REQUEST_URI'); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | return $this->protocolWithActiveSsl($protocol); |
67 | 67 | } |
68 | 68 | |
69 | - return (string)$this->getServerVar('SERVER_PORT') === '443'; |
|
69 | + return (string) $this->getServerVar('SERVER_PORT') === '443'; |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | /** |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | */ |
79 | 79 | protected function protocolWithActiveSsl($protocol) |
80 | 80 | { |
81 | - $protocol = strtolower((string)$protocol); |
|
81 | + $protocol = strtolower((string) $protocol); |
|
82 | 82 | |
83 | 83 | return in_array($protocol, ['on', '1', 'https', 'ssl'], true); |
84 | 84 | } |
@@ -111,14 +111,14 @@ discard block |
||
111 | 111 | // Port number |
112 | 112 | $scheme = $this->getHttpScheme(); |
113 | 113 | $port = $this->getCurrentPort(); |
114 | - $appendPort = ':' . $port; |
|
114 | + $appendPort = ':'.$port; |
|
115 | 115 | |
116 | 116 | // Don't append port number if a normal port. |
117 | 117 | if (($scheme == 'http' && $port == '80') || ($scheme == 'https' && $port == '443')) { |
118 | 118 | $appendPort = ''; |
119 | 119 | } |
120 | 120 | |
121 | - return $host . $appendPort; |
|
121 | + return $host.$appendPort; |
|
122 | 122 | } |
123 | 123 | |
124 | 124 | protected function getCurrentPort() |
@@ -126,15 +126,15 @@ discard block |
||
126 | 126 | // Check for proxy first |
127 | 127 | $port = $this->getHeader('X_FORWARDED_PORT'); |
128 | 128 | if ($port) { |
129 | - return (string)$port; |
|
129 | + return (string) $port; |
|
130 | 130 | } |
131 | 131 | |
132 | - $protocol = (string)$this->getHeader('X_FORWARDED_PROTO'); |
|
132 | + $protocol = (string) $this->getHeader('X_FORWARDED_PROTO'); |
|
133 | 133 | if ($protocol === 'https') { |
134 | 134 | return '443'; |
135 | 135 | } |
136 | 136 | |
137 | - return (string)$this->getServerVar('SERVER_PORT'); |
|
137 | + return (string) $this->getServerVar('SERVER_PORT'); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | /** |
@@ -158,6 +158,6 @@ discard block |
||
158 | 158 | */ |
159 | 159 | protected function getHeader($key) |
160 | 160 | { |
161 | - return $this->getServerVar('HTTP_' . $key); |
|
161 | + return $this->getServerVar('HTTP_'.$key); |
|
162 | 162 | } |
163 | 163 | } |
@@ -136,10 +136,10 @@ |
||
136 | 136 | ], $config); |
137 | 137 | |
138 | 138 | if (!$config['app_id']) { |
139 | - throw new FacebookSDKException('Required "app_id" key not supplied in config and could not find fallback environment variable "' . static::APP_ID_ENV_NAME . '"'); |
|
139 | + throw new FacebookSDKException('Required "app_id" key not supplied in config and could not find fallback environment variable "'.static::APP_ID_ENV_NAME.'"'); |
|
140 | 140 | } |
141 | 141 | if (!$config['app_secret']) { |
142 | - throw new FacebookSDKException('Required "app_secret" key not supplied in config and could not find fallback environment variable "' . static::APP_SECRET_ENV_NAME . '"'); |
|
142 | + throw new FacebookSDKException('Required "app_secret" key not supplied in config and could not find fallback environment variable "'.static::APP_SECRET_ENV_NAME.'"'); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | $this->app = new FacebookApp($config['app_id'], $config['app_secret']); |