mmainstreet / jodel-web

php/Requests/Upvote.php

Indentation +13 added lines, -13 removed lines

@@ -3,19 +3,19 @@
 
 class Upvote extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/posts/' . $_GET['postID'] . '/upvote';
-    }
-    function getPayload()
-    {
-        return array(
+	function getApiEndPoint()
+	{
+		return '/v2/posts/' . $_GET['postID'] . '/upvote';
+	}
+	function getPayload()
+	{
+		return array(
 					"reason_code" => -1,
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }
 

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class Upvote extends AbstractRequest {
+class Upvote extends AbstractRequest
+{
 		
     function getApiEndPoint()
     {

php/Requests/AbstractRequest.php

Indentation +110 added lines, -110 removed lines

@@ -2,19 +2,19 @@ 
 
 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
-     */
-    public $accessToken = null;
-    private $payLoad;
-    public function execute()
-    {
+	/**
+	 * @var string
+	 */
+	public $accessToken = null;
+	private $payLoad;
+	public function execute()
+	{
 		$result = new \stdClass();
 		        
 		$this->payLoad = $this->getPayload();
@@ -24,71 +24,71 @@ 
 		}
 				
 				
-        $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
-     */
-    public function getSignHeaders()
-    {
+		return $result;
+	}
+	abstract function getPayload();
+	/**
+	 * Gets Sign headers
+	 * @return array headers
+	 */
+	public function getSignHeaders()
+	{
 			$payload_accessToken;
 			if($this->getAccessToken() == null) {
 				$payload_accessToken = "";
@@ -98,54 +98,54 @@ 
 			}
 			
 			
-        $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;
-    }
-    public function getFullUrl()
-    {
-        return self::APIURL . $this->getApiEndPoint();
-    }
-    abstract function getApiEndPoint();
-    abstract function getMethod();
-    /**
-     * @return string
-     */
-    public 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;
+	}
+	public function getFullUrl()
+	{
+		return self::APIURL . $this->getApiEndPoint();
+	}
+	abstract function getApiEndPoint();
+	abstract function getMethod();
+	/**
+	 * @return string
+	 */
+	public function getAccessToken()
+	{
+		return $this->accessToken;
+	}
+	/**
+	 * @param string $accessToken
+	 */
+	public function setAccessToken(string $accessToken)
+	{
+		$this->accessToken = $accessToken;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if($this->getAccessToken()) {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -39,7 +39,7 @@ 
         */
         
 
-        switch ($this->getMethod()) {
+        switch($this->getMethod()) {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -50,7 +50,7 @@ 
                 $result = Requests::put($url, $header, $this->payLoad);
                 break;
         }
-        switch ($result->status_code) {
+        switch($result->status_code) {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -67,7 +67,7 @@ 
                 throw  new \Exception('Signing failed!');
                 break;
             default:
-                throw  new \Exception('Unknown Error: '.$result->status_code);
+                throw  new \Exception('Unknown Error: ' . $result->status_code);
         }
 
         if($device_uid != "")

Braces +13 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 abstract class AbstractRequest
-{	
+{
     CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
     CONST APIURL = 'https://api.go-tellm.com/api';
     const SECRET = "VwJHzYUbPjGiXWauoVNaHoCWsaacTmnkGwNtHhjy";
@@ -19,7 +19,8 @@ 
 		        
 		$this->payLoad = $this->getPayload();
 		$device_uid = "";
-		if(isset($this->payLoad["device_uid"])) {
+		if(isset($this->payLoad["device_uid"]))
+		{
 			$device_uid = $this->payLoad["device_uid"];
 		}
 				
@@ -28,7 +29,8 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if ($this->getAccessToken())
+        {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -39,7 +41,8 @@ 
         */
         
 
-        switch ($this->getMethod()) {
+        switch ($this->getMethod())
+        {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -50,7 +53,8 @@ 
                 $result = Requests::put($url, $header, $this->payLoad);
                 break;
         }
-        switch ($result->status_code) {
+        switch ($result->status_code)
+        {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -90,10 +94,12 @@ 
     public function getSignHeaders()
     {
 			$payload_accessToken;
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == null)
+			{
 				$payload_accessToken = "";
 			}
-			else {
+			else
+			{
 				$payload_accessToken = $this->getAccessToken();
 			}
 			

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -2,8 +2,8 @@ 
 
 abstract class AbstractRequest
 {	
-    CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
-    CONST APIURL = 'https://api.go-tellm.com/api';
+    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';
@@ -11,7 +11,7 @@ 
     /**
      * @var string
      */
-    public $accessToken = null;
+    public $accessToken = NULL;
     private $payLoad;
     public function execute()
     {
@@ -52,7 +52,7 @@ 
         }
         switch ($result->status_code) {
             case 200:
-                $result = json_decode($result->body, true);
+                $result = json_decode($result->body, TRUE);
                 break;
             case 204:
                 $result = "Success";
@@ -90,7 +90,7 @@ 
     public function getSignHeaders()
     {
 			$payload_accessToken;
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == NULL) {
 				$payload_accessToken = "";
 			}
 			else {

php/Requests/libary/Requests/Proxy.php

Spacing +1 added lines, -1 removed lines

@@ -31,5 +31,5 @@
 	 * @see Requests_Hooks::register
 	 * @param Requests_Hooks $hooks Hook system
 	 */
-	public function register(Requests_Hooks &$hooks);
+	public function register(Requests_Hooks&$hooks);
 }
\ No newline at end of file

Doc Comments +1 added lines

@@ -30,6 +30,7 @@
 	 *
 	 * @see Requests_Hooks::register
 	 * @param Requests_Hooks $hooks Hook system
+	 * @return void
 	 */
 	public function register(Requests_Hooks &$hooks);
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
  * @subpackage Proxy
  * @since 1.6
  */
-interface Requests_Proxy {
+interface Requests_Proxy
+{
 	/**
 	 * Register hooks as needed
 	 *

php/Requests/GetPostDetails.php

Indentation +13 added lines, -13 removed lines

@@ -3,18 +3,18 @@
 
 class GetPostDetails extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/posts/' . $_GET['postID'];
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+	function getApiEndPoint()
+	{
+		return '/v2/posts/' . $_GET['postID'];
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }
 

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class GetPostDetails extends AbstractRequest {
+class GetPostDetails extends AbstractRequest
+{
 		
     function getApiEndPoint()
     {

php/Requests/Downvote.php

Indentation +13 added lines, -13 removed lines

@@ -3,18 +3,18 @@
 
 class Downvote extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/posts/' . $_GET['postID'] . '/downvote';
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+	function getApiEndPoint()
+	{
+		return '/v2/posts/' . $_GET['postID'] . '/downvote';
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }
 

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class Downvote extends AbstractRequest {
+class Downvote extends AbstractRequest
+{
 		
     function getApiEndPoint()
     {

php/Requests/UpdateLocation.php

Indentation +30 added lines, -30 removed lines

@@ -3,37 +3,37 @@
 
 class UpdateLocation extends AbstractRequest {
 		 /**
-     * @var Location
-     */
-    public $location;
-    /**
-     * @return Location
-     */
-    public function getLocation(): Location
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation(Location $location)
-    {
-        $this->location = $location;
-    }
+		  * @var Location
+		  */
+	public $location;
+	/**
+	 * @return Location
+	 */
+	public function getLocation(): Location
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation(Location $location)
+	{
+		$this->location = $location;
+	}
 		
-    function getApiEndPoint()
-    {
-        return '/v2/users/location';
-    }
-    function getPayload()
-    {
-        return array(
+	function getApiEndPoint()
+	{
+		return '/v2/users/location';
+	}
+	function getPayload()
+	{
+		return array(
 					"location" => $this->getLocation()->toArray(),
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }
 

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class UpdateLocation extends AbstractRequest {
+class UpdateLocation extends AbstractRequest
+{
 		 /**
      * @var Location
      */

php/Location.php

Indentation +47 added lines, -47 removed lines

@@ -2,51 +2,51 @@
 
 class Location{
 
-    public $cityName;
-
-    public $lat;
-
-    public $lng;
-
-    public function getCityName(): string
-    {
-        return $this->cityName;
-    }
-
-    public function setCityName(string $cityName)
-    {
-        $this->cityName = $cityName;
-    }
-
-    public function getLat(): string
-    {
-        return $this->lat;
-    }
-
-    public function setLat(string $lat)
-    {
-        $this->lat = $lat;
-    }
-
-    public function getLng(): string
-    {
-        return $this->lng;
-    }
-
-    public function setLng(string $lng)
-    {
-        $this->lng = $lng;
-    }
-    public function toArray(){
-        return array(
-            "city" => $this->getCityName(),
-            "country" => 'DE',
-            "loc_accuracy" => '0.0',
-            "loc_coordinates" => array(
-                "lat" => $this->getLat(),
-                "lng" => $this->getLng(),
-            ),
-            "name" => $this->getCityName()
-        );
-    }
+	public $cityName;
+
+	public $lat;
+
+	public $lng;
+
+	public function getCityName(): string
+	{
+		return $this->cityName;
+	}
+
+	public function setCityName(string $cityName)
+	{
+		$this->cityName = $cityName;
+	}
+
+	public function getLat(): string
+	{
+		return $this->lat;
+	}
+
+	public function setLat(string $lat)
+	{
+		$this->lat = $lat;
+	}
+
+	public function getLng(): string
+	{
+		return $this->lng;
+	}
+
+	public function setLng(string $lng)
+	{
+		$this->lng = $lng;
+	}
+	public function toArray(){
+		return array(
+			"city" => $this->getCityName(),
+			"country" => 'DE',
+			"loc_accuracy" => '0.0',
+			"loc_coordinates" => array(
+				"lat" => $this->getLat(),
+				"lng" => $this->getLng(),
+			),
+			"name" => $this->getCityName()
+		);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class Location{
+class Location {
 
     public $cityName;
 
@@ -37,7 +37,7 @@ 
     {
         $this->lng = $lng;
     }
-    public function toArray(){
+    public function toArray() {
         return array(
             "city" => $this->getCityName(),
             "country" => 'DE',

Braces +4 added lines, -2 removed lines

@@ -1,6 +1,7 @@ 
 <?php
 
-class Location{
+class Location
+{
 
     public $cityName;
 
@@ -37,7 +38,8 @@ 
     {
         $this->lng = $lng;
     }
-    public function toArray(){
+    public function toArray()
+    {
         return array(
             "city" => $this->getCityName(),
             "country" => 'DE',

php/Requests/libary/Requests/Cookie.php

Doc Comments +2 added lines, -1 removed lines

@@ -62,7 +62,7 @@ 
 	 *
 	 * @param string $name
 	 * @param string $value
-	 * @param array|Requests_Utility_CaseInsensitiveDictionary $attributes Associative array of attribute data
+	 * @param Requests_Utility_CaseInsensitiveDictionary $attributes Associative array of attribute data
 	 */
 	public function __construct($name, $value, $attributes = array(), $flags = array(), $reference_time = null) {
 		$this->name = $name;
@@ -377,6 +377,7 @@ 
 	 * specifies some of this handling, but not in a thorough manner.
 	 *
 	 * @param string Cookie header value (from a Set-Cookie header)
+	 * @param integer $reference_time
 	 * @return Requests_Cookie Parsed cookie object
 	 */
 	public static function parse($string, $name = '', $reference_time = null) {

Spacing +43 added lines, -43 removed lines

@@ -77,7 +77,7 @@ 
 		$this->flags = array_merge($default_flags, $flags);
 
 		$this->reference_time = time();
-		if ($reference_time !== null) {
+		if($reference_time !== null) {
 			$this->reference_time = $reference_time;
 		}
 
@@ -97,12 +97,12 @@ 
 		// If a cookie has both the Max-Age and the Expires attribute, the Max-
 		// Age attribute has precedence and controls the expiration date of the
 		// cookie.
-		if (isset($this->attributes['max-age'])) {
+		if(isset($this->attributes['max-age'])) {
 			$max_age = $this->attributes['max-age'];
 			return $max_age < $this->reference_time;
 		}
 
-		if (isset($this->attributes['expires'])) {
+		if(isset($this->attributes['expires'])) {
 			$expires = $this->attributes['expires'];
 			return $expires < $this->reference_time;
 		}
@@ -117,11 +117,11 @@ 
 	 * @return boolean Whether the cookie is valid for the given URI
 	 */
 	public function uri_matches(Requests_IRI $uri) {
-		if (!$this->domain_matches($uri->host)) {
+		if(!$this->domain_matches($uri->host)) {
 			return false;
 		}
 
-		if (!$this->path_matches($uri->path)) {
+		if(!$this->path_matches($uri->path)) {
 			return false;
 		}
 
@@ -135,37 +135,37 @@ 
 	 * @return boolean Whether the cookie is valid for the given domain
 	 */
 	public function domain_matches($string) {
-		if (!isset($this->attributes['domain'])) {
+		if(!isset($this->attributes['domain'])) {
 			// Cookies created manually; cookies created by Requests will set
 			// the domain to the requested domain
 			return true;
 		}
 
 		$domain_string = $this->attributes['domain'];
-		if ($domain_string === $string) {
+		if($domain_string === $string) {
 			// The domain string and the string are identical.
 			return true;
 		}
 
 		// If the cookie is marked as host-only and we don't have an exact
 		// match, reject the cookie
-		if ($this->flags['host-only'] === true) {
+		if($this->flags['host-only'] === true) {
 			return false;
 		}
 
-		if (strlen($string) <= strlen($domain_string)) {
+		if(strlen($string) <= strlen($domain_string)) {
 			// For obvious reasons, the string cannot be a suffix if the domain
 			// is shorter than the domain string
 			return false;
 		}
 
-		if (substr($string, -1 * strlen($domain_string)) !== $domain_string) {
+		if(substr($string, -1 * strlen($domain_string)) !== $domain_string) {
 			// The domain string should be a suffix of the string.
 			return false;
 		}
 
 		$prefix = substr($string, 0, strlen($string) - strlen($domain_string));
-		if (substr($prefix, -1) !== '.') {
+		if(substr($prefix, -1) !== '.') {
 			// The last character of the string that is not included in the
 			// domain string should be a %x2E (".") character.
 			return false;
@@ -184,12 +184,12 @@ 
 	 * @return boolean Whether the cookie is valid for the given path
 	 */
 	public function path_matches($request_path) {
-		if (empty($request_path)) {
+		if(empty($request_path)) {
 			// Normalize empty path to root
 			$request_path = '/';
 		}
 
-		if (!isset($this->attributes['path'])) {
+		if(!isset($this->attributes['path'])) {
 			// Cookies created manually; cookies created by Requests will set
 			// the path to the requested path
 			return true;
@@ -197,19 +197,19 @@ 
 
 		$cookie_path = $this->attributes['path'];
 
-		if ($cookie_path === $request_path) {
+		if($cookie_path === $request_path) {
 			// The cookie-path and the request-path are identical.
 			return true;
 		}
 
-		if (strlen($request_path) > strlen($cookie_path) && substr($request_path, 0, strlen($cookie_path)) === $cookie_path) {
-			if (substr($cookie_path, -1) === '/') {
+		if(strlen($request_path) > strlen($cookie_path) && substr($request_path, 0, strlen($cookie_path)) === $cookie_path) {
+			if(substr($cookie_path, -1) === '/') {
 				// The cookie-path is a prefix of the request-path, and the last
 				// character of the cookie-path is %x2F ("/").
 				return true;
 			}
 
-			if (substr($request_path, strlen($cookie_path), 1) === '/') {
+			if(substr($request_path, strlen($cookie_path), 1) === '/') {
 				// The cookie-path is a prefix of the request-path, and the
 				// first character of the request-path that is not included in
 				// the cookie-path is a %x2F ("/") character.
@@ -226,15 +226,15 @@ 
 	 * @return boolean Whether the cookie was successfully normalized
 	 */
 	public function normalize() {
-		foreach ($this->attributes as $key => $value) {
+		foreach($this->attributes as $key => $value) {
 			$orig_value = $value;
 			$value = $this->normalize_attribute($key, $value);
-			if ($value === null) {
+			if($value === null) {
 				unset($this->attributes[$key]);
 				continue;
 			}
 
-			if ($value !== $orig_value) {
+			if($value !== $orig_value) {
 				$this->attributes[$key] = $value;
 			}
 		}
@@ -252,15 +252,15 @@ 
 	 * @return mixed Value if available, or null if the attribute value is invalid (and should be skipped)
 	 */
 	protected function normalize_attribute($name, $value) {
-		switch (strtolower($name)) {
+		switch(strtolower($name)) {
 			case 'expires':
 				// Expiration parsing, as per RFC 6265 section 5.2.1
-				if (is_int($value)) {
+				if(is_int($value)) {
 					return $value;
 				}
 
 				$expiry_time = strtotime($value);
-				if ($expiry_time === false) {
+				if($expiry_time === false) {
 					return null;
 				}
 
@@ -268,17 +268,17 @@ 
 
 			case 'max-age':
 				// Expiration parsing, as per RFC 6265 section 5.2.2
-				if (is_int($value)) {
+				if(is_int($value)) {
 					return $value;
 				}
 
 				// Check that we have a valid age
-				if (!preg_match('/^-?\d+$/', $value)) {
+				if(!preg_match('/^-?\d+$/', $value)) {
 					return null;
 				}
 
-				$delta_seconds = (int) $value;
-				if ($delta_seconds <= 0) {
+				$delta_seconds = (int)$value;
+				if($delta_seconds <= 0) {
 					$expiry_time = 0;
 				}
 				else {
@@ -289,7 +289,7 @@ 
 
 			case 'domain':
 				// Domain normalization, as per RFC 6265 section 5.2.3
-				if ($value[0] === '.') {
+				if($value[0] === '.') {
 					$value = substr($value, 1);
 				}
 
@@ -332,11 +332,11 @@ 
 	 */
 	public function format_for_set_cookie() {
 		$header_value = $this->format_for_header();
-		if (!empty($this->attributes)) {
+		if(!empty($this->attributes)) {
 			$parts = array();
-			foreach ($this->attributes as $key => $value) {
+			foreach($this->attributes as $key => $value) {
 				// Ignore non-associative attributes
-				if (is_numeric($key)) {
+				if(is_numeric($key)) {
 					$parts[] = $value;
 				}
 				else {
@@ -383,10 +383,10 @@ 
 		$parts = explode(';', $string);
 		$kvparts = array_shift($parts);
 
-		if (!empty($name)) {
+		if(!empty($name)) {
 			$value = $string;
 		}
-		elseif (strpos($kvparts, '=') === false) {
+		elseif(strpos($kvparts, '=') === false) {
 			// Some sites might only have a value without the equals separator.
 			// Deviate from RFC 6265 and pretend it was actually a blank name
 			// (`=foo`)
@@ -404,9 +404,9 @@ 
 		// Attribute key are handled case-insensitively
 		$attributes = new Requests_Utility_CaseInsensitiveDictionary();
 
-		if (!empty($parts)) {
-			foreach ($parts as $part) {
-				if (strpos($part, '=') === false) {
+		if(!empty($parts)) {
+			foreach($parts as $part) {
+				if(strpos($part, '=') === false) {
 					$part_key = $part;
 					$part_value = true;
 				}
@@ -433,16 +433,16 @@ 
 	 */
 	public static function parse_from_headers(Requests_Response_Headers $headers, Requests_IRI $origin = null, $time = null) {
 		$cookie_headers = $headers->getValues('Set-Cookie');
-		if (empty($cookie_headers)) {
+		if(empty($cookie_headers)) {
 			return array();
 		}
 
 		$cookies = array();
-		foreach ($cookie_headers as $header) {
+		foreach($cookie_headers as $header) {
 			$parsed = self::parse($header, '', $time);
 
 			// Default domain/path attributes
-			if (empty($parsed->attributes['domain']) && !empty($origin)) {
+			if(empty($parsed->attributes['domain']) && !empty($origin)) {
 				$parsed->attributes['domain'] = $origin->host;
 				$parsed->flags['host-only'] = true;
 			}
@@ -451,17 +451,17 @@ 
 			}
 
 			$path_is_valid = (!empty($parsed->attributes['path']) && $parsed->attributes['path'][0] === '/');
-			if (!$path_is_valid && !empty($origin)) {
+			if(!$path_is_valid && !empty($origin)) {
 				$path = $origin->path;
 
 				// Default path normalization as per RFC 6265 section 5.1.4
-				if (substr($path, 0, 1) !== '/') {
+				if(substr($path, 0, 1) !== '/') {
 					// If the uri-path is empty or if the first character of
 					// the uri-path is not a %x2F ("/") character, output
 					// %x2F ("/") and skip the remaining steps.
 					$path = '/';
 				}
-				elseif (substr_count($path, '/') === 1) {
+				elseif(substr_count($path, '/') === 1) {
 					// If the uri-path contains no more than one %x2F ("/")
 					// character, output %x2F ("/") and skip the remaining
 					// step.
@@ -477,7 +477,7 @@ 
 			}
 
 			// Reject invalid cookie domains
-			if (!empty($origin) && !$parsed->domain_matches($origin->host)) {
+			if(!empty($origin) && !$parsed->domain_matches($origin->host)) {
 				continue;
 			}
 

Braces +128 added lines, -64 removed lines

@@ -12,7 +12,8 @@ 
  * @package Requests
  * @subpackage Cookies
  */
-class Requests_Cookie {
+class Requests_Cookie
+{
 	/**
 	 * Cookie name.
 	 *
@@ -64,7 +65,8 @@ 
 	 * @param string $value
 	 * @param array|Requests_Utility_CaseInsensitiveDictionary $attributes Associative array of attribute data
 	 */
-	public function __construct($name, $value, $attributes = array(), $flags = array(), $reference_time = null) {
+	public function __construct($name, $value, $attributes = array(), $flags = array(), $reference_time = null)
+	{
 		$this->name = $name;
 		$this->value = $value;
 		$this->attributes = $attributes;
@@ -77,7 +79,8 @@ 
 		$this->flags = array_merge($default_flags, $flags);
 
 		$this->reference_time = time();
-		if ($reference_time !== null) {
+		if ($reference_time !== null)
+		{
 			$this->reference_time = $reference_time;
 		}
 
@@ -92,17 +95,20 @@ 
 	 *
 	 * @return boolean True if expired, false if time is valid.
 	 */
-	public function is_expired() {
+	public function is_expired()
+	{
 		// RFC6265, s. 4.1.2.2:
 		// If a cookie has both the Max-Age and the Expires attribute, the Max-
 		// Age attribute has precedence and controls the expiration date of the
 		// cookie.
-		if (isset($this->attributes['max-age'])) {
+		if (isset($this->attributes['max-age']))
+		{
 			$max_age = $this->attributes['max-age'];
 			return $max_age < $this->reference_time;
 		}
 
-		if (isset($this->attributes['expires'])) {
+		if (isset($this->attributes['expires']))
+		{
 			$expires = $this->attributes['expires'];
 			return $expires < $this->reference_time;
 		}
@@ -116,12 +122,15 @@ 
 	 * @param Requests_IRI $uri URI to check
 	 * @return boolean Whether the cookie is valid for the given URI
 	 */
-	public function uri_matches(Requests_IRI $uri) {
-		if (!$this->domain_matches($uri->host)) {
+	public function uri_matches(Requests_IRI $uri)
+	{
+		if (!$this->domain_matches($uri->host))
+		{
 			return false;
 		}
 
-		if (!$this->path_matches($uri->path)) {
+		if (!$this->path_matches($uri->path))
+		{
 			return false;
 		}
 
@@ -134,38 +143,45 @@ 
 	 * @param string $string Domain to check
 	 * @return boolean Whether the cookie is valid for the given domain
 	 */
-	public function domain_matches($string) {
-		if (!isset($this->attributes['domain'])) {
+	public function domain_matches($string)
+	{
+		if (!isset($this->attributes['domain']))
+		{
 			// Cookies created manually; cookies created by Requests will set
 			// the domain to the requested domain
 			return true;
 		}
 
 		$domain_string = $this->attributes['domain'];
-		if ($domain_string === $string) {
+		if ($domain_string === $string)
+		{
 			// The domain string and the string are identical.
 			return true;
 		}
 
 		// If the cookie is marked as host-only and we don't have an exact
 		// match, reject the cookie
-		if ($this->flags['host-only'] === true) {
+		if ($this->flags['host-only'] === true)
+		{
 			return false;
 		}
 
-		if (strlen($string) <= strlen($domain_string)) {
+		if (strlen($string) <= strlen($domain_string))
+		{
 			// For obvious reasons, the string cannot be a suffix if the domain
 			// is shorter than the domain string
 			return false;
 		}
 
-		if (substr($string, -1 * strlen($domain_string)) !== $domain_string) {
+		if (substr($string, -1 * strlen($domain_string)) !== $domain_string)
+		{
 			// The domain string should be a suffix of the string.
 			return false;
 		}
 
 		$prefix = substr($string, 0, strlen($string) - strlen($domain_string));
-		if (substr($prefix, -1) !== '.') {
+		if (substr($prefix, -1) !== '.')
+		{
 			// The last character of the string that is not included in the
 			// domain string should be a %x2E (".") character.
 			return false;
@@ -183,13 +199,16 @@ 
 	 * @param string $request_path Path to check
 	 * @return boolean Whether the cookie is valid for the given path
 	 */
-	public function path_matches($request_path) {
-		if (empty($request_path)) {
+	public function path_matches($request_path)
+	{
+		if (empty($request_path))
+		{
 			// Normalize empty path to root
 			$request_path = '/';
 		}
 
-		if (!isset($this->attributes['path'])) {
+		if (!isset($this->attributes['path']))
+		{
 			// Cookies created manually; cookies created by Requests will set
 			// the path to the requested path
 			return true;
@@ -197,19 +216,23 @@ 
 
 		$cookie_path = $this->attributes['path'];
 
-		if ($cookie_path === $request_path) {
+		if ($cookie_path === $request_path)
+		{
 			// The cookie-path and the request-path are identical.
 			return true;
 		}
 
-		if (strlen($request_path) > strlen($cookie_path) && substr($request_path, 0, strlen($cookie_path)) === $cookie_path) {
-			if (substr($cookie_path, -1) === '/') {
+		if (strlen($request_path) > strlen($cookie_path) && substr($request_path, 0, strlen($cookie_path)) === $cookie_path)
+		{
+			if (substr($cookie_path, -1) === '/')
+			{
 				// The cookie-path is a prefix of the request-path, and the last
 				// character of the cookie-path is %x2F ("/").
 				return true;
 			}
 
-			if (substr($request_path, strlen($cookie_path), 1) === '/') {
+			if (substr($request_path, strlen($cookie_path), 1) === '/')
+			{
 				// The cookie-path is a prefix of the request-path, and the
 				// first character of the request-path that is not included in
 				// the cookie-path is a %x2F ("/") character.
@@ -225,16 +248,20 @@ 
 	 *
 	 * @return boolean Whether the cookie was successfully normalized
 	 */
-	public function normalize() {
-		foreach ($this->attributes as $key => $value) {
+	public function normalize()
+	{
+		foreach ($this->attributes as $key => $value)
+		{
 			$orig_value = $value;
 			$value = $this->normalize_attribute($key, $value);
-			if ($value === null) {
+			if ($value === null)
+			{
 				unset($this->attributes[$key]);
 				continue;
 			}
 
-			if ($value !== $orig_value) {
+			if ($value !== $orig_value)
+			{
 				$this->attributes[$key] = $value;
 			}
 		}
@@ -251,16 +278,20 @@ 
 	 * @param string|boolean $value Attribute value (string value, or true if empty/flag)
 	 * @return mixed Value if available, or null if the attribute value is invalid (and should be skipped)
 	 */
-	protected function normalize_attribute($name, $value) {
-		switch (strtolower($name)) {
+	protected function normalize_attribute($name, $value)
+	{
+		switch (strtolower($name))
+		{
 			case 'expires':
 				// Expiration parsing, as per RFC 6265 section 5.2.1
-				if (is_int($value)) {
+				if (is_int($value))
+				{
 					return $value;
 				}
 
 				$expiry_time = strtotime($value);
-				if ($expiry_time === false) {
+				if ($expiry_time === false)
+				{
 					return null;
 				}
 
@@ -268,20 +299,24 @@ 
 
 			case 'max-age':
 				// Expiration parsing, as per RFC 6265 section 5.2.2
-				if (is_int($value)) {
+				if (is_int($value))
+				{
 					return $value;
 				}
 
 				// Check that we have a valid age
-				if (!preg_match('/^-?\d+$/', $value)) {
+				if (!preg_match('/^-?\d+$/', $value))
+				{
 					return null;
 				}
 
 				$delta_seconds = (int) $value;
-				if ($delta_seconds <= 0) {
+				if ($delta_seconds <= 0)
+				{
 					$expiry_time = 0;
 				}
-				else {
+				else
+				{
 					$expiry_time = $this->reference_time + $delta_seconds;
 				}
 
@@ -289,7 +324,8 @@ 
 
 			case 'domain':
 				// Domain normalization, as per RFC 6265 section 5.2.3
-				if ($value[0] === '.') {
+				if ($value[0] === '.')
+				{
 					$value = substr($value, 1);
 				}
 
@@ -307,7 +343,8 @@ 
 	 *
 	 * @return string Cookie formatted for Cookie header
 	 */
-	public function format_for_header() {
+	public function format_for_header()
+	{
 		return sprintf('%s=%s', $this->name, $this->value);
 	}
 
@@ -318,7 +355,8 @@ 
 	 * @deprecated Use {@see Requests_Cookie::format_for_header}
 	 * @return string
 	 */
-	public function formatForHeader() {
+	public function formatForHeader()
+	{
 		return $this->format_for_header();
 	}
 
@@ -330,16 +368,21 @@ 
 	 *
 	 * @return string Cookie formatted for Set-Cookie header
 	 */
-	public function format_for_set_cookie() {
+	public function format_for_set_cookie()
+	{
 		$header_value = $this->format_for_header();
-		if (!empty($this->attributes)) {
+		if (!empty($this->attributes))
+		{
 			$parts = array();
-			foreach ($this->attributes as $key => $value) {
+			foreach ($this->attributes as $key => $value)
+			{
 				// Ignore non-associative attributes
-				if (is_numeric($key)) {
+				if (is_numeric($key))
+				{
 					$parts[] = $value;
 				}
-				else {
+				else
+				{
 					$parts[] = sprintf('%s=%s', $key, $value);
 				}
 			}
@@ -356,7 +399,8 @@ 
 	 * @deprecated Use {@see Requests_Cookie::format_for_set_cookie}
 	 * @return string
 	 */
-	public function formatForSetCookie() {
+	public function formatForSetCookie()
+	{
 		return $this->format_for_set_cookie();
 	}
 
@@ -365,7 +409,8 @@ 
 	 *
 	 * Attributes and other data can be accessed via methods.
 	 */
-	public function __toString() {
+	public function __toString()
+	{
 		return $this->value;
 	}
 
@@ -379,14 +424,17 @@ 
 	 * @param string Cookie header value (from a Set-Cookie header)
 	 * @return Requests_Cookie Parsed cookie object
 	 */
-	public static function parse($string, $name = '', $reference_time = null) {
+	public static function parse($string, $name = '', $reference_time = null)
+	{
 		$parts = explode(';', $string);
 		$kvparts = array_shift($parts);
 
-		if (!empty($name)) {
+		if (!empty($name))
+		{
 			$value = $string;
 		}
-		elseif (strpos($kvparts, '=') === false) {
+		elseif (strpos($kvparts, '=') === false)
+		{
 			// Some sites might only have a value without the equals separator.
 			// Deviate from RFC 6265 and pretend it was actually a blank name
 			// (`=foo`)
@@ -395,7 +443,8 @@ 
 			$name = '';
 			$value = $kvparts;
 		}
-		else {
+		else
+		{
 			list($name, $value) = explode('=', $kvparts, 2);
 		}
 		$name = trim($name);
@@ -404,13 +453,17 @@ 
 		// Attribute key are handled case-insensitively
 		$attributes = new Requests_Utility_CaseInsensitiveDictionary();
 
-		if (!empty($parts)) {
-			foreach ($parts as $part) {
-				if (strpos($part, '=') === false) {
+		if (!empty($parts))
+		{
+			foreach ($parts as $part)
+			{
+				if (strpos($part, '=') === false)
+				{
 					$part_key = $part;
 					$part_value = true;
 				}
-				else {
+				else
+				{
 					list($part_key, $part_value) = explode('=', $part, 2);
 					$part_value = trim($part_value);
 				}
@@ -431,43 +484,52 @@ 
 	 * @param int|null $time Reference time for expiration calculation
 	 * @return array
 	 */
-	public static function parse_from_headers(Requests_Response_Headers $headers, Requests_IRI $origin = null, $time = null) {
+	public static function parse_from_headers(Requests_Response_Headers $headers, Requests_IRI $origin = null, $time = null)
+	{
 		$cookie_headers = $headers->getValues('Set-Cookie');
-		if (empty($cookie_headers)) {
+		if (empty($cookie_headers))
+		{
 			return array();
 		}
 
 		$cookies = array();
-		foreach ($cookie_headers as $header) {
+		foreach ($cookie_headers as $header)
+		{
 			$parsed = self::parse($header, '', $time);
 
 			// Default domain/path attributes
-			if (empty($parsed->attributes['domain']) && !empty($origin)) {
+			if (empty($parsed->attributes['domain']) && !empty($origin))
+			{
 				$parsed->attributes['domain'] = $origin->host;
 				$parsed->flags['host-only'] = true;
 			}
-			else {
+			else
+			{
 				$parsed->flags['host-only'] = false;
 			}
 
 			$path_is_valid = (!empty($parsed->attributes['path']) && $parsed->attributes['path'][0] === '/');
-			if (!$path_is_valid && !empty($origin)) {
+			if (!$path_is_valid && !empty($origin))
+			{
 				$path = $origin->path;
 
 				// Default path normalization as per RFC 6265 section 5.1.4
-				if (substr($path, 0, 1) !== '/') {
+				if (substr($path, 0, 1) !== '/')
+				{
 					// If the uri-path is empty or if the first character of
 					// the uri-path is not a %x2F ("/") character, output
 					// %x2F ("/") and skip the remaining steps.
 					$path = '/';
 				}
-				elseif (substr_count($path, '/') === 1) {
+				elseif (substr_count($path, '/') === 1)
+				{
 					// If the uri-path contains no more than one %x2F ("/")
 					// character, output %x2F ("/") and skip the remaining
 					// step.
 					$path = '/';
 				}
-				else {
+				else
+				{
 					// Output the characters of the uri-path from the first
 					// character up to, but not including, the right-most
 					// %x2F ("/").
@@ -477,7 +539,8 @@ 
 			}
 
 			// Reject invalid cookie domains
-			if (!empty($origin) && !$parsed->domain_matches($origin->host)) {
+			if (!empty($origin) && !$parsed->domain_matches($origin->host))
+			{
 				continue;
 			}
 
@@ -494,7 +557,8 @@ 
 	 * @deprecated Use {@see Requests_Cookie::parse_from_headers}
 	 * @return string
 	 */
-	public static function parseFromHeaders(Requests_Response_Headers $headers) {
+	public static function parseFromHeaders(Requests_Response_Headers $headers)
+	{
 		return self::parse_from_headers($headers);
 	}
 }

Upper-Lower-Casing +31 added lines, -31 removed lines

@@ -64,20 +64,20 @@ 
 	 * @param string $value
 	 * @param array|Requests_Utility_CaseInsensitiveDictionary $attributes Associative array of attribute data
 	 */
-	public function __construct($name, $value, $attributes = array(), $flags = array(), $reference_time = null) {
+	public function __construct($name, $value, $attributes = array(), $flags = array(), $reference_time = NULL) {
 		$this->name = $name;
 		$this->value = $value;
 		$this->attributes = $attributes;
 		$default_flags = array(
 			'creation' => time(),
 			'last-access' => time(),
-			'persistent' => false,
-			'host-only' => true,
+			'persistent' => FALSE,
+			'host-only' => TRUE,
 		);
 		$this->flags = array_merge($default_flags, $flags);
 
 		$this->reference_time = time();
-		if ($reference_time !== null) {
+		if ($reference_time !== NULL) {
 			$this->reference_time = $reference_time;
 		}
 
@@ -107,7 +107,7 @@ 
 			return $expires < $this->reference_time;
 		}
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -118,11 +118,11 @@ 
 	 */
 	public function uri_matches(Requests_IRI $uri) {
 		if (!$this->domain_matches($uri->host)) {
-			return false;
+			return FALSE;
 		}
 
 		if (!$this->path_matches($uri->path)) {
-			return false;
+			return FALSE;
 		}
 
 		return empty($this->attributes['secure']) || $uri->scheme === 'https';
@@ -138,37 +138,37 @@ 
 		if (!isset($this->attributes['domain'])) {
 			// Cookies created manually; cookies created by Requests will set
 			// the domain to the requested domain
-			return true;
+			return TRUE;
 		}
 
 		$domain_string = $this->attributes['domain'];
 		if ($domain_string === $string) {
 			// The domain string and the string are identical.
-			return true;
+			return TRUE;
 		}
 
 		// If the cookie is marked as host-only and we don't have an exact
 		// match, reject the cookie
-		if ($this->flags['host-only'] === true) {
-			return false;
+		if ($this->flags['host-only'] === TRUE) {
+			return FALSE;
 		}
 
 		if (strlen($string) <= strlen($domain_string)) {
 			// For obvious reasons, the string cannot be a suffix if the domain
 			// is shorter than the domain string
-			return false;
+			return FALSE;
 		}
 
 		if (substr($string, -1 * strlen($domain_string)) !== $domain_string) {
 			// The domain string should be a suffix of the string.
-			return false;
+			return FALSE;
 		}
 
 		$prefix = substr($string, 0, strlen($string) - strlen($domain_string));
 		if (substr($prefix, -1) !== '.') {
 			// The last character of the string that is not included in the
 			// domain string should be a %x2E (".") character.
-			return false;
+			return FALSE;
 		}
 
 		// The string should be a host name (i.e., not an IP address).
@@ -192,32 +192,32 @@ 
 		if (!isset($this->attributes['path'])) {
 			// Cookies created manually; cookies created by Requests will set
 			// the path to the requested path
-			return true;
+			return TRUE;
 		}
 
 		$cookie_path = $this->attributes['path'];
 
 		if ($cookie_path === $request_path) {
 			// The cookie-path and the request-path are identical.
-			return true;
+			return TRUE;
 		}
 
 		if (strlen($request_path) > strlen($cookie_path) && substr($request_path, 0, strlen($cookie_path)) === $cookie_path) {
 			if (substr($cookie_path, -1) === '/') {
 				// The cookie-path is a prefix of the request-path, and the last
 				// character of the cookie-path is %x2F ("/").
-				return true;
+				return TRUE;
 			}
 
 			if (substr($request_path, strlen($cookie_path), 1) === '/') {
 				// The cookie-path is a prefix of the request-path, and the
 				// first character of the request-path that is not included in
 				// the cookie-path is a %x2F ("/") character.
-				return true;
+				return TRUE;
 			}
 		}
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 		foreach ($this->attributes as $key => $value) {
 			$orig_value = $value;
 			$value = $this->normalize_attribute($key, $value);
-			if ($value === null) {
+			if ($value === NULL) {
 				unset($this->attributes[$key]);
 				continue;
 			}
@@ -239,7 +239,7 @@ 
 			}
 		}
 
-		return true;
+		return TRUE;
 	}
 
 	/**
@@ -260,8 +260,8 @@ 
 				}
 
 				$expiry_time = strtotime($value);
-				if ($expiry_time === false) {
-					return null;
+				if ($expiry_time === FALSE) {
+					return NULL;
 				}
 
 				return $expiry_time;
@@ -274,7 +274,7 @@ 
 
 				// Check that we have a valid age
 				if (!preg_match('/^-?\d+$/', $value)) {
-					return null;
+					return NULL;
 				}
 
 				$delta_seconds = (int) $value;
@@ -379,14 +379,14 @@ 
 	 * @param string Cookie header value (from a Set-Cookie header)
 	 * @return Requests_Cookie Parsed cookie object
 	 */
-	public static function parse($string, $name = '', $reference_time = null) {
+	public static function parse($string, $name = '', $reference_time = NULL) {
 		$parts = explode(';', $string);
 		$kvparts = array_shift($parts);
 
 		if (!empty($name)) {
 			$value = $string;
 		}
-		elseif (strpos($kvparts, '=') === false) {
+		elseif (strpos($kvparts, '=') === FALSE) {
 			// Some sites might only have a value without the equals separator.
 			// Deviate from RFC 6265 and pretend it was actually a blank name
 			// (`=foo`)
@@ -406,9 +406,9 @@ 
 
 		if (!empty($parts)) {
 			foreach ($parts as $part) {
-				if (strpos($part, '=') === false) {
+				if (strpos($part, '=') === FALSE) {
 					$part_key = $part;
-					$part_value = true;
+					$part_value = TRUE;
 				}
 				else {
 					list($part_key, $part_value) = explode('=', $part, 2);
@@ -431,7 +431,7 @@ 
 	 * @param int|null $time Reference time for expiration calculation
 	 * @return array
 	 */
-	public static function parse_from_headers(Requests_Response_Headers $headers, Requests_IRI $origin = null, $time = null) {
+	public static function parse_from_headers(Requests_Response_Headers $headers, Requests_IRI $origin = NULL, $time = NULL) {
 		$cookie_headers = $headers->getValues('Set-Cookie');
 		if (empty($cookie_headers)) {
 			return array();
@@ -444,10 +444,10 @@ 
 			// Default domain/path attributes
 			if (empty($parsed->attributes['domain']) && !empty($origin)) {
 				$parsed->attributes['domain'] = $origin->host;
-				$parsed->flags['host-only'] = true;
+				$parsed->flags['host-only'] = TRUE;
 			}
 			else {
-				$parsed->flags['host-only'] = false;
+				$parsed->flags['host-only'] = FALSE;
 			}
 
 			$path_is_valid = (!empty($parsed->attributes['path']) && $parsed->attributes['path'][0] === '/');

php/Requests/libary/Requests/Exception/Transport/cURL.php

Doc Comments +3 added lines

@@ -29,6 +29,9 @@
 	 */
 	protected $reason = 'Unknown';
 
+	/**
+	 * @param string $message
+	 */
 	public function __construct($message, $type, $data = null, $code = 0) {
 		if ($type !== null) {
 			$this->type = $type;

Spacing +3 added lines, -3 removed lines

@@ -30,15 +30,15 @@
 	protected $reason = 'Unknown';
 
 	public function __construct($message, $type, $data = null, $code = 0) {
-		if ($type !== null) {
+		if($type !== null) {
 			$this->type = $type;
 		}
 
-		if ($code !== null) {
+		if($code !== null) {
 			$this->code = $code;
 		}
 
-		if ($message !== null) {
+		if($message !== null) {
 			$this->reason = $message;
 		}
 

Braces +12 added lines, -6 removed lines

@@ -1,6 +1,7 @@ 
 <?php
 
-class Requests_Exception_Transport_cURL extends Requests_Exception_Transport {
+class Requests_Exception_Transport_cURL extends Requests_Exception_Transport
+{
 
 	const EASY = 'cURLEasy';
 	const MULTI = 'cURLMulti';
@@ -29,16 +30,20 @@ 
 	 */
 	protected $reason = 'Unknown';
 
-	public function __construct($message, $type, $data = null, $code = 0) {
-		if ($type !== null) {
+	public function __construct($message, $type, $data = null, $code = 0)
+	{
+		if ($type !== null)
+		{
 			$this->type = $type;
 		}
 
-		if ($code !== null) {
+		if ($code !== null)
+		{
 			$this->code = $code;
 		}
 
-		if ($message !== null) {
+		if ($message !== null)
+		{
 			$this->reason = $message;
 		}
 
@@ -49,7 +54,8 @@ 
 	/**
 	 * Get the error message
 	 */
-	public function getReason() {
+	public function getReason()
+	{
 		return $this->reason;
 	}
 

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -29,16 +29,16 @@
 	 */
 	protected $reason = 'Unknown';
 
-	public function __construct($message, $type, $data = null, $code = 0) {
-		if ($type !== null) {
+	public function __construct($message, $type, $data = NULL, $code = 0) {
+		if ($type !== NULL) {
 			$this->type = $type;
 		}
 
-		if ($code !== null) {
+		if ($code !== NULL) {
 			$this->code = $code;
 		}
 
-		if ($message !== null) {
+		if ($message !== NULL) {
 			$this->reason = $message;
 		}