reginaldojunior / winners

app/Vendor/PagSeguro/source/PagSeguroLibrary/service/PagSeguroPaymentService.class.php

Doc Comments +4 added lines

@@ -61,6 +61,10 @@
      * @throws Exception|PagSeguroServiceException
      * @throws Exception
      */
+
+    /**
+     * @param boolean $onlyCheckoutCode
+     */
     public static function createCheckoutRequest(
         PagSeguroCredentials $credentials,
         PagSeguroPaymentRequest $paymentRequest,

Indentation +86 added lines, -86 removed lines

@@ -27,107 +27,107 @@
 class PagSeguroPaymentService
 {
 
-    /***
+	/***
      *
      */
-    const SERVICE_NAME = 'paymentService';
+	const SERVICE_NAME = 'paymentService';
 
-    /***
+	/***
      * @param PagSeguroConnectionData $connectionData
      * @return string
      */
-    private static function buildCheckoutRequestUrl(PagSeguroConnectionData $connectionData)
-    {
-        return $connectionData->getServiceUrl() . '/?' . $connectionData->getCredentialsUrlQuery();
-    }
+	private static function buildCheckoutRequestUrl(PagSeguroConnectionData $connectionData)
+	{
+		return $connectionData->getServiceUrl() . '/?' . $connectionData->getCredentialsUrlQuery();
+	}
 
-    /***
+	/***
      * @param PagSeguroConnectionData $connectionData
      * @param $code
      * @return string
      */
-    private static function buildCheckoutUrl(PagSeguroConnectionData $connectionData, $code)
-    {
-        return $connectionData->getPaymentUrl() . $connectionData->getResource('checkoutUrl') . "?code=$code";
-    }
-
-    // createCheckoutRequest is the actual implementation of the Register method
-    // This separation serves as test hook to validate the Uri
-    // against the code returned by the service
-    /***
+	private static function buildCheckoutUrl(PagSeguroConnectionData $connectionData, $code)
+	{
+		return $connectionData->getPaymentUrl() . $connectionData->getResource('checkoutUrl') . "?code=$code";
+	}
+
+	// createCheckoutRequest is the actual implementation of the Register method
+	// This separation serves as test hook to validate the Uri
+	// against the code returned by the service
+	/***
      * @param PagSeguroCredentials $credentials
      * @param PagSeguroPaymentRequest $paymentRequest
      * @return bool|string
      * @throws Exception|PagSeguroServiceException
      * @throws Exception
      */
-    public static function createCheckoutRequest(
-        PagSeguroCredentials $credentials,
-        PagSeguroPaymentRequest $paymentRequest,
-        $onlyCheckoutCode
-    ) {
-
-        LogPagSeguro::info("PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - begin");
-
-        $connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
-
-        try {
-
-            $connection = new PagSeguroHttpConnection();
-            $connection->post(
-                self::buildCheckoutRequestUrl($connectionData),
-                PagSeguroPaymentParser::getData($paymentRequest),
-                $connectionData->getServiceTimeout(),
-                $connectionData->getCharset()
-            );
-
-            $httpStatus = new PagSeguroHttpStatus($connection->getStatus());
-
-            switch ($httpStatus->getType()) {
-
-                case 'OK':
-                    $PaymentParserData = PagSeguroPaymentParser::readSuccessXml($connection->getResponse());
-
-                    if ($onlyCheckoutCode) {
-                        $paymentReturn = $PaymentParserData->getCode();
-                    } else {
-                        $paymentReturn = self::buildCheckoutUrl($connectionData, $PaymentParserData->getCode());
-                    }
-                    LogPagSeguro::info(
-                        "PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - end {1}" .
-                        $PaymentParserData->getCode()
-                    );
-                    break;
-
-                case 'BAD_REQUEST':
-                    $errors = PagSeguroPaymentParser::readErrors($connection->getResponse());
-                    $e = new PagSeguroServiceException($httpStatus, $errors);
-                    LogPagSeguro::error(
-                        "PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - error " .
-                        $e->getOneLineMessage()
-                    );
-                    throw $e;
-                    break;
-
-                default:
-                    $e = new PagSeguroServiceException($httpStatus);
-                    LogPagSeguro::error(
-                        "PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - error " .
-                        $e->getOneLineMessage()
-                    );
-                    throw $e;
-                    break;
-
-            }
-            return (isset($paymentReturn) ? $paymentReturn : false);
-
-        } catch (PagSeguroServiceException $e) {
-            throw $e;
-        }
-        catch (Exception $e) {
-            LogPagSeguro::error("Exception: " . $e->getMessage());
-            throw $e;
-        }
-
-    }
+	public static function createCheckoutRequest(
+		PagSeguroCredentials $credentials,
+		PagSeguroPaymentRequest $paymentRequest,
+		$onlyCheckoutCode
+	) {
+
+		LogPagSeguro::info("PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - begin");
+
+		$connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
+
+		try {
+
+			$connection = new PagSeguroHttpConnection();
+			$connection->post(
+				self::buildCheckoutRequestUrl($connectionData),
+				PagSeguroPaymentParser::getData($paymentRequest),
+				$connectionData->getServiceTimeout(),
+				$connectionData->getCharset()
+			);
+
+			$httpStatus = new PagSeguroHttpStatus($connection->getStatus());
+
+			switch ($httpStatus->getType()) {
+
+				case 'OK':
+					$PaymentParserData = PagSeguroPaymentParser::readSuccessXml($connection->getResponse());
+
+					if ($onlyCheckoutCode) {
+						$paymentReturn = $PaymentParserData->getCode();
+					} else {
+						$paymentReturn = self::buildCheckoutUrl($connectionData, $PaymentParserData->getCode());
+					}
+					LogPagSeguro::info(
+						"PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - end {1}" .
+						$PaymentParserData->getCode()
+					);
+					break;
+
+				case 'BAD_REQUEST':
+					$errors = PagSeguroPaymentParser::readErrors($connection->getResponse());
+					$e = new PagSeguroServiceException($httpStatus, $errors);
+					LogPagSeguro::error(
+						"PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - error " .
+						$e->getOneLineMessage()
+					);
+					throw $e;
+					break;
+
+				default:
+					$e = new PagSeguroServiceException($httpStatus);
+					LogPagSeguro::error(
+						"PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - error " .
+						$e->getOneLineMessage()
+					);
+					throw $e;
+					break;
+
+			}
+			return (isset($paymentReturn) ? $paymentReturn : false);
+
+		} catch (PagSeguroServiceException $e) {
+			throw $e;
+		}
+		catch (Exception $e) {
+			LogPagSeguro::error("Exception: " . $e->getMessage());
+			throw $e;
+		}
+
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
      */
     private static function buildCheckoutRequestUrl(PagSeguroConnectionData $connectionData)
     {
-        return $connectionData->getServiceUrl() . '/?' . $connectionData->getCredentialsUrlQuery();
+        return $connectionData->getServiceUrl().'/?'.$connectionData->getCredentialsUrlQuery();
     }
 
     /***
@@ -48,7 +48,7 @@ 
      */
     private static function buildCheckoutUrl(PagSeguroConnectionData $connectionData, $code)
     {
-        return $connectionData->getPaymentUrl() . $connectionData->getResource('checkoutUrl') . "?code=$code";
+        return $connectionData->getPaymentUrl().$connectionData->getResource('checkoutUrl')."?code=$code";
     }
 
     // createCheckoutRequest is the actual implementation of the Register method
@@ -67,7 +67,7 @@ 
         $onlyCheckoutCode
     ) {
 
-        LogPagSeguro::info("PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - begin");
+        LogPagSeguro::info("PagSeguroPaymentService.Register(".$paymentRequest->toString().") - begin");
 
         $connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
 
@@ -94,7 +94,7 @@ 
                         $paymentReturn = self::buildCheckoutUrl($connectionData, $PaymentParserData->getCode());
                     }
                     LogPagSeguro::info(
-                        "PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - end {1}" .
+                        "PagSeguroPaymentService.Register(".$paymentRequest->toString().") - end {1}".
                         $PaymentParserData->getCode()
                     );
                     break;
@@ -103,7 +103,7 @@ 
                     $errors = PagSeguroPaymentParser::readErrors($connection->getResponse());
                     $e = new PagSeguroServiceException($httpStatus, $errors);
                     LogPagSeguro::error(
-                        "PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - error " .
+                        "PagSeguroPaymentService.Register(".$paymentRequest->toString().") - error ".
                         $e->getOneLineMessage()
                     );
                     throw $e;
@@ -112,7 +112,7 @@ 
                 default:
                     $e = new PagSeguroServiceException($httpStatus);
                     LogPagSeguro::error(
-                        "PagSeguroPaymentService.Register(" . $paymentRequest->toString() . ") - error " .
+                        "PagSeguroPaymentService.Register(".$paymentRequest->toString().") - error ".
                         $e->getOneLineMessage()
                     );
                     throw $e;
@@ -125,7 +125,7 @@ 
             throw $e;
         }
         catch (Exception $e) {
-            LogPagSeguro::error("Exception: " . $e->getMessage());
+            LogPagSeguro::error("Exception: ".$e->getMessage());
             throw $e;
         }
 

Braces +1 added lines, -2 removed lines

@@ -123,8 +123,7 @@
 
         } catch (PagSeguroServiceException $e) {
             throw $e;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             LogPagSeguro::error("Exception: " . $e->getMessage());
             throw $e;
         }

app/Vendor/PagSeguro/source/PagSeguroLibrary/service/PagSeguroRefundService.class.php

Doc Comments +7 added lines

@@ -29,6 +29,9 @@ 
 
     const SERVICE_NAME = 'refundService';
 
+    /**
+     * @param PagSeguroConnectionData $connectionData
+     */
     private static function buildRefundURL($connectionData, $transactionCode, $refundValue = null)
     {
         if (is_null($refundValue)) {
@@ -40,6 +43,10 @@ 
         }
     }
 
+    /**
+     * @param string $transactionCode
+     * @param string $refundValue
+     */
     public static function createRefundRequest(
         PagSeguroCredentials $credentials,
         $transactionCode,

Spacing +8 added lines, -8 removed lines

@@ -32,11 +32,11 @@ 
     private static function buildRefundURL($connectionData, $transactionCode, $refundValue = null)
     {
         if (is_null($refundValue)) {
-            return  $connectionData->getServiceUrl() . '?' . $connectionData->getCredentialsUrlQuery()
-                    . "&transactionCode=" . $transactionCode;
+            return  $connectionData->getServiceUrl().'?'.$connectionData->getCredentialsUrlQuery()
+                    . "&transactionCode=".$transactionCode;
         } else {
-            return  $connectionData->getServiceUrl() . '?' . $connectionData->getCredentialsUrlQuery()
-                    . "&transactionCode=" . $transactionCode . "&refundValue=" . $refundValue;
+            return  $connectionData->getServiceUrl().'?'.$connectionData->getCredentialsUrlQuery()
+                    . "&transactionCode=".$transactionCode."&refundValue=".$refundValue;
         }
     }
 
@@ -44,7 +44,7 @@ 
         PagSeguroCredentials $credentials,
         $transactionCode,
         $refundValue = null
-    ){
+    ) {
 
         LogPagSeguro::info("PagSeguroRefundService.Register(".$transactionCode.") - begin");
         $connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
@@ -79,7 +79,7 @@ 
                     $errors = PagSeguroRefundParser::readErrors($connection->getResponse());
                     $err = new PagSeguroServiceException($httpStatus, $errors);
                     LogPagSeguro::error(
-                        "PagSeguroRefundService.createRefundRequest() - error " .
+                        "PagSeguroRefundService.createRefundRequest() - error ".
                         $err->getOneLineMessage()
                     );
                     throw $err;
@@ -87,7 +87,7 @@ 
                 default:
                     $err = new PagSeguroServiceException($httpStatus);
                     LogPagSeguro::error(
-                        "PagSeguroRefundService.createRefundRequest() - error " .
+                        "PagSeguroRefundService.createRefundRequest() - error ".
                         $err->getOneLineMessage()
                     );
                     throw $err;
@@ -98,7 +98,7 @@ 
         } catch (PagSeguroServiceException $err) {
             throw $err;
         } catch (Exception $err) {
-            LogPagSeguro::error("Exception: " . $err->getMessage());
+            LogPagSeguro::error("Exception: ".$err->getMessage());
             throw $err;
         }
     }

Indentation +65 added lines, -65 removed lines

@@ -27,79 +27,79 @@
 class PagSeguroRefundService
 {
 
-    const SERVICE_NAME = 'refundService';
+	const SERVICE_NAME = 'refundService';
 
-    private static function buildRefundURL($connectionData, $transactionCode, $refundValue = null)
-    {
-        if (is_null($refundValue)) {
-            return  $connectionData->getServiceUrl() . '?' . $connectionData->getCredentialsUrlQuery()
-                    . "&transactionCode=" . $transactionCode;
-        } else {
-            return  $connectionData->getServiceUrl() . '?' . $connectionData->getCredentialsUrlQuery()
-                    . "&transactionCode=" . $transactionCode . "&refundValue=" . $refundValue;
-        }
-    }
+	private static function buildRefundURL($connectionData, $transactionCode, $refundValue = null)
+	{
+		if (is_null($refundValue)) {
+			return  $connectionData->getServiceUrl() . '?' . $connectionData->getCredentialsUrlQuery()
+					. "&transactionCode=" . $transactionCode;
+		} else {
+			return  $connectionData->getServiceUrl() . '?' . $connectionData->getCredentialsUrlQuery()
+					. "&transactionCode=" . $transactionCode . "&refundValue=" . $refundValue;
+		}
+	}
 
-    public static function createRefundRequest(
-        PagSeguroCredentials $credentials,
-        $transactionCode,
-        $refundValue = null
-    ){
+	public static function createRefundRequest(
+		PagSeguroCredentials $credentials,
+		$transactionCode,
+		$refundValue = null
+	){
 
-        LogPagSeguro::info("PagSeguroRefundService.Register(".$transactionCode.") - begin");
-        $connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
+		LogPagSeguro::info("PagSeguroRefundService.Register(".$transactionCode.") - begin");
+		$connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
 
-        if (is_null($refundValue)) {
-            $url = self::buildRefundURL($connectionData, $transactionCode);
-        } else {
-            $url = self::buildRefundURL($connectionData, $transactionCode, $refundValue);
-        }
+		if (is_null($refundValue)) {
+			$url = self::buildRefundURL($connectionData, $transactionCode);
+		} else {
+			$url = self::buildRefundURL($connectionData, $transactionCode, $refundValue);
+		}
 
-        try {
+		try {
 
-           $connection = new PagSeguroHttpConnection();
-           $connection->post(
-                $url,
-                array(),
-                $connectionData->getServiceTimeout(),
-                $connectionData->getCharset()
-           );
+		   $connection = new PagSeguroHttpConnection();
+		   $connection->post(
+				$url,
+				array(),
+				$connectionData->getServiceTimeout(),
+				$connectionData->getCharset()
+		   );
 
-            $httpStatus = new PagSeguroHttpStatus($connection->getStatus());
+			$httpStatus = new PagSeguroHttpStatus($connection->getStatus());
 
-            switch ($httpStatus->getType()) {
-                case 'OK':
+			switch ($httpStatus->getType()) {
+				case 'OK':
 
-                    $result = PagSeguroRefundParser::readSuccessXml($connection->getResponse());
-                    LogPagSeguro::info(
-                        "PagSeguroRefundService.createRefundRequest(".$result.") - end "
-                    );
-                    break;
-                case 'BAD_REQUEST':
-                    $errors = PagSeguroRefundParser::readErrors($connection->getResponse());
-                    $err = new PagSeguroServiceException($httpStatus, $errors);
-                    LogPagSeguro::error(
-                        "PagSeguroRefundService.createRefundRequest() - error " .
-                        $err->getOneLineMessage()
-                    );
-                    throw $err;
-                    break;
-                default:
-                    $err = new PagSeguroServiceException($httpStatus);
-                    LogPagSeguro::error(
-                        "PagSeguroRefundService.createRefundRequest() - error " .
-                        $err->getOneLineMessage()
-                    );
-                    throw $err;
-                    break;
-            }
-            return isset($result) ? $result : false;
+					$result = PagSeguroRefundParser::readSuccessXml($connection->getResponse());
+					LogPagSeguro::info(
+						"PagSeguroRefundService.createRefundRequest(".$result.") - end "
+					);
+					break;
+				case 'BAD_REQUEST':
+					$errors = PagSeguroRefundParser::readErrors($connection->getResponse());
+					$err = new PagSeguroServiceException($httpStatus, $errors);
+					LogPagSeguro::error(
+						"PagSeguroRefundService.createRefundRequest() - error " .
+						$err->getOneLineMessage()
+					);
+					throw $err;
+					break;
+				default:
+					$err = new PagSeguroServiceException($httpStatus);
+					LogPagSeguro::error(
+						"PagSeguroRefundService.createRefundRequest() - error " .
+						$err->getOneLineMessage()
+					);
+					throw $err;
+					break;
+			}
+			return isset($result) ? $result : false;
 
-        } catch (PagSeguroServiceException $err) {
-            throw $err;
-        } catch (Exception $err) {
-            LogPagSeguro::error("Exception: " . $err->getMessage());
-            throw $err;
-        }
-    }
+		} catch (PagSeguroServiceException $err) {
+			throw $err;
+		} catch (Exception $err) {
+			LogPagSeguro::error("Exception: " . $err->getMessage());
+			throw $err;
+		}
+	}
 }
\ No newline at end of file

app/Vendor/PagSeguro/source/PagSeguroLibrary/service/PagSeguroSessionService.class.php

Doc Comments +4 added lines

@@ -44,6 +44,10 @@
      * @throws Exception|PagSeguroServiceException
      * @throws Exception
      */
+
+    /**
+     * @param PagSeguroAccountCredentials $credentials
+     */
     public static function getSession($credentials)
     {
         $connectionData = new PagSeguroConnectionData($credentials, 'sessionService');

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
      */
     private static function buildSessionURL($connectionData)
     {
-        return  $connectionData->getWebserviceUrl() . $connectionData->getSessionUrl();  
+        return  $connectionData->getWebserviceUrl().$connectionData->getSessionUrl();  
     }
 
     /***
@@ -48,7 +48,7 @@ 
     {
         $connectionData = new PagSeguroConnectionData($credentials, 'sessionService');
 
-        $url = self::buildSessionURL($connectionData)  . "?" . $connectionData->getCredentialsUrlQuery();
+        $url = self::buildSessionURL($connectionData)."?".$connectionData->getCredentialsUrlQuery();
 
         try {
             
@@ -71,7 +71,7 @@ 
                     return $session->getId();
 
                     LogPagSeguro::info(
-                        "PagSeguroSessionService.getSession()(" . $session->toString() . ") - end {1}"
+                        "PagSeguroSessionService.getSession()(".$session->toString().") - end {1}"
                     );
                     break;
 
@@ -79,7 +79,7 @@ 
                     $errors = PagSeguroSessionParser::readErrors($connection->getStatus());
                     $e = new PagSeguroServiceException($httpStatus, $errors);
                     LogPagSeguro::error(
-                        "PagSeguroSessionService.getSession() - error " . 
+                        "PagSeguroSessionService.getSession() - error ". 
                         $e->getOneLineMessage()
                     );
                     throw $e;
@@ -89,7 +89,7 @@ 
 
                     $e = new PagSeguroServiceException($httpStatus);
                     LogPagSeguro::error(
-                        "PagSeguroSessionService.getSession() - error " . 
+                        "PagSeguroSessionService.getSession() - error ". 
                         $e->getOneLineMessage() 
                     );
                     throw $e;
@@ -98,7 +98,7 @@ 
         } catch (PagSeguroServiceException $e) {
             throw $e;
         } catch (Exception $e) {
-            LogPagSeguro::error("Exception: " . $e->getMessage());
+            LogPagSeguro::error("Exception: ".$e->getMessage());
             throw $e;
         }
     }

Indentation +52 added lines, -52 removed lines

@@ -27,80 +27,80 @@
 class PagSeguroSessionService
 {
 
-    /***
+	/***
      * Build URL for get session.
      * @param PagSeguroConnectionData $connectionData 
      * @return string session URL
      */
-    private static function buildSessionURL($connectionData)
-    {
-        return  $connectionData->getWebserviceUrl() . $connectionData->getSessionUrl();  
-    }
+	private static function buildSessionURL($connectionData)
+	{
+		return  $connectionData->getWebserviceUrl() . $connectionData->getSessionUrl();  
+	}
 
-    /***
+	/***
      * Get session for direct payment from webservice 
      * @param $credentials PagSeguroAccountCredentials 
      * @return bool|string
      * @throws Exception|PagSeguroServiceException
      * @throws Exception
      */
-    public static function getSession($credentials)
-    {
-        $connectionData = new PagSeguroConnectionData($credentials, 'sessionService');
+	public static function getSession($credentials)
+	{
+		$connectionData = new PagSeguroConnectionData($credentials, 'sessionService');
 
-        $url = self::buildSessionURL($connectionData)  . "?" . $connectionData->getCredentialsUrlQuery();
+		$url = self::buildSessionURL($connectionData)  . "?" . $connectionData->getCredentialsUrlQuery();
 
-        try {
+		try {
             
-            $connection = new PagSeguroHttpConnection();
-            $connection->post(
-                $url,
-                array(),
-                $connectionData->getServiceTimeout(),
-                $connectionData->getCharset()
-             );
+			$connection = new PagSeguroHttpConnection();
+			$connection->post(
+				$url,
+				array(),
+				$connectionData->getServiceTimeout(),
+				$connectionData->getCharset()
+			 );
 
-            $httpStatus = new PagSeguroHttpStatus($connection->getStatus());
+			$httpStatus = new PagSeguroHttpStatus($connection->getStatus());
 
-            switch ($httpStatus->getType()) {
+			switch ($httpStatus->getType()) {
 
-                case 'OK':
+				case 'OK':
 
-                    $session = PagSeguroSessionParser::readResult($connection->getResponse());
+					$session = PagSeguroSessionParser::readResult($connection->getResponse());
 
-                    return $session->getId();
+					return $session->getId();
 
-                    LogPagSeguro::info(
-                        "PagSeguroSessionService.getSession()(" . $session->toString() . ") - end {1}"
-                    );
-                    break;
+					LogPagSeguro::info(
+						"PagSeguroSessionService.getSession()(" . $session->toString() . ") - end {1}"
+					);
+					break;
 
-                case 'BAD_REQUEST':
-                    $errors = PagSeguroSessionParser::readErrors($connection->getStatus());
-                    $e = new PagSeguroServiceException($httpStatus, $errors);
-                    LogPagSeguro::error(
-                        "PagSeguroSessionService.getSession() - error " . 
-                        $e->getOneLineMessage()
-                    );
-                    throw $e;
-                    break;
+				case 'BAD_REQUEST':
+					$errors = PagSeguroSessionParser::readErrors($connection->getStatus());
+					$e = new PagSeguroServiceException($httpStatus, $errors);
+					LogPagSeguro::error(
+						"PagSeguroSessionService.getSession() - error " . 
+						$e->getOneLineMessage()
+					);
+					throw $e;
+					break;
 
-                default:
+				default:
 
-                    $e = new PagSeguroServiceException($httpStatus);
-                    LogPagSeguro::error(
-                        "PagSeguroSessionService.getSession() - error " . 
-                        $e->getOneLineMessage() 
-                    );
-                    throw $e;
-                    break;
-            }
-        } catch (PagSeguroServiceException $e) {
-            throw $e;
-        } catch (Exception $e) {
-            LogPagSeguro::error("Exception: " . $e->getMessage());
-            throw $e;
-        }
-    }
+					$e = new PagSeguroServiceException($httpStatus);
+					LogPagSeguro::error(
+						"PagSeguroSessionService.getSession() - error " . 
+						$e->getOneLineMessage() 
+					);
+					throw $e;
+					break;
+			}
+		} catch (PagSeguroServiceException $e) {
+			throw $e;
+		} catch (Exception $e) {
+			LogPagSeguro::error("Exception: " . $e->getMessage());
+			throw $e;
+		}
+	}
 
 }

app/Vendor/PagSeguro/source/PagSeguroLibrary/service/PagSeguroTransactionSearchService.class.php

Doc Comments +15 added lines, -15 removed lines

@@ -36,7 +36,7 @@ 
 
     /**
      * @param PagSeguroConnectionData $connectionData
-     * @param $transactionCode
+     * @param string $transactionCode
      * @return string
      */
     private static function buildSearchUrlByCode(PagSeguroConnectionData $connectionData, $transactionCode)
@@ -260,11 +260,11 @@ 
 
     /**
      * @param PagSeguroCredentials $credentials
-     * @param $reference
-     * @param null $initialDate
-     * @param null $finalDate
-     * @param null $pageNumber
-     * @param null $maxPageResults
+     * @param string $reference
+     * @param string $initialDate
+     * @param string $finalDate
+     * @param integer $pageNumber
+     * @param integer $maxPageResults
      * @throws Exception
      * @throws PagSeguroServiceException
      */
@@ -314,10 +314,10 @@ 
     }
 
     /**
-     * @param $pageNumber
-     * @param $maxPageResults
-     * @param $initialDate
-     * @param null $finalDate
+     * @param integer|null $pageNumber
+     * @param integer|null $maxPageResults
+     * @param string $initialDate
+     * @param string|null $finalDate
      * @return array
      */
     private function buildParams($pageNumber, $maxPageResults, $initialDate, $finalDate = null)
@@ -334,8 +334,8 @@ 
     }
 
     /**
-     * @param $connection
-     * @param $code
+     * @param PagSeguroHttpConnection $connection
+     * @param string $code
      * @return bool|PagSeguroTransaction
      * @throws PagSeguroServiceException
      */
@@ -376,9 +376,9 @@ 
     }
 
     /**
-     * @param $connection
-     * @param null $initialDate
-     * @param null $finalDate
+     * @param PagSeguroHttpConnection $connection
+     * @param string $initialDate
+     * @param string|null $finalDate
      * @return bool|PagSeguroTransactionSearchResult
      * @throws PagSeguroServiceException
      */

Indentation +348 added lines, -348 removed lines

@@ -27,96 +27,96 @@ 
 class PagSeguroTransactionSearchService
 {
 
-    /**
-     *
-     */
-    const SERVICE_NAME = 'transactionSearchService';
-
-    private static $logService;
-
-    /**
-     * @param PagSeguroConnectionData $connectionData
-     * @param $transactionCode
-     * @return string
-     */
-    private static function buildSearchUrlByCode(PagSeguroConnectionData $connectionData, $transactionCode)
-    {
-        $url = $connectionData->getServiceUrl('v3');
-        return "{$url}/{$transactionCode}/?" . $connectionData->getCredentialsUrlQuery();
-    }
-
-    /**
-     * @param PagSeguroConnectionData $connectionData
-     * @param array $searchParams
-     * @return string
-     */
-    private static function buildSearchUrlByDate(PagSeguroConnectionData $connectionData, array $searchParams)
-    {
-        $url = $connectionData->getServiceUrl('v2');
-        $initialDate = $searchParams['initialDate'] != null ? $searchParams['initialDate'] : "";
-        $finalDate = $searchParams['finalDate'] != null ? ("&finalDate=" . $searchParams['finalDate']) : "";
-        if ($searchParams['pageNumber'] != null) {
-            $page = "&page=" . $searchParams['pageNumber'];
-        }
-        if ($searchParams['maxPageResults'] != null) {
-            $maxPageResults = "&maxPageResults=" . $searchParams['maxPageResults'];
-        }
-        return "{$url}/?" . $connectionData->getCredentialsUrlQuery() .
-            "&initialDate={$initialDate}{$finalDate}{$page}{$maxPageResults}";
-    }
-
-    /**
-     * @param PagSeguroConnectionData $connectionData
-     * @param array $searchParams
-     * @return string
-     */
-    private static function buildSearchUrlAbandoned(PagSeguroConnectionData $connectionData, array $searchParams)
-    {
-        $url = $connectionData->getServiceUrl('v2');
-
-        $initialDate = $searchParams['initialDate'] != null ? $searchParams['initialDate'] : "";
-        $finalDate = $searchParams['finalDate'] != null ? ("&finalDate=" . $searchParams['finalDate']) : "";
-        if ($searchParams['pageNumber'] != null) {
-            $page = "&page=" . $searchParams['pageNumber'];
-        }
-        if ($searchParams['maxPageResults'] != null) {
-            $maxPageResults = "&maxPageResults=" . $searchParams['maxPageResults'];
-        }
-        return "{$url}/abandoned/?" . $connectionData->getCredentialsUrlQuery() .
-            "&initialDate={$initialDate}&finalDate={$finalDate}{$page}{$maxPageResults}";
-    }
-
-    /**
-     * @param PagSeguroConnectionData $connectionData
-     * @param $reference
-     * @param null $searchParams
-     * @return string
-     */
-    private static function buildSearchUrlByReference(
-        PagSeguroConnectionData $connectionData,
-        $reference,
-        $searchParams = null
-    ){
-        $url = $connectionData->getServiceUrl('v2');
-        if ($searchParams == null) {
-            return "{$url}?" . $connectionData->getCredentialsUrlQuery() . "&reference=" . $reference;
-        } else {
-
-            $initialDate = $searchParams['initialDate'] != null ? $searchParams['initialDate'] : "";
-            $finalDate = $searchParams['finalDate'] != null ? ("&finalDate=" . $searchParams['finalDate']) : "";
-            if ($searchParams['pageNumber'] != null) {
-                $page = "&page=" . $searchParams['pageNumber'];
-            }
-            if ($searchParams['maxPageResults'] != null) {
-                $maxPageResults = "&maxPageResults=" . $searchParams['maxPageResults'];
-            }
-
-            return "{$url}?" . $connectionData->getCredentialsUrlQuery() . "&reference=" . $reference
-                   . "&initialDate={$initialDate}&finalDate={$finalDate}{$page}{$maxPageResults}";
-        }
-    }
-
-    /***
+	/**
+	 *
+	 */
+	const SERVICE_NAME = 'transactionSearchService';
+
+	private static $logService;
+
+	/**
+	 * @param PagSeguroConnectionData $connectionData
+	 * @param $transactionCode
+	 * @return string
+	 */
+	private static function buildSearchUrlByCode(PagSeguroConnectionData $connectionData, $transactionCode)
+	{
+		$url = $connectionData->getServiceUrl('v3');
+		return "{$url}/{$transactionCode}/?" . $connectionData->getCredentialsUrlQuery();
+	}
+
+	/**
+	 * @param PagSeguroConnectionData $connectionData
+	 * @param array $searchParams
+	 * @return string
+	 */
+	private static function buildSearchUrlByDate(PagSeguroConnectionData $connectionData, array $searchParams)
+	{
+		$url = $connectionData->getServiceUrl('v2');
+		$initialDate = $searchParams['initialDate'] != null ? $searchParams['initialDate'] : "";
+		$finalDate = $searchParams['finalDate'] != null ? ("&finalDate=" . $searchParams['finalDate']) : "";
+		if ($searchParams['pageNumber'] != null) {
+			$page = "&page=" . $searchParams['pageNumber'];
+		}
+		if ($searchParams['maxPageResults'] != null) {
+			$maxPageResults = "&maxPageResults=" . $searchParams['maxPageResults'];
+		}
+		return "{$url}/?" . $connectionData->getCredentialsUrlQuery() .
+			"&initialDate={$initialDate}{$finalDate}{$page}{$maxPageResults}";
+	}
+
+	/**
+	 * @param PagSeguroConnectionData $connectionData
+	 * @param array $searchParams
+	 * @return string
+	 */
+	private static function buildSearchUrlAbandoned(PagSeguroConnectionData $connectionData, array $searchParams)
+	{
+		$url = $connectionData->getServiceUrl('v2');
+
+		$initialDate = $searchParams['initialDate'] != null ? $searchParams['initialDate'] : "";
+		$finalDate = $searchParams['finalDate'] != null ? ("&finalDate=" . $searchParams['finalDate']) : "";
+		if ($searchParams['pageNumber'] != null) {
+			$page = "&page=" . $searchParams['pageNumber'];
+		}
+		if ($searchParams['maxPageResults'] != null) {
+			$maxPageResults = "&maxPageResults=" . $searchParams['maxPageResults'];
+		}
+		return "{$url}/abandoned/?" . $connectionData->getCredentialsUrlQuery() .
+			"&initialDate={$initialDate}&finalDate={$finalDate}{$page}{$maxPageResults}";
+	}
+
+	/**
+	 * @param PagSeguroConnectionData $connectionData
+	 * @param $reference
+	 * @param null $searchParams
+	 * @return string
+	 */
+	private static function buildSearchUrlByReference(
+		PagSeguroConnectionData $connectionData,
+		$reference,
+		$searchParams = null
+	){
+		$url = $connectionData->getServiceUrl('v2');
+		if ($searchParams == null) {
+			return "{$url}?" . $connectionData->getCredentialsUrlQuery() . "&reference=" . $reference;
+		} else {
+
+			$initialDate = $searchParams['initialDate'] != null ? $searchParams['initialDate'] : "";
+			$finalDate = $searchParams['finalDate'] != null ? ("&finalDate=" . $searchParams['finalDate']) : "";
+			if ($searchParams['pageNumber'] != null) {
+				$page = "&page=" . $searchParams['pageNumber'];
+			}
+			if ($searchParams['maxPageResults'] != null) {
+				$maxPageResults = "&maxPageResults=" . $searchParams['maxPageResults'];
+			}
+
+			return "{$url}?" . $connectionData->getCredentialsUrlQuery() . "&reference=" . $reference
+				   . "&initialDate={$initialDate}&finalDate={$finalDate}{$page}{$maxPageResults}";
+		}
+	}
+
+	/***
      * Finds a transaction with a matching transaction code
      *
      * @param PagSeguroCredentials $credentials
@@ -126,35 +126,35 @@ 
      * @throws PagSeguroServiceException
      * @throws Exception
      */
-    public static function searchByCode(PagSeguroCredentials $credentials, $transactionCode)
-    {
+	public static function searchByCode(PagSeguroCredentials $credentials, $transactionCode)
+	{
 
-        LogPagSeguro::info("PagSeguroTransactionSearchService.SearchByCode($transactionCode) - begin");
+		LogPagSeguro::info("PagSeguroTransactionSearchService.SearchByCode($transactionCode) - begin");
 
-        $connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
+		$connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
 
-        try {
+		try {
 
-            $connection = new PagSeguroHttpConnection();
-            $connection->get(
-                self::buildSearchUrlByCode($connectionData, $transactionCode),
-                $connectionData->getServiceTimeout(),
-                $connectionData->getCharset()
-            );
+			$connection = new PagSeguroHttpConnection();
+			$connection->get(
+				self::buildSearchUrlByCode($connectionData, $transactionCode),
+				$connectionData->getServiceTimeout(),
+				$connectionData->getCharset()
+			);
 
-            return self::searchByCodeResult($connection, $transactionCode);
+			return self::searchByCodeResult($connection, $transactionCode);
 
-        } catch (PagSeguroServiceException $err) {
-            throw $err;
-        }
-        catch (Exception $err) {
-            LogPagSeguro::error("Exception: " . $err->getMessage());
-            throw $err;
-        }
+		} catch (PagSeguroServiceException $err) {
+			throw $err;
+		}
+		catch (Exception $err) {
+			LogPagSeguro::error("Exception: " . $err->getMessage());
+			throw $err;
+		}
 
-    }
+	}
 
-    /***
+	/***
  * Search transactions associated with this set of credentials within a date range
  *
  * @param PagSeguroCredentials $credentials
@@ -167,45 +167,45 @@ 
  * @throws PagSeguroServiceException
  * @throws Exception
  */
-    public static function searchByDate(
-        PagSeguroCredentials $credentials,
-        $pageNumber,
-        $maxPageResults,
-        $initialDate,
-        $finalDate = null
-    ) {
+	public static function searchByDate(
+		PagSeguroCredentials $credentials,
+		$pageNumber,
+		$maxPageResults,
+		$initialDate,
+		$finalDate = null
+	) {
 
-        LogPagSeguro::info(
-            "PagSeguroTransactionSearchService.SearchByDate(initialDate=" . PagSeguroHelper::formatDate($initialDate) .
-            ", finalDate=" . PagSeguroHelper::formatDate($finalDate) . ") - begin"
-        );
+		LogPagSeguro::info(
+			"PagSeguroTransactionSearchService.SearchByDate(initialDate=" . PagSeguroHelper::formatDate($initialDate) .
+			", finalDate=" . PagSeguroHelper::formatDate($finalDate) . ") - begin"
+		);
 
-        $connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
+		$connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
 
-        $searchParams = self::buildParams($pageNumber, $maxPageResults, $initialDate, $finalDate);
+		$searchParams = self::buildParams($pageNumber, $maxPageResults, $initialDate, $finalDate);
 
-        try {
+		try {
 
-            $connection = new PagSeguroHttpConnection();
-            $connection->get(
-                self::buildSearchUrlByDate($connectionData, $searchParams),
-                $connectionData->getServiceTimeout(),
-                $connectionData->getCharset()
-            );
+			$connection = new PagSeguroHttpConnection();
+			$connection->get(
+				self::buildSearchUrlByDate($connectionData, $searchParams),
+				$connectionData->getServiceTimeout(),
+				$connectionData->getCharset()
+			);
 
-            self::$logService = "SearchByDate";
-            return self::searchResult($connection, $initialDate, $finalDate);
+			self::$logService = "SearchByDate";
+			return self::searchResult($connection, $initialDate, $finalDate);
 
-        } catch (PagSeguroServiceException $err) {
-            throw $err;
-        } catch (Exception $err) {
-            LogPagSeguro::error("Exception: " . $err->getMessage());
-            throw $err;
-        }
+		} catch (PagSeguroServiceException $err) {
+			throw $err;
+		} catch (Exception $err) {
+			LogPagSeguro::error("Exception: " . $err->getMessage());
+			throw $err;
+		}
 
-    }
+	}
 
-    /***
+	/***
      * Search transactions abandoned associated with this set of credentials within a date range
      *
      * @param PagSeguroCredentials $credentials
@@ -218,211 +218,211 @@ 
      * @throws PagSeguroServiceException
      * @throws Exception
      */
-    public static function searchAbandoned(
-        PagSeguroCredentials $credentials,
-        $pageNumber,
-        $maxPageResults,
-        $initialDate,
-        $finalDate = null
-    ) {
-
-        LogPagSeguro::info(
-            "PagSeguroTransactionSearchService.searchAbandoned(initialDate=" .
-            PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
-            PagSeguroHelper::formatDate($finalDate) . ") - begin"
-        );
-
-        $connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
-
-        $searchParams = self::buildParams($pageNumber, $maxPageResults, $initialDate, $finalDate);
-
-        try {
-
-            $connection = new PagSeguroHttpConnection();
-            $connection->get(
-                self::buildSearchUrlAbandoned($connectionData, $searchParams),
-                $connectionData->getServiceTimeout(),
-                $connectionData->getCharset()
-            );
-
-            self::$logService = "searchAbandoned";
-            return self::searchResult($connection, $initialDate, $finalDate);
-
-        } catch (PagSeguroServiceException $err) {
-            throw $err;
-        }
-        catch (Exception $err) {
-            LogPagSeguro::error("Exception: " . $err->getMessage());
-            throw $err;
-        }
-
-    }
-
-    /**
-     * @param PagSeguroCredentials $credentials
-     * @param $reference
-     * @param null $initialDate
-     * @param null $finalDate
-     * @param null $pageNumber
-     * @param null $maxPageResults
-     * @throws Exception
-     * @throws PagSeguroServiceException
-     */
-    public static function searchByReference(
-        PagSeguroCredentials $credentials,
-        $reference,
-        $initialDate = null,
-        $finalDate = null,
-        $pageNumber = null,
-        $maxPageResults = null
-    ) {
-
-        LogPagSeguro::info(
-            "PagSeguroTransactionSearchService.SearchByReference(reference=".$reference.") - begin"
-        );
-
-        $connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
-
-        if ($initialDate)
-            $searchParams = self::buildParams($pageNumber, $maxPageResults, $initialDate, $finalDate);
-        else
-            $searchParams = null;
-
-        try {
-
-            $connection = new PagSeguroHttpConnection();
-            $connection->get(
-                self::buildSearchUrlByReference(
-                    $connectionData,
-                    $reference,
-                    $searchParams
-                ),
-                $connectionData->getServiceTimeout(),
-                $connectionData->getCharset()
-            );
-
-            self::$logService = "SearchByReference";
-            return self::searchResult($connection);
-
-        } catch (PagSeguroServiceException $err) {
-            throw $err;
-        } catch (Exception $err) {
-            LogPagSeguro::error("Exception: " . $err->getMessage());
-            throw $err;
-        }
-
-    }
-
-    /**
-     * @param $pageNumber
-     * @param $maxPageResults
-     * @param $initialDate
-     * @param null $finalDate
-     * @return array
-     */
-    private function buildParams($pageNumber, $maxPageResults, $initialDate, $finalDate = null)
-    {
-        $searchParams = array(
-            'initialDate' => PagSeguroHelper::formatDate($initialDate),
-            'pageNumber' => $pageNumber,
-            'maxPageResults' => $maxPageResults
-        );
-
-        $searchParams['finalDate'] = $finalDate ? PagSeguroHelper::formatDate($finalDate) : null;
-
-        return $searchParams;
-    }
-
-    /**
-     * @param $connection
-     * @param $code
-     * @return bool|PagSeguroTransaction
-     * @throws PagSeguroServiceException
-     */
-    private function searchByCodeResult($connection, $code)
-    {
-        $httpStatus = new PagSeguroHttpStatus($connection->getStatus());
-
-        switch ($httpStatus->getType()) {
-
-            case 'OK':
-                $transaction = PagSeguroTransactionParser::readTransaction($connection->getResponse());
-                LogPagSeguro::info(
-                    "PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - end " .
-                    $transaction->toString()
-                );
-                break;
-
-            case 'BAD_REQUEST':
-                $errors = PagSeguroTransactionParser::readErrors($connection->getResponse());
-                $err = new PagSeguroServiceException($httpStatus, $errors);
-                LogPagSeguro::error(
-                    "PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - error " .
-                    $err->getOneLineMessage()
-                );
-                throw $err;
-                break;
-
-            default:
-                $err = new PagSeguroServiceException($httpStatus);
-                LogPagSeguro::error(
-                    "PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - error " .
-                    $err->getOneLineMessage()
-                );
-                throw $err;
-                break;
-        }
-        return isset($transaction) ? $transaction : false;
-    }
-
-    /**
-     * @param $connection
-     * @param null $initialDate
-     * @param null $finalDate
-     * @return bool|PagSeguroTransactionSearchResult
-     * @throws PagSeguroServiceException
-     */
-    private function searchResult($connection, $initialDate = null, $finalDate = null)
-    {
-
-        $httpStatus = new PagSeguroHttpStatus($connection->getStatus());
-
-        switch ($httpStatus->getType()) {
-
-            case 'OK':
-
-                $searchResult = PagSeguroTransactionParser::readSearchResult($connection->getResponse());
-
-                LogPagSeguro::info(
-                    sprintf("PagSeguroTransactionSearchService.%s(initialDate=" .
-                    PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
-                    PagSeguroHelper::formatDate($finalDate) . ") - end ", self::$logService) . $searchResult->toString()
-                );
-                break;
-
-            case 'BAD_REQUEST':
-                $errors = PagSeguroTransactionParser::readErrors($connection->getResponse());
-                $err = new PagSeguroServiceException($httpStatus, $errors);
-                LogPagSeguro::error(
-                    sprintf("PagSeguroTransactionSearchService.%s(initialDate=" .
-                    PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
-                    PagSeguroHelper::formatDate($finalDate) . ") - end ", self::$logService) . $err->getOneLineMessage()
-                );
-                throw $err;
-                break;
-
-            default:
-                $err = new PagSeguroServiceException($httpStatus);
-                LogPagSeguro::error(
-                    sprintf("PagSeguroTransactionSearchService.%s(initialDate=" .
-                    PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
-                    PagSeguroHelper::formatDate($finalDate) . ") - end ",  self::$logService) . $err->getOneLineMessage()
-                );
-                throw $err;
-                break;
-
-        }
-
-        return isset($searchResult) ? $searchResult : false;
-    }
+	public static function searchAbandoned(
+		PagSeguroCredentials $credentials,
+		$pageNumber,
+		$maxPageResults,
+		$initialDate,
+		$finalDate = null
+	) {
+
+		LogPagSeguro::info(
+			"PagSeguroTransactionSearchService.searchAbandoned(initialDate=" .
+			PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
+			PagSeguroHelper::formatDate($finalDate) . ") - begin"
+		);
+
+		$connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
+
+		$searchParams = self::buildParams($pageNumber, $maxPageResults, $initialDate, $finalDate);
+
+		try {
+
+			$connection = new PagSeguroHttpConnection();
+			$connection->get(
+				self::buildSearchUrlAbandoned($connectionData, $searchParams),
+				$connectionData->getServiceTimeout(),
+				$connectionData->getCharset()
+			);
+
+			self::$logService = "searchAbandoned";
+			return self::searchResult($connection, $initialDate, $finalDate);
+
+		} catch (PagSeguroServiceException $err) {
+			throw $err;
+		}
+		catch (Exception $err) {
+			LogPagSeguro::error("Exception: " . $err->getMessage());
+			throw $err;
+		}
+
+	}
+
+	/**
+	 * @param PagSeguroCredentials $credentials
+	 * @param $reference
+	 * @param null $initialDate
+	 * @param null $finalDate
+	 * @param null $pageNumber
+	 * @param null $maxPageResults
+	 * @throws Exception
+	 * @throws PagSeguroServiceException
+	 */
+	public static function searchByReference(
+		PagSeguroCredentials $credentials,
+		$reference,
+		$initialDate = null,
+		$finalDate = null,
+		$pageNumber = null,
+		$maxPageResults = null
+	) {
+
+		LogPagSeguro::info(
+			"PagSeguroTransactionSearchService.SearchByReference(reference=".$reference.") - begin"
+		);
+
+		$connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
+
+		if ($initialDate)
+			$searchParams = self::buildParams($pageNumber, $maxPageResults, $initialDate, $finalDate);
+		else
+			$searchParams = null;
+
+		try {
+
+			$connection = new PagSeguroHttpConnection();
+			$connection->get(
+				self::buildSearchUrlByReference(
+					$connectionData,
+					$reference,
+					$searchParams
+				),
+				$connectionData->getServiceTimeout(),
+				$connectionData->getCharset()
+			);
+
+			self::$logService = "SearchByReference";
+			return self::searchResult($connection);
+
+		} catch (PagSeguroServiceException $err) {
+			throw $err;
+		} catch (Exception $err) {
+			LogPagSeguro::error("Exception: " . $err->getMessage());
+			throw $err;
+		}
+
+	}
+
+	/**
+	 * @param $pageNumber
+	 * @param $maxPageResults
+	 * @param $initialDate
+	 * @param null $finalDate
+	 * @return array
+	 */
+	private function buildParams($pageNumber, $maxPageResults, $initialDate, $finalDate = null)
+	{
+		$searchParams = array(
+			'initialDate' => PagSeguroHelper::formatDate($initialDate),
+			'pageNumber' => $pageNumber,
+			'maxPageResults' => $maxPageResults
+		);
+
+		$searchParams['finalDate'] = $finalDate ? PagSeguroHelper::formatDate($finalDate) : null;
+
+		return $searchParams;
+	}
+
+	/**
+	 * @param $connection
+	 * @param $code
+	 * @return bool|PagSeguroTransaction
+	 * @throws PagSeguroServiceException
+	 */
+	private function searchByCodeResult($connection, $code)
+	{
+		$httpStatus = new PagSeguroHttpStatus($connection->getStatus());
+
+		switch ($httpStatus->getType()) {
+
+			case 'OK':
+				$transaction = PagSeguroTransactionParser::readTransaction($connection->getResponse());
+				LogPagSeguro::info(
+					"PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - end " .
+					$transaction->toString()
+				);
+				break;
+
+			case 'BAD_REQUEST':
+				$errors = PagSeguroTransactionParser::readErrors($connection->getResponse());
+				$err = new PagSeguroServiceException($httpStatus, $errors);
+				LogPagSeguro::error(
+					"PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - error " .
+					$err->getOneLineMessage()
+				);
+				throw $err;
+				break;
+
+			default:
+				$err = new PagSeguroServiceException($httpStatus);
+				LogPagSeguro::error(
+					"PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - error " .
+					$err->getOneLineMessage()
+				);
+				throw $err;
+				break;
+		}
+		return isset($transaction) ? $transaction : false;
+	}
+
+	/**
+	 * @param $connection
+	 * @param null $initialDate
+	 * @param null $finalDate
+	 * @return bool|PagSeguroTransactionSearchResult
+	 * @throws PagSeguroServiceException
+	 */
+	private function searchResult($connection, $initialDate = null, $finalDate = null)
+	{
+
+		$httpStatus = new PagSeguroHttpStatus($connection->getStatus());
+
+		switch ($httpStatus->getType()) {
+
+			case 'OK':
+
+				$searchResult = PagSeguroTransactionParser::readSearchResult($connection->getResponse());
+
+				LogPagSeguro::info(
+					sprintf("PagSeguroTransactionSearchService.%s(initialDate=" .
+					PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
+					PagSeguroHelper::formatDate($finalDate) . ") - end ", self::$logService) . $searchResult->toString()
+				);
+				break;
+
+			case 'BAD_REQUEST':
+				$errors = PagSeguroTransactionParser::readErrors($connection->getResponse());
+				$err = new PagSeguroServiceException($httpStatus, $errors);
+				LogPagSeguro::error(
+					sprintf("PagSeguroTransactionSearchService.%s(initialDate=" .
+					PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
+					PagSeguroHelper::formatDate($finalDate) . ") - end ", self::$logService) . $err->getOneLineMessage()
+				);
+				throw $err;
+				break;
+
+			default:
+				$err = new PagSeguroServiceException($httpStatus);
+				LogPagSeguro::error(
+					sprintf("PagSeguroTransactionSearchService.%s(initialDate=" .
+					PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
+					PagSeguroHelper::formatDate($finalDate) . ") - end ",  self::$logService) . $err->getOneLineMessage()
+				);
+				throw $err;
+				break;
+
+		}
+
+		return isset($searchResult) ? $searchResult : false;
+	}
 }

Spacing +36 added lines, -36 removed lines

@@ -42,7 +42,7 @@ 
     private static function buildSearchUrlByCode(PagSeguroConnectionData $connectionData, $transactionCode)
     {
         $url = $connectionData->getServiceUrl('v3');
-        return "{$url}/{$transactionCode}/?" . $connectionData->getCredentialsUrlQuery();
+        return "{$url}/{$transactionCode}/?".$connectionData->getCredentialsUrlQuery();
     }
 
     /**
@@ -54,14 +54,14 @@ 
     {
         $url = $connectionData->getServiceUrl('v2');
         $initialDate = $searchParams['initialDate'] != null ? $searchParams['initialDate'] : "";
-        $finalDate = $searchParams['finalDate'] != null ? ("&finalDate=" . $searchParams['finalDate']) : "";
+        $finalDate = $searchParams['finalDate'] != null ? ("&finalDate=".$searchParams['finalDate']) : "";
         if ($searchParams['pageNumber'] != null) {
-            $page = "&page=" . $searchParams['pageNumber'];
+            $page = "&page=".$searchParams['pageNumber'];
         }
         if ($searchParams['maxPageResults'] != null) {
-            $maxPageResults = "&maxPageResults=" . $searchParams['maxPageResults'];
+            $maxPageResults = "&maxPageResults=".$searchParams['maxPageResults'];
         }
-        return "{$url}/?" . $connectionData->getCredentialsUrlQuery() .
+        return "{$url}/?".$connectionData->getCredentialsUrlQuery().
             "&initialDate={$initialDate}{$finalDate}{$page}{$maxPageResults}";
     }
 
@@ -75,14 +75,14 @@ 
         $url = $connectionData->getServiceUrl('v2');
 
         $initialDate = $searchParams['initialDate'] != null ? $searchParams['initialDate'] : "";
-        $finalDate = $searchParams['finalDate'] != null ? ("&finalDate=" . $searchParams['finalDate']) : "";
+        $finalDate = $searchParams['finalDate'] != null ? ("&finalDate=".$searchParams['finalDate']) : "";
         if ($searchParams['pageNumber'] != null) {
-            $page = "&page=" . $searchParams['pageNumber'];
+            $page = "&page=".$searchParams['pageNumber'];
         }
         if ($searchParams['maxPageResults'] != null) {
-            $maxPageResults = "&maxPageResults=" . $searchParams['maxPageResults'];
+            $maxPageResults = "&maxPageResults=".$searchParams['maxPageResults'];
         }
-        return "{$url}/abandoned/?" . $connectionData->getCredentialsUrlQuery() .
+        return "{$url}/abandoned/?".$connectionData->getCredentialsUrlQuery().
             "&initialDate={$initialDate}&finalDate={$finalDate}{$page}{$maxPageResults}";
     }
 
@@ -96,22 +96,22 @@ 
         PagSeguroConnectionData $connectionData,
         $reference,
         $searchParams = null
-    ){
+    ) {
         $url = $connectionData->getServiceUrl('v2');
         if ($searchParams == null) {
-            return "{$url}?" . $connectionData->getCredentialsUrlQuery() . "&reference=" . $reference;
+            return "{$url}?".$connectionData->getCredentialsUrlQuery()."&reference=".$reference;
         } else {
 
             $initialDate = $searchParams['initialDate'] != null ? $searchParams['initialDate'] : "";
-            $finalDate = $searchParams['finalDate'] != null ? ("&finalDate=" . $searchParams['finalDate']) : "";
+            $finalDate = $searchParams['finalDate'] != null ? ("&finalDate=".$searchParams['finalDate']) : "";
             if ($searchParams['pageNumber'] != null) {
-                $page = "&page=" . $searchParams['pageNumber'];
+                $page = "&page=".$searchParams['pageNumber'];
             }
             if ($searchParams['maxPageResults'] != null) {
-                $maxPageResults = "&maxPageResults=" . $searchParams['maxPageResults'];
+                $maxPageResults = "&maxPageResults=".$searchParams['maxPageResults'];
             }
 
-            return "{$url}?" . $connectionData->getCredentialsUrlQuery() . "&reference=" . $reference
+            return "{$url}?".$connectionData->getCredentialsUrlQuery()."&reference=".$reference
                    . "&initialDate={$initialDate}&finalDate={$finalDate}{$page}{$maxPageResults}";
         }
     }
@@ -148,7 +148,7 @@ 
             throw $err;
         }
         catch (Exception $err) {
-            LogPagSeguro::error("Exception: " . $err->getMessage());
+            LogPagSeguro::error("Exception: ".$err->getMessage());
             throw $err;
         }
 
@@ -176,8 +176,8 @@ 
     ) {
 
         LogPagSeguro::info(
-            "PagSeguroTransactionSearchService.SearchByDate(initialDate=" . PagSeguroHelper::formatDate($initialDate) .
-            ", finalDate=" . PagSeguroHelper::formatDate($finalDate) . ") - begin"
+            "PagSeguroTransactionSearchService.SearchByDate(initialDate=".PagSeguroHelper::formatDate($initialDate).
+            ", finalDate=".PagSeguroHelper::formatDate($finalDate).") - begin"
         );
 
         $connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
@@ -199,7 +199,7 @@ 
         } catch (PagSeguroServiceException $err) {
             throw $err;
         } catch (Exception $err) {
-            LogPagSeguro::error("Exception: " . $err->getMessage());
+            LogPagSeguro::error("Exception: ".$err->getMessage());
             throw $err;
         }
 
@@ -227,9 +227,9 @@ 
     ) {
 
         LogPagSeguro::info(
-            "PagSeguroTransactionSearchService.searchAbandoned(initialDate=" .
-            PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
-            PagSeguroHelper::formatDate($finalDate) . ") - begin"
+            "PagSeguroTransactionSearchService.searchAbandoned(initialDate=".
+            PagSeguroHelper::formatDate($initialDate).", finalDate=".
+            PagSeguroHelper::formatDate($finalDate).") - begin"
         );
 
         $connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
@@ -252,7 +252,7 @@ 
             throw $err;
         }
         catch (Exception $err) {
-            LogPagSeguro::error("Exception: " . $err->getMessage());
+            LogPagSeguro::error("Exception: ".$err->getMessage());
             throw $err;
         }
 
@@ -307,7 +307,7 @@ 
         } catch (PagSeguroServiceException $err) {
             throw $err;
         } catch (Exception $err) {
-            LogPagSeguro::error("Exception: " . $err->getMessage());
+            LogPagSeguro::error("Exception: ".$err->getMessage());
             throw $err;
         }
 
@@ -348,7 +348,7 @@ 
             case 'OK':
                 $transaction = PagSeguroTransactionParser::readTransaction($connection->getResponse());
                 LogPagSeguro::info(
-                    "PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - end " .
+                    "PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - end ".
                     $transaction->toString()
                 );
                 break;
@@ -357,7 +357,7 @@ 
                 $errors = PagSeguroTransactionParser::readErrors($connection->getResponse());
                 $err = new PagSeguroServiceException($httpStatus, $errors);
                 LogPagSeguro::error(
-                    "PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - error " .
+                    "PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - error ".
                     $err->getOneLineMessage()
                 );
                 throw $err;
@@ -366,7 +366,7 @@ 
             default:
                 $err = new PagSeguroServiceException($httpStatus);
                 LogPagSeguro::error(
-                    "PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - error " .
+                    "PagSeguroTransactionSearchService.SearchByCode(transactionCode=$code) - error ".
                     $err->getOneLineMessage()
                 );
                 throw $err;
@@ -394,9 +394,9 @@ 
                 $searchResult = PagSeguroTransactionParser::readSearchResult($connection->getResponse());
 
                 LogPagSeguro::info(
-                    sprintf("PagSeguroTransactionSearchService.%s(initialDate=" .
-                    PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
-                    PagSeguroHelper::formatDate($finalDate) . ") - end ", self::$logService) . $searchResult->toString()
+                    sprintf("PagSeguroTransactionSearchService.%s(initialDate=".
+                    PagSeguroHelper::formatDate($initialDate).", finalDate=".
+                    PagSeguroHelper::formatDate($finalDate).") - end ", self::$logService).$searchResult->toString()
                 );
                 break;
 
@@ -404,9 +404,9 @@ 
                 $errors = PagSeguroTransactionParser::readErrors($connection->getResponse());
                 $err = new PagSeguroServiceException($httpStatus, $errors);
                 LogPagSeguro::error(
-                    sprintf("PagSeguroTransactionSearchService.%s(initialDate=" .
-                    PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
-                    PagSeguroHelper::formatDate($finalDate) . ") - end ", self::$logService) . $err->getOneLineMessage()
+                    sprintf("PagSeguroTransactionSearchService.%s(initialDate=".
+                    PagSeguroHelper::formatDate($initialDate).", finalDate=".
+                    PagSeguroHelper::formatDate($finalDate).") - end ", self::$logService).$err->getOneLineMessage()
                 );
                 throw $err;
                 break;
@@ -414,9 +414,9 @@ 
             default:
                 $err = new PagSeguroServiceException($httpStatus);
                 LogPagSeguro::error(
-                    sprintf("PagSeguroTransactionSearchService.%s(initialDate=" .
-                    PagSeguroHelper::formatDate($initialDate) . ", finalDate=" .
-                    PagSeguroHelper::formatDate($finalDate) . ") - end ",  self::$logService) . $err->getOneLineMessage()
+                    sprintf("PagSeguroTransactionSearchService.%s(initialDate=".
+                    PagSeguroHelper::formatDate($initialDate).", finalDate=".
+                    PagSeguroHelper::formatDate($finalDate).") - end ", self::$logService).$err->getOneLineMessage()
                 );
                 throw $err;
                 break;

Braces +7 added lines, -8 removed lines

@@ -146,8 +146,7 @@ 
 
         } catch (PagSeguroServiceException $err) {
             throw $err;
-        }
-        catch (Exception $err) {
+        } catch (Exception $err) {
             LogPagSeguro::error("Exception: " . $err->getMessage());
             throw $err;
         }
@@ -250,8 +249,7 @@ 
 
         } catch (PagSeguroServiceException $err) {
             throw $err;
-        }
-        catch (Exception $err) {
+        } catch (Exception $err) {
             LogPagSeguro::error("Exception: " . $err->getMessage());
             throw $err;
         }
@@ -283,10 +281,11 @@ 
 
         $connectionData = new PagSeguroConnectionData($credentials, self::SERVICE_NAME);
 
-        if ($initialDate)
-            $searchParams = self::buildParams($pageNumber, $maxPageResults, $initialDate, $finalDate);
-        else
-            $searchParams = null;
+        if ($initialDate) {
+                    $searchParams = self::buildParams($pageNumber, $maxPageResults, $initialDate, $finalDate);
+        } else {
+                    $searchParams = null;
+        }
 
         try {
 

app/Vendor/PHPExcel/PHPExcel.php

Doc Comments +3 added lines, -3 removed lines

@@ -304,7 +304,7 @@ 
 	 * Get index for sheet
 	 *
 	 * @param PHPExcel_Worksheet $pSheet
-	 * @return Sheet index
+	 * @return integer|null index
 	 * @throws Exception
 	 */
 	public function getIndex(PHPExcel_Worksheet $pSheet)
@@ -321,7 +321,7 @@ 
 	 *
 	 * @param string $sheetName Sheet name to modify index for
 	 * @param int $newIndex New index for the sheet
-	 * @return New sheet index
+	 * @return integer sheet index
 	 * @throws Exception
 	 */
     public function setIndexByName($sheetName, $newIndex)
@@ -457,7 +457,7 @@ 
 	 * Add named range
 	 *
 	 * @param PHPExcel_NamedRange $namedRange
-	 * @return PHPExcel
+	 * @return boolean
 	 */
 	public function addNamedRange(PHPExcel_NamedRange $namedRange) {
 		if ($namedRange->getScope() == null) {

Spacing +16 added lines, -16 removed lines

@@ -27,9 +27,9 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+if ( ! defined('PHPEXCEL_ROOT')) {
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 
@@ -133,7 +133,7 @@ 
 	 *
 	 */
 	public function disconnectWorksheets() {
-		foreach($this->_workSheetCollection as $k => &$worksheet) {
+		foreach ($this->_workSheetCollection as $k => &$worksheet) {
 			$worksheet->disconnectCells();
 			$this->_workSheetCollection[$k] = null;
 		}
@@ -215,7 +215,7 @@ 
      */
     public function addSheet(PHPExcel_Worksheet $pSheet = null, $iSheetIndex = null)
     {
-        if($iSheetIndex === NULL) {
+        if ($iSheetIndex === NULL) {
             $this->_workSheetCollection[] = $pSheet;
         } else {
             // Insert the sheet at the requested index
@@ -392,7 +392,7 @@ 
 			return $worksheet;
 		}
 
-		throw new Exception('Workbook does not contain sheet:' . $pValue);
+		throw new Exception('Workbook does not contain sheet:'.$pValue);
 	}
 
 	/**
@@ -438,7 +438,7 @@ 
 		// update the cellXfs
 		foreach ($pSheet->getCellCollection(false) as $cellID) {
 			$cell = $pSheet->getCell($cellID);
-			$cell->setXfIndex( $cell->getXfIndex() + $countCellXfs );
+			$cell->setXfIndex($cell->getXfIndex() + $countCellXfs);
 		}
 
 		return $this->addSheet($pSheet, $iSheetIndex);
@@ -487,8 +487,8 @@ 
 			}
 
 			// then look for local defined name (has priority over global defined name if both names exist)
-			if (($pSheet !== NULL) && isset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-				$returnValue = $this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange];
+			if (($pSheet !== NULL) && isset($this->_namedRanges[$pSheet->getTitle().'!'.$namedRange])) {
+				$returnValue = $this->_namedRanges[$pSheet->getTitle().'!'.$namedRange];
 			}
 		}
 
@@ -508,8 +508,8 @@ 
 				unset($this->_namedRanges[$namedRange]);
 			}
 		} else {
-			if (isset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-				unset($this->_namedRanges[$pSheet->getTitle() . '!' . $namedRange]);
+			if (isset($this->_namedRanges[$pSheet->getTitle().'!'.$namedRange])) {
+				unset($this->_namedRanges[$pSheet->getTitle().'!'.$namedRange]);
 			}
 		}
 		return $this;
@@ -545,7 +545,7 @@ 
 	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
 	 */
 	public function __clone() {
-		foreach($this as $key => $val) {
+		foreach ($this as $key => $val) {
 			if (is_object($val) || (is_array($val))) {
 				$this->{$key} = unserialize(serialize($val));
 			}
@@ -633,7 +633,7 @@ 
 				foreach ($worksheet->getCellCollection(false) as $cellID) {
 					$cell = $worksheet->getCell($cellID);
 					$xfIndex = $cell->getXfIndex();
-					if ($xfIndex > $pIndex ) {
+					if ($xfIndex > $pIndex) {
 						// decrease xf index by 1
 						$cell->setXfIndex($xfIndex - 1);
 					} else if ($xfIndex == $pIndex) {
@@ -780,19 +780,19 @@ 
 			// for all cells
 			foreach ($sheet->getCellCollection(false) as $cellID) {
 				$cell = $sheet->getCell($cellID);
-				$cell->setXfIndex( $map[$cell->getXfIndex()] );
+				$cell->setXfIndex($map[$cell->getXfIndex()]);
 			}
 
 			// for all row dimensions
 			foreach ($sheet->getRowDimensions() as $rowDimension) {
 				if ($rowDimension->getXfIndex() !== null) {
-					$rowDimension->setXfIndex( $map[$rowDimension->getXfIndex()] );
+					$rowDimension->setXfIndex($map[$rowDimension->getXfIndex()]);
 				}
 			}
 
 			// for all column dimensions
 			foreach ($sheet->getColumnDimensions() as $columnDimension) {
-				$columnDimension->setXfIndex( $map[$columnDimension->getXfIndex()] );
+				$columnDimension->setXfIndex($map[$columnDimension->getXfIndex()]);
 			}
 		}
 

Indentation +52 added lines, -52 removed lines

@@ -191,48 +191,48 @@ 
 		return $this->_workSheetCollection[$this->_activeSheetIndex];
 	}
 
-    /**
-     * Create sheet and add it to this workbook
-     *
+	/**
+	 * Create sheet and add it to this workbook
+	 *
 	 * @param int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
-     * @return PHPExcel_Worksheet
-     * @throws Exception
-     */
-    public function createSheet($iSheetIndex = null)
-    {
-        $newSheet = new PHPExcel_Worksheet($this);
-        $this->addSheet($newSheet, $iSheetIndex);
-        return $newSheet;
-    }
-
-    /**
-     * Add sheet
-     *
-     * @param PHPExcel_Worksheet $pSheet
+	 * @return PHPExcel_Worksheet
+	 * @throws Exception
+	 */
+	public function createSheet($iSheetIndex = null)
+	{
+		$newSheet = new PHPExcel_Worksheet($this);
+		$this->addSheet($newSheet, $iSheetIndex);
+		return $newSheet;
+	}
+
+	/**
+	 * Add sheet
+	 *
+	 * @param PHPExcel_Worksheet $pSheet
 	 * @param int|null $iSheetIndex Index where sheet should go (0,1,..., or null for last)
-     * @return PHPExcel_Worksheet
-     * @throws Exception
-     */
-    public function addSheet(PHPExcel_Worksheet $pSheet = null, $iSheetIndex = null)
-    {
-        if($iSheetIndex === NULL) {
-            $this->_workSheetCollection[] = $pSheet;
-        } else {
-            // Insert the sheet at the requested index
-            array_splice(
-                $this->_workSheetCollection,
-                $iSheetIndex,
-                0,
-                array($pSheet)
-                );
+	 * @return PHPExcel_Worksheet
+	 * @throws Exception
+	 */
+	public function addSheet(PHPExcel_Worksheet $pSheet = null, $iSheetIndex = null)
+	{
+		if($iSheetIndex === NULL) {
+			$this->_workSheetCollection[] = $pSheet;
+		} else {
+			// Insert the sheet at the requested index
+			array_splice(
+				$this->_workSheetCollection,
+				$iSheetIndex,
+				0,
+				array($pSheet)
+				);
 
 			// Adjust active sheet index if necessary
 			if ($this->_activeSheetIndex >= $iSheetIndex) {
 				++$this->_activeSheetIndex;
 			}
-        }
+		}
 		return $pSheet;
-    }
+	}
 
 	/**
 	 * Remove sheet by index
@@ -316,7 +316,7 @@ 
 		}
 	}
 
-    /**
+	/**
 	 * Set index for sheet by sheet name.
 	 *
 	 * @param string $sheetName Sheet name to modify index for
@@ -324,22 +324,22 @@ 
 	 * @return New sheet index
 	 * @throws Exception
 	 */
-    public function setIndexByName($sheetName, $newIndex)
-    {
-        $oldIndex = $this->getIndex($this->getSheetByName($sheetName));
-        $pSheet = array_splice(
-            $this->_workSheetCollection,
-            $oldIndex,
-            1
-            );
-        array_splice(
-            $this->_workSheetCollection,
-            $newIndex,
-            0,
-            $pSheet
-            );
-        return $newIndex;
-    }
+	public function setIndexByName($sheetName, $newIndex)
+	{
+		$oldIndex = $this->getIndex($this->getSheetByName($sheetName));
+		$pSheet = array_splice(
+			$this->_workSheetCollection,
+			$oldIndex,
+			1
+			);
+		array_splice(
+			$this->_workSheetCollection,
+			$newIndex,
+			0,
+			$pSheet
+			);
+		return $newIndex;
+	}
 
 	/**
 	 * Get sheet count
@@ -724,7 +724,7 @@ 
 	 */
 	public function garbageCollect()
 	{
-    	// how many references are there to each cellXf ?
+		// how many references are there to each cellXf ?
 		$countReferencesCellXf = array();
 		foreach ($this->_cellXfCollection as $index => $cellXf) {
 			$countReferencesCellXf[$index] = 0;

app/Vendor/PHPExcel/PHPExcel/CachedObjectStorage/Memcache.php

Doc Comments +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
      *
      * @param	string			$pCoord		Coordinate address of the cell to update
      * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
+	 * @return	PHPExcel_Cell
      * @throws	Exception
      */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
@@ -107,7 +107,7 @@ 
 	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
 	 *
 	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	void
+	 * @return	boolean
 	 * @return	boolean
 	 */
 	public function isDataSet($pCoord) {

Indentation +26 added lines, -26 removed lines

@@ -57,13 +57,13 @@ 
 	private $_memcache = null;
 
 
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
+	/**
+	 * Store cell data in cache for the current cell object if it's "dirty",
+	 *     and the 'nullify' the current cell object
+	 *
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	private function _storeData() {
 		if ($this->_currentCellIsDirty) {
 			$this->_currentObject->detach();
@@ -81,14 +81,14 @@ 
 	}	//	function _storeData()
 
 
-    /**
-     * Add or Update a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+	/**
+	 * Add or Update a cell in cache identified by coordinate address
+	 *
+	 * @param	string			$pCoord		Coordinate address of the cell to update
+	 * @param	PHPExcel_Cell	$cell		Cell to update
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
 		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
 			$this->_storeData();
@@ -130,12 +130,12 @@ 
 
 
 	/**
-     * Get cell at a specific coordinate
-     *
-     * @param 	string 			$pCoord		Coordinate of the cell
-     * @throws 	Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
-     */
+	 * Get cell at a specific coordinate
+	 *
+	 * @param 	string 			$pCoord		Coordinate of the cell
+	 * @throws 	Exception
+	 * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+	 */
 	public function getCacheData($pCoord) {
 		if ($pCoord === $this->_currentObjectID) {
 			return $this->_currentObject;
@@ -166,12 +166,12 @@ 
 	}	//	function getCacheData()
 
 
-    /**
-     * Delete a cell in cache identified by coordinate address
-     *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
-     * @throws	Exception
-     */
+	/**
+	 * Delete a cell in cache identified by coordinate address
+	 *
+	 * @param	string			$pCoord		Coordinate address of the cell to delete
+	 * @throws	Exception
+	 */
 	public function deleteCacheData($pCoord) {
 		//	Delete the entry from Memcache
 		$this->_memcache->delete($this->_cachePrefix.$pCoord.'.cache');
@@ -264,7 +264,7 @@ 
 	 *
 	 * @param	string	$host		Memcache server
 	 * @param	integer	$port		Memcache port
-     * @throws	Exception
+	 * @throws	Exception
 	 */
 	public function failureCallback($host, $port) {
 		throw new Exception('memcache '.$host.':'.$port.' failed');

Spacing +13 added lines, -13 removed lines

@@ -69,8 +69,8 @@ 
 			$this->_currentObject->detach();
 
 			$obj = serialize($this->_currentObject);
-			if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
-				if (!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
+			if ( ! $this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, NULL, $this->_cacheTime)) {
+				if ( ! $this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, NULL, $this->_cacheTime)) {
 					$this->__destruct();
 					throw new Exception('Failed to store cell '.$this->_currentObjectID.' in MemCache');
 				}
@@ -191,9 +191,9 @@ 
 		parent::copyCellCollection($parent);
 		//	Get a new id for the new file name
 		$baseUnique = $this->_getUniqueID();
-		$newCachePrefix = substr(md5($baseUnique),0,8).'.';
+		$newCachePrefix = substr(md5($baseUnique), 0, 8).'.';
 		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
+		foreach ($cacheList as $cellID) {
 			if ($cellID != $this->_currentObjectID) {
 				$obj = $this->_memcache->get($this->_cachePrefix.$cellID.'.cache');
 				if ($obj === false) {
@@ -201,7 +201,7 @@ 
 					parent::deleteCacheData($cellID);
 					throw new Exception('Cell entry '.$cellID.' no longer exists in MemCache');
 				}
-				if (!$this->_memcache->add($newCachePrefix.$cellID.'.cache',$obj,NULL,$this->_cacheTime)) {
+				if ( ! $this->_memcache->add($newCachePrefix.$cellID.'.cache', $obj, NULL, $this->_cacheTime)) {
 					$this->__destruct();
 					throw new Exception('Failed to store cell '.$cellID.' in MemCache');
 				}
@@ -217,7 +217,7 @@ 
 	 * @return	void
 	 */
 	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
+		if ( ! is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
 			$this->_currentObject = $this->_currentObjectID = null;
 		}
@@ -239,17 +239,17 @@ 
 	 * @param	array of mixed		$arguments	Additional initialisation arguments
 	 */
 	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$memcacheServer	= (isset($arguments['memcacheServer']))	? $arguments['memcacheServer']	: 'localhost';
-		$memcachePort	= (isset($arguments['memcachePort']))	? $arguments['memcachePort']	: 11211;
-		$cacheTime		= (isset($arguments['cacheTime']))		? $arguments['cacheTime']		: 600;
+		$memcacheServer = (isset($arguments['memcacheServer'])) ? $arguments['memcacheServer'] : 'localhost';
+		$memcachePort = (isset($arguments['memcachePort'])) ? $arguments['memcachePort'] : 11211;
+		$cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
 
 		if (is_null($this->_cachePrefix)) {
 			$baseUnique = $this->_getUniqueID();
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
+			$this->_cachePrefix = substr(md5($baseUnique), 0, 8).'.';
 
 			//	Set a new Memcache object and connect to the Memcache server
 			$this->_memcache = new Memcache();
-			if (!$this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) {
+			if ( ! $this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) {
 				throw new Exception('Could not connect to MemCache server at '.$memcacheServer.':'.$memcachePort);
 			}
 			$this->_cacheTime = $cacheTime;
@@ -276,7 +276,7 @@ 
 	 */
 	public function __destruct() {
 		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
+		foreach ($cacheList as $cellID) {
 			$this->_memcache->delete($this->_cachePrefix.$cellID.'.cache');
 		}
 	}	//	function __destruct()
@@ -288,7 +288,7 @@ 
 	 * @return	boolean
 	 */
 	public static function cacheMethodIsAvailable() {
-		if (!function_exists('memcache_add')) {
+		if ( ! function_exists('memcache_add')) {
 			return false;
 		}
 

app/Vendor/PHPExcel/PHPExcel/CachedObjectStorage/Wincache.php

Doc Comments +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 	 *
 	 * @param	string			$pCoord		Coordinate address of the cell to update
 	 * @param	PHPExcel_Cell	$cell		Cell to update
-	 * @return	void
+	 * @return	PHPExcel_Cell
 	 * @throws	Exception
 	 */
 	public function addCacheData($pCoord, PHPExcel_Cell $cell) {

Indentation +6 added lines, -6 removed lines

@@ -50,13 +50,13 @@
 	private $_cacheTime = 600;
 
 
-    /**
-     * Store cell data in cache for the current cell object if it's "dirty",
-     *     and the 'nullify' the current cell object
-     *
+	/**
+	 * Store cell data in cache for the current cell object if it's "dirty",
+	 *     and the 'nullify' the current cell object
+	 *
 	 * @return	void
-     * @throws	Exception
-     */
+	 * @throws	Exception
+	 */
 	private function _storeData() {
 		if ($this->_currentCellIsDirty) {
 			$this->_currentObject->detach();

Spacing +10 added lines, -10 removed lines

@@ -63,12 +63,12 @@ 
 
 			$obj = serialize($this->_currentObject);
 			if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) {
-				if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
+				if ( ! wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
 					$this->__destruct();
 					throw new Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
 				}
 			} else {
-				if (!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
+				if ( ! wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
 					$this->__destruct();
 					throw new Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
 				}
@@ -191,9 +191,9 @@ 
 		parent::copyCellCollection($parent);
 		//	Get a new id for the new file name
 		$baseUnique = $this->_getUniqueID();
-		$newCachePrefix = substr(md5($baseUnique),0,8).'.';
+		$newCachePrefix = substr(md5($baseUnique), 0, 8).'.';
 		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
+		foreach ($cacheList as $cellID) {
 			if ($cellID != $this->_currentObjectID) {
 				$success = false;
 				$obj = wincache_ucache_get($this->_cachePrefix.$cellID.'.cache', $success);
@@ -202,7 +202,7 @@ 
 					parent::deleteCacheData($cellID);
 					throw new Exception('Cell entry '.$cellID.' no longer exists in Wincache');
 				}
-				if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->_cacheTime)) {
+				if ( ! wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->_cacheTime)) {
 					$this->__destruct();
 					throw new Exception('Failed to store cell '.$cellID.' in Wincache');
 				}
@@ -218,7 +218,7 @@ 
 	 * @return	void
 	 */
 	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
+		if ( ! is_null($this->_currentObject)) {
 			$this->_currentObject->detach();
 			$this->_currentObject = $this->_currentObjectID = null;
 		}
@@ -240,11 +240,11 @@ 
 	 * @param	array of mixed		$arguments	Additional initialisation arguments
 	 */
 	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$cacheTime	= (isset($arguments['cacheTime']))	? $arguments['cacheTime']	: 600;
+		$cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
 
 		if (is_null($this->_cachePrefix)) {
 			$baseUnique = $this->_getUniqueID();
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
+			$this->_cachePrefix = substr(md5($baseUnique), 0, 8).'.';
 			$this->_cacheTime = $cacheTime;
 
 			parent::__construct($parent);
@@ -257,7 +257,7 @@ 
 	 */
 	public function __destruct() {
 		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
+		foreach ($cacheList as $cellID) {
 			wincache_ucache_delete($this->_cachePrefix.$cellID.'.cache');
 		}
 	}	//	function __destruct()
@@ -270,7 +270,7 @@ 
 	 * @return	boolean
 	 */
 	public static function cacheMethodIsAvailable() {
-		if (!function_exists('wincache_ucache_add')) {
+		if ( ! function_exists('wincache_ucache_add')) {
 			return false;
 		}
 

app/Vendor/PHPExcel/PHPExcel/CachedObjectStorageFactory.php

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 	/**
 	 * Return the current cache storage class
 	 *
-	 * @return PHPExcel_CachedObjectStorage_ICache|NULL
+	 * @return string|null
 	 **/
 	public static function getCacheStorageClass()
 	{

Spacing +18 added lines, -18 removed lines

@@ -36,16 +36,16 @@ 
  */
 class PHPExcel_CachedObjectStorageFactory
 {
-	const cache_in_memory				= 'Memory';
-	const cache_in_memory_gzip			= 'MemoryGZip';
-	const cache_in_memory_serialized	= 'MemorySerialized';
-	const cache_igbinary				= 'Igbinary';
+	const cache_in_memory = 'Memory';
+	const cache_in_memory_gzip = 'MemoryGZip';
+	const cache_in_memory_serialized = 'MemorySerialized';
+	const cache_igbinary = 'Igbinary';
 	const cache_to_discISAM				= 'DiscISAM';
-	const cache_to_apc					= 'APC';
+	const cache_to_apc = 'APC';
 	const cache_to_memcache				= 'Memcache';
 	const cache_to_phpTemp				= 'PHPTemp';
 	const cache_to_wincache				= 'Wincache';
-	const cache_to_sqlite				= 'SQLite';
+	const cache_to_sqlite = 'SQLite';
 	const cache_to_sqlite3				= 'SQLite3';
 
 
@@ -98,17 +98,17 @@ 
 													),
 		self::cache_igbinary				=> array(
 													),
-		self::cache_to_phpTemp				=> array( 'memoryCacheSize'	=> '1MB'
+		self::cache_to_phpTemp				=> array('memoryCacheSize'	=> '1MB'
 													),
-		self::cache_to_discISAM				=> array( 'dir'				=> NULL
+		self::cache_to_discISAM				=> array('dir'				=> NULL
 													),
-		self::cache_to_apc					=> array( 'cacheTime'		=> 600
+		self::cache_to_apc					=> array('cacheTime'		=> 600
 													),
-		self::cache_to_memcache				=> array( 'memcacheServer'	=> 'localhost',
+		self::cache_to_memcache				=> array('memcacheServer'	=> 'localhost',
 													  'memcachePort'	=> 11211,
 													  'cacheTime'		=> 600
 													),
-		self::cache_to_wincache				=> array( 'cacheTime'		=> 600
+		self::cache_to_wincache				=> array('cacheTime'		=> 600
 													),
 		self::cache_to_sqlite				=> array(
 													),
@@ -172,8 +172,8 @@ 
 	public static function getCacheStorageMethods()
 	{
 		$activeMethods = array();
-		foreach(self::$_storageMethods as $storageMethod) {
-			$cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $storageMethod;
+		foreach (self::$_storageMethods as $storageMethod) {
+			$cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$storageMethod;
 			if (call_user_func(array($cacheStorageClass, 'cacheMethodIsAvailable'))) {
 				$activeMethods[] = $storageMethod;
 			}
@@ -192,25 +192,25 @@ 
 	 **/
 	public static function initialize($method = self::cache_in_memory, $arguments = array())
 	{
-		if (!in_array($method,self::$_storageMethods)) {
+		if ( ! in_array($method, self::$_storageMethods)) {
 			return FALSE;
 		}
 
 		$cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$method;
-		if (!call_user_func(array( $cacheStorageClass,
+		if ( ! call_user_func(array($cacheStorageClass,
 								   'cacheMethodIsAvailable'))) {
 			return FALSE;
 		}
 
 		self::$_storageMethodParameters[$method] = self::$_storageMethodDefaultParameters[$method];
-		foreach($arguments as $k => $v) {
+		foreach ($arguments as $k => $v) {
 			if (isset(self::$_storageMethodParameters[$method][$k])) {
 				self::$_storageMethodParameters[$method][$k] = $v;
 			}
 		}
 
 		if (self::$_cacheStorageMethod === NULL) {
-			self::$_cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $method;
+			self::$_cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$method;
 			self::$_cacheStorageMethod = $method;
 		}
 		return TRUE;
@@ -231,7 +231,7 @@ 
 		}
 
 		if ($cacheMethodIsAvailable) {
-			$instance = new self::$_cacheStorageClass( $parent,
+			$instance = new self::$_cacheStorageClass($parent,
 													   self::$_storageMethodParameters[self::$_cacheStorageMethod]
 													 );
 			if ($instance !== NULL) {

app/Vendor/PHPExcel/PHPExcel/Calculation.php

Doc Comments +32 added lines, -3 removed lines

@@ -1852,7 +1852,7 @@ 
 	/**
 	 * Set calculation cache expiration time
 	 *
-	 * @param float $pValue
+	 * @param integer $pValue
 	 */
 	public function setCalculationCacheExpirationTime($pValue = 15) {
 		self::$_calculationCacheExpirationTime = $pValue;
@@ -1966,6 +1966,10 @@ 
 		return $formula;
 	}
 
+	/**
+	 * @param string $fromSeparator
+	 * @param string $toSeparator
+	 */
 	private static function _translateFormula($from,$to,$formula,$fromSeparator,$toSeparator) {
 		//	Convert any Excel function names to the required language
 		if (self::$_localeLanguage !== 'en_us') {
@@ -2386,7 +2390,7 @@ 
 	 * Read the dimensions of a matrix, and re-index it with straight numeric keys starting from row 0, column 0
 	 *
 	 * @param	mixed		&$matrix		matrix operand
-	 * @return	array		An array comprising the number of rows, and number of columns
+	 * @return	integer[]		An array comprising the number of rows, and number of columns
 	 */
 	public static function _getMatrixDimensions(&$matrix) {
 		$matrixRows = count($matrix);
@@ -2409,6 +2413,10 @@ 
 	 *
 	 * @param	mixed		&$matrix1	First matrix operand
 	 * @param	mixed		&$matrix2	Second matrix operand
+	 * @param integer $matrix1Rows
+	 * @param integer $matrix1Columns
+	 * @param integer $matrix2Rows
+	 * @param integer $matrix2Columns
 	 */
 	private static function _resizeMatricesShrink(&$matrix1,&$matrix2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns) {
 		if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
@@ -2448,6 +2456,10 @@ 
 	 *
 	 * @param	mixed		&$matrix1	First matrix operand
 	 * @param	mixed		&$matrix2	Second matrix operand
+	 * @param integer $matrix1Rows
+	 * @param integer $matrix1Columns
+	 * @param integer $matrix2Rows
+	 * @param integer $matrix2Columns
 	 */
 	private static function _resizeMatricesExtend(&$matrix1,&$matrix2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns) {
 		if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
@@ -2525,7 +2537,7 @@ 
 	 * Format type and details of an operand for display in the log (based on operand type)
 	 *
 	 * @param	mixed		$value	First matrix operand
-	 * @return	mixed
+	 * @return	string|null
 	 */
 	private function _showTypeDetails($value) {
 		if ($this->writeDebugLog) {
@@ -2558,6 +2570,9 @@ 
 	}	//	function _showTypeDetails()
 
 
+	/**
+	 * @param string $formula
+	 */
 	private static function _convertMatrixReferences($formula) {
 		static $matrixReplaceFrom = array('{',';','}');
 		static $matrixReplaceTo = array('MKMATRIX(MKMATRIX(','),MKMATRIX(','))');
@@ -2615,6 +2630,10 @@ 
 
 
 	// Convert infix to postfix notation
+
+	/**
+	 * @param string $formula
+	 */
 	private function _parseFormula($formula, PHPExcel_Cell $pCell = null) {
 		if (($formula = self::_convertMatrixReferences(trim($formula))) === false) {
 			return FALSE;
@@ -3001,6 +3020,10 @@ 
 	}
 
 	// evaluate postfix notation
+
+	/**
+	 * @param string $cellID
+	 */
 	private function _processTokenStack($tokens, $cellID = null, PHPExcel_Cell $pCell = null) {
 		if ($tokens == false) return false;
 
@@ -3500,6 +3523,9 @@ 
 	}	//	function _executeBinaryComparisonOperation()
 
 
+	/**
+	 * @param string $matrixFunction
+	 */
 	private function _executeNumericBinaryOperation($cellID,$operand1,$operand2,$operation,$matrixFunction,&$stack) {
 		//	Validate the two operands
 		if (!$this->_validateBinaryOperand($cellID,$operand1,$stack)) return false;
@@ -3580,6 +3606,9 @@ 
 	}	//	function _executeNumericBinaryOperation()
 
 
+	/**
+	 * @param string $message
+	 */
 	private function _writeDebug($message) {
 		//	Only write the debug log if logging is enabled
 		if ($this->writeDebugLog) {

Spacing +292 added lines, -292 removed lines

@@ -27,27 +27,27 @@ 
 
 
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+if ( ! defined('PHPEXCEL_ROOT')) {
 	/**
 	 * @ignore
 	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	define('PHPEXCEL_ROOT', dirname(__FILE__).'/../');
+	require(PHPEXCEL_ROOT.'PHPExcel/Autoloader.php');
 }
 
 
-if (!defined('CALCULATION_REGEXP_CELLREF')) {
+if ( ! defined('CALCULATION_REGEXP_CELLREF')) {
 	//	Test for support of \P (multibyte options) in PCRE
-	if(defined('PREG_BAD_UTF8_ERROR')) {
+	if (defined('PREG_BAD_UTF8_ERROR')) {
 		//	Cell reference (cell or range of cells, with or without a sheet reference)
-		define('CALCULATION_REGEXP_CELLREF','((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d{1,7})');
+		define('CALCULATION_REGEXP_CELLREF', '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d{1,7})');
 		//	Named Range of cells
-		define('CALCULATION_REGEXP_NAMEDRANGE','((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_A-Z][_A-Z0-9\.]*)');
+		define('CALCULATION_REGEXP_NAMEDRANGE', '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_A-Z][_A-Z0-9\.]*)');
 	} else {
 		//	Cell reference (cell or range of cells, with or without a sheet reference)
-		define('CALCULATION_REGEXP_CELLREF','(((\w*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d+)');
+		define('CALCULATION_REGEXP_CELLREF', '(((\w*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?([a-z]{1,3})\$?(\d+)');
 		//	Named Range of cells
-		define('CALCULATION_REGEXP_NAMEDRANGE','(((\w*)|(\'.*\')|(\".*\"))!)?([_A-Z][_A-Z0-9\.]*)');
+		define('CALCULATION_REGEXP_NAMEDRANGE', '(((\w*)|(\'.*\')|(\".*\"))!)?([_A-Z][_A-Z0-9\.]*)');
 	}
 }
 
@@ -68,15 +68,15 @@ 
 	//	String operand
 	const CALCULATION_REGEXP_STRING		= '"(?:[^"]|"")*"';
 	//	Opening bracket
-	const CALCULATION_REGEXP_OPENBRACE	= '\(';
+	const CALCULATION_REGEXP_OPENBRACE = '\(';
 	//	Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
-	const CALCULATION_REGEXP_FUNCTION	= '@?([A-Z][A-Z0-9\.]*)[\s]*\(';
+	const CALCULATION_REGEXP_FUNCTION = '@?([A-Z][A-Z0-9\.]*)[\s]*\(';
 	//	Cell reference (cell or range of cells, with or without a sheet reference)
-	const CALCULATION_REGEXP_CELLREF	= CALCULATION_REGEXP_CELLREF;
+	const CALCULATION_REGEXP_CELLREF = CALCULATION_REGEXP_CELLREF;
 	//	Named Range of cells
-	const CALCULATION_REGEXP_NAMEDRANGE	= CALCULATION_REGEXP_NAMEDRANGE;
+	const CALCULATION_REGEXP_NAMEDRANGE = CALCULATION_REGEXP_NAMEDRANGE;
 	//	Error
-	const CALCULATION_REGEXP_ERROR		= '\#[A-Z][A-Z0_\/]*[!\?]?';
+	const CALCULATION_REGEXP_ERROR = '\#[A-Z][A-Z0_\/]*[!\?]?';
 
 
 	/** constants */
@@ -84,7 +84,7 @@ 
 	const RETURN_ARRAY_AS_VALUE = 'value';
 	const RETURN_ARRAY_AS_ARRAY = 'array';
 
-	private static $returnArrayAsType	= self::RETURN_ARRAY_AS_VALUE;
+	private static $returnArrayAsType = self::RETURN_ARRAY_AS_VALUE;
 
 
 	/**
@@ -102,7 +102,7 @@ 
 	 * @access	private
 	 * @var array
 	 */
-	private static $_calculationCache = array ();
+	private static $_calculationCache = array();
 
 
 	/**
@@ -130,10 +130,10 @@ 
 	 * @access	private
 	 * @var array
 	 */
-	private static $_operators			= array('+' => true,	'-' => true,	'*' => true,	'/' => true,
-												'^' => true,	'&' => true,	'%' => false,	'~' => false,
-												'>' => true,	'<' => true,	'=' => true,	'>=' => true,
-												'<=' => true,	'<>' => true,	'|' => true,	':' => true
+	private static $_operators = array('+' => true, '-' => true, '*' => true, '/' => true,
+												'^' => true, '&' => true, '%' => false, '~' => false,
+												'>' => true, '<' => true, '=' => true, '>=' => true,
+												'<=' => true, '<>' => true, '|' => true, ':' => true
 											   );
 
 
@@ -143,10 +143,10 @@ 
 	 * @access	private
 	 * @var array
 	 */
-	private static $_binaryOperators	= array('+' => true,	'-' => true,	'*' => true,	'/' => true,
-												'^' => true,	'&' => true,	'>' => true,	'<' => true,
-												'=' => true,	'>=' => true,	'<=' => true,	'<>' => true,
-												'|' => true,	':' => true
+	private static $_binaryOperators = array('+' => true, '-' => true, '*' => true, '/' => true,
+												'^' => true, '&' => true, '>' => true, '<' => true,
+												'=' => true, '>=' => true, '<=' => true, '<>' => true,
+												'|' => true, ':' => true
 											   );
 
 	/**
@@ -215,15 +215,15 @@ 
 	public $cyclicFormulaCount = 0;
 
 
-	private $_savedPrecision	= 12;
+	private $_savedPrecision = 12;
 
 
-	private static $_localeLanguage = 'en_us';					//	US English	(default locale)
-	private static $_validLocaleLanguages = array(	'en'		//	English		(default language)
+	private static $_localeLanguage = 'en_us'; //	US English	(default locale)
+	private static $_validLocaleLanguages = array('en'		//	English		(default language)
 												 );
 	private static $_localeArgumentSeparator = ',';
 	private static $_localeFunctions = array();
-	public static $_localeBoolean = array(	'TRUE'	=> 'TRUE',
+	public static $_localeBoolean = array('TRUE'	=> 'TRUE',
 											'FALSE'	=> 'FALSE',
 											'NULL'	=> 'NULL'
 										  );
@@ -1682,8 +1682,8 @@ 
 
 	private function __construct() {
 		$localeFileDirectory = PHPEXCEL_ROOT.'PHPExcel/locale/';
-		foreach (glob($localeFileDirectory.'/*',GLOB_ONLYDIR) as $filename) {
-			$filename = substr($filename,strlen($localeFileDirectory)+1);
+		foreach (glob($localeFileDirectory.'/*', GLOB_ONLYDIR) as $filename) {
+			$filename = substr($filename, strlen($localeFileDirectory) + 1);
 			if ($filename != 'en') {
 				self::$_validLocaleLanguages[] = $filename;
 			}
@@ -1692,14 +1692,14 @@ 
 		$setPrecision = (PHP_INT_SIZE == 4) ? 12 : 16;
 		$this->_savedPrecision = ini_get('precision');
 		if ($this->_savedPrecision < $setPrecision) {
-			ini_set('precision',$setPrecision);
+			ini_set('precision', $setPrecision);
 		}
 	}	//	function __construct()
 
 
 	public function __destruct() {
 		if ($this->_savedPrecision != ini_get('precision')) {
-			ini_set('precision',$this->_savedPrecision);
+			ini_set('precision', $this->_savedPrecision);
 		}
 	}
 
@@ -1710,7 +1710,7 @@ 
 	 * @return PHPExcel_Calculation
 	 */
 	public static function getInstance() {
-		if (!isset(self::$_instance) || (self::$_instance === NULL)) {
+		if ( ! isset(self::$_instance) || (self::$_instance === NULL)) {
 			self::$_instance = new PHPExcel_Calculation();
 		}
 
@@ -1739,7 +1739,7 @@ 
 	 * @throws	Exception
 	 */
 	public final function __clone() {
-		throw new Exception ('Cloning a Singleton is not allowed!');
+		throw new Exception('Cloning a Singleton is not allowed!');
 	}	//	function __clone()
 
 
@@ -1876,15 +1876,15 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function setLocale($locale='en_us') {
+	public function setLocale($locale = 'en_us') {
 		//	Identify our locale and language
 		$language = $locale = strtolower($locale);
-		if (strpos($locale,'_') !== false) {
-			list($language) = explode('_',$locale);
+		if (strpos($locale, '_') !== false) {
+			list($language) = explode('_', $locale);
 		}
 
 		//	Test whether we have any language data for this language (any locale)
-		if (in_array($language,self::$_validLocaleLanguages)) {
+		if (in_array($language, self::$_validLocaleLanguages)) {
 			//	initialise language/locale settings
 			self::$_localeFunctions = array();
 			self::$_localeArgumentSeparator = ',';
@@ -1892,20 +1892,20 @@ 
 			//	Default is English, if user isn't requesting english, then read the necessary data from the locale files
 			if ($locale != 'en_us') {
 				//	Search for a file with a list of function names for locale
-				$functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_',DIRECTORY_SEPARATOR,$locale).DIRECTORY_SEPARATOR.'functions';
-				if (!file_exists($functionNamesFile)) {
+				$functionNamesFile = PHPEXCEL_ROOT.'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $locale).DIRECTORY_SEPARATOR.'functions';
+				if ( ! file_exists($functionNamesFile)) {
 					//	If there isn't a locale specific function file, look for a language specific function file
-					$functionNamesFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'functions';
-					if (!file_exists($functionNamesFile)) {
+					$functionNamesFile = PHPEXCEL_ROOT.'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'functions';
+					if ( ! file_exists($functionNamesFile)) {
 						return false;
 					}
 				}
 				//	Retrieve the list of locale or language specific function names
-				$localeFunctions = file($functionNamesFile,FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+				$localeFunctions = file($functionNamesFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 				foreach ($localeFunctions as $localeFunction) {
-					list($localeFunction) = explode('##',$localeFunction);	//	Strip out comments
-					if (strpos($localeFunction,'=') !== false) {
-						list($fName,$lfName) = explode('=',$localeFunction);
+					list($localeFunction) = explode('##', $localeFunction); //	Strip out comments
+					if (strpos($localeFunction, '=') !== false) {
+						list($fName, $lfName) = explode('=', $localeFunction);
 						$fName = trim($fName);
 						$lfName = trim($lfName);
 						if ((isset(self::$_PHPExcelFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) {
@@ -1917,16 +1917,16 @@ 
 				if (isset(self::$_localeFunctions['TRUE'])) { self::$_localeBoolean['TRUE'] = self::$_localeFunctions['TRUE']; }
 				if (isset(self::$_localeFunctions['FALSE'])) { self::$_localeBoolean['FALSE'] = self::$_localeFunctions['FALSE']; }
 
-				$configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_',DIRECTORY_SEPARATOR,$locale).DIRECTORY_SEPARATOR.'config';
-				if (!file_exists($configFile)) {
-					$configFile = PHPEXCEL_ROOT . 'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'config';
+				$configFile = PHPEXCEL_ROOT.'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $locale).DIRECTORY_SEPARATOR.'config';
+				if ( ! file_exists($configFile)) {
+					$configFile = PHPEXCEL_ROOT.'PHPExcel'.DIRECTORY_SEPARATOR.'locale'.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'config';
 				}
 				if (file_exists($configFile)) {
-					$localeSettings = file($configFile,FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+					$localeSettings = file($configFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 					foreach ($localeSettings as $localeSetting) {
-						list($localeSetting) = explode('##',$localeSetting);	//	Strip out comments
-						if (strpos($localeSetting,'=') !== false) {
-							list($settingName,$settingValue) = explode('=',$localeSetting);
+						list($localeSetting) = explode('##', $localeSetting); //	Strip out comments
+						if (strpos($localeSetting, '=') !== false) {
+							list($settingName, $settingValue) = explode('=', $localeSetting);
 							$settingName = strtoupper(trim($settingName));
 							switch ($settingName) {
 								case 'ARGUMENTSEPARATOR' :
@@ -1948,48 +1948,48 @@ 
 
 
 
-	public static function _translateSeparator($fromSeparator,$toSeparator,$formula,&$inBraces) {
+	public static function _translateSeparator($fromSeparator, $toSeparator, $formula, &$inBraces) {
 		$strlen = mb_strlen($formula);
 		for ($i = 0; $i < $strlen; ++$i) {
-			$chr = mb_substr($formula,$i,1);
+			$chr = mb_substr($formula, $i, 1);
 			switch ($chr) {
 				case '{' :	$inBraces = true;
 							break;
 				case '}' :	$inBraces = false;
 							break;
 				case $fromSeparator :
-							if (!$inBraces) {
-								$formula = mb_substr($formula,0,$i).$toSeparator.mb_substr($formula,$i+1);
+							if ( ! $inBraces) {
+								$formula = mb_substr($formula, 0, $i).$toSeparator.mb_substr($formula, $i + 1);
 							}
 			}
 		}
 		return $formula;
 	}
 
-	private static function _translateFormula($from,$to,$formula,$fromSeparator,$toSeparator) {
+	private static function _translateFormula($from, $to, $formula, $fromSeparator, $toSeparator) {
 		//	Convert any Excel function names to the required language
 		if (self::$_localeLanguage !== 'en_us') {
 			$inBraces = false;
 			//	If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
-			if (strpos($formula,'"') !== false) {
+			if (strpos($formula, '"') !== false) {
 				//	So instead we skip replacing in any quoted strings by only replacing in every other array element after we've exploded
 				//		the formula
-				$temp = explode('"',$formula);
+				$temp = explode('"', $formula);
 				$i = false;
-				foreach($temp as &$value) {
+				foreach ($temp as &$value) {
 					//	Only count/replace in alternating array entries
-					if ($i = !$i) {
-						$value = preg_replace($from,$to,$value);
-						$value = self::_translateSeparator($fromSeparator,$toSeparator,$value,$inBraces);
+					if ($i = ! $i) {
+						$value = preg_replace($from, $to, $value);
+						$value = self::_translateSeparator($fromSeparator, $toSeparator, $value, $inBraces);
 					}
 				}
 				unset($value);
 				//	Then rebuild the formula string
-				$formula = implode('"',$temp);
+				$formula = implode('"', $temp);
 			} else {
 				//	If there's no quoted strings, then we do a simple count/replace
-				$formula = preg_replace($from,$to,$formula);
-				$formula = self::_translateSeparator($fromSeparator,$toSeparator,$formula,$inBraces);
+				$formula = preg_replace($from, $to, $formula);
+				$formula = self::_translateSeparator($fromSeparator, $toSeparator, $formula, $inBraces);
 			}
 		}
 
@@ -2002,10 +2002,10 @@ 
 	public function _translateFormulaToLocale($formula) {
 		if (self::$functionReplaceFromExcel === NULL) {
 			self::$functionReplaceFromExcel = array();
-			foreach(array_keys(self::$_localeFunctions) as $excelFunctionName) {
+			foreach (array_keys(self::$_localeFunctions) as $excelFunctionName) {
 				self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelFunctionName).'([\s]*\()/Ui';
 			}
-			foreach(array_keys(self::$_localeBoolean) as $excelBoolean) {
+			foreach (array_keys(self::$_localeBoolean) as $excelBoolean) {
 				self::$functionReplaceFromExcel[] = '/(@?[^\w\.])'.preg_quote($excelBoolean).'([^\w\.])/Ui';
 			}
 
@@ -2013,49 +2013,49 @@ 
 
 		if (self::$functionReplaceToLocale === NULL) {
 			self::$functionReplaceToLocale = array();
-			foreach(array_values(self::$_localeFunctions) as $localeFunctionName) {
+			foreach (array_values(self::$_localeFunctions) as $localeFunctionName) {
 				self::$functionReplaceToLocale[] = '$1'.trim($localeFunctionName).'$2';
 			}
-			foreach(array_values(self::$_localeBoolean) as $localeBoolean) {
+			foreach (array_values(self::$_localeBoolean) as $localeBoolean) {
 				self::$functionReplaceToLocale[] = '$1'.trim($localeBoolean).'$2';
 			}
 		}
 
-		return self::_translateFormula(self::$functionReplaceFromExcel,self::$functionReplaceToLocale,$formula,',',self::$_localeArgumentSeparator);
+		return self::_translateFormula(self::$functionReplaceFromExcel, self::$functionReplaceToLocale, $formula, ',', self::$_localeArgumentSeparator);
 	}	//	function _translateFormulaToLocale()
 
 
-	private static $functionReplaceFromLocale	= null;
-	private static $functionReplaceToExcel		= null;
+	private static $functionReplaceFromLocale = null;
+	private static $functionReplaceToExcel = null;
 
 	public function _translateFormulaToEnglish($formula) {
 		if (self::$functionReplaceFromLocale === NULL) {
 			self::$functionReplaceFromLocale = array();
-			foreach(array_values(self::$_localeFunctions) as $localeFunctionName) {
+			foreach (array_values(self::$_localeFunctions) as $localeFunctionName) {
 				self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($localeFunctionName).'([\s]*\()/Ui';
 			}
-			foreach(array_values(self::$_localeBoolean) as $excelBoolean) {
+			foreach (array_values(self::$_localeBoolean) as $excelBoolean) {
 				self::$functionReplaceFromLocale[] = '/(@?[^\w\.])'.preg_quote($excelBoolean).'([^\w\.])/Ui';
 			}
 		}
 
 		if (self::$functionReplaceToExcel === NULL) {
 			self::$functionReplaceToExcel = array();
-			foreach(array_keys(self::$_localeFunctions) as $excelFunctionName) {
+			foreach (array_keys(self::$_localeFunctions) as $excelFunctionName) {
 				self::$functionReplaceToExcel[] = '$1'.trim($excelFunctionName).'$2';
 			}
-			foreach(array_keys(self::$_localeBoolean) as $excelBoolean) {
+			foreach (array_keys(self::$_localeBoolean) as $excelBoolean) {
 				self::$functionReplaceToExcel[] = '$1'.trim($excelBoolean).'$2';
 			}
 		}
 
-		return self::_translateFormula(self::$functionReplaceFromLocale,self::$functionReplaceToExcel,$formula,self::$_localeArgumentSeparator,',');
+		return self::_translateFormula(self::$functionReplaceFromLocale, self::$functionReplaceToExcel, $formula, self::$_localeArgumentSeparator, ',');
 	}	//	function _translateFormulaToEnglish()
 
 
 	public static function _localeFunc($function) {
 		if (self::$_localeLanguage !== 'en_us') {
-			$functionName = trim($function,'(');
+			$functionName = trim($function, '(');
 			if (isset(self::$_localeFunctions[$functionName])) {
 				$brace = ($functionName != $function);
 				$function = self::$_localeFunctions[$functionName];
@@ -2084,7 +2084,7 @@ 
 			//	Return strings wrapped in quotes
 			return '"'.$value.'"';
 		//	Convert numeric errors to NaN error
-		} else if((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
+		} else if ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
 			return PHPExcel_Calculation_Functions::NaN();
 		}
 
@@ -2100,11 +2100,11 @@ 
 	 */
 	public static function _unwrapResult($value) {
 		if (is_string($value)) {
-			if ((isset($value{0})) && ($value{0} == '"') && (substr($value,-1) == '"')) {
-				return substr($value,1,-1);
+			if ((isset($value{0})) && ($value{0} == '"') && (substr($value, -1) == '"')) {
+				return substr($value, 1, -1);
 			}
 		//	Convert numeric errors to NaN error
-		} else if((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
+		} else if ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
 			return PHPExcel_Calculation_Functions::NaN();
 		}
 		return $value;
@@ -2176,11 +2176,11 @@ 
 				//	If keys are numeric, then it's a matrix result rather than a cell range result, so we permit it
 				$r = array_keys($result);
 				$r = array_shift($r);
-				if (!is_numeric($r)) { return PHPExcel_Calculation_Functions::VALUE(); }
+				if ( ! is_numeric($r)) { return PHPExcel_Calculation_Functions::VALUE(); }
 				if (is_array($result[$r])) {
 					$c = array_keys($result[$r]);
 					$c = array_shift($c);
-					if (!is_numeric($c)) {
+					if ( ! is_numeric($c)) {
 						return PHPExcel_Calculation_Functions::VALUE();
 					}
 				}
@@ -2190,7 +2190,7 @@ 
 
 		if ($result === NULL) {
 			return 0;
-		} elseif((is_float($result)) && ((is_nan($result)) || (is_infinite($result)))) {
+		} elseif ((is_float($result)) && ((is_nan($result)) || (is_infinite($result)))) {
 			return PHPExcel_Calculation_Functions::NaN();
 		}
 		return $result;
@@ -2208,9 +2208,9 @@ 
 		//	Basic validation that this is indeed a formula
 		//	We return an empty array if not
 		$formula = trim($formula);
-		if ((!isset($formula{0})) || ($formula{0} != '=')) return array();
-		$formula = ltrim(substr($formula,1));
-		if (!isset($formula{0})) return array();
+		if (( ! isset($formula{0})) || ($formula{0} != '=')) return array();
+		$formula = ltrim(substr($formula, 1));
+		if ( ! isset($formula{0})) return array();
 
 		//	Parse the formula and return the token stack
 		return $this->_parseFormula($formula);
@@ -2224,7 +2224,7 @@ 
 	 * @return	mixed
 	 * @throws	Exception
 	 */
-	public function calculateFormula($formula, $cellID=null, PHPExcel_Cell $pCell = null) {
+	public function calculateFormula($formula, $cellID = null, PHPExcel_Cell $pCell = null) {
 		//	Initialise the logging settings
 		$this->formulaError = null;
 		$this->debugLog = $this->debugLogStack = array();
@@ -2256,7 +2256,7 @@ 
 	 * @return	mixed
 	 * @throws	Exception
 	 */
-	public function _calculateFormulaValue($formula, $cellID=null, PHPExcel_Cell $pCell = null) {
+	public function _calculateFormulaValue($formula, $cellID = null, PHPExcel_Cell $pCell = null) {
 //		echo '<b>'.$cellID.'</b><br />';
 		$cellValue = '';
 
@@ -2264,8 +2264,8 @@ 
 		//	We simply return the "cell value" (formula) if not
 		$formula = trim($formula);
 		if ($formula{0} != '=') return self::_wrapResult($formula);
-		$formula = ltrim(substr($formula,1));
-		if (!isset($formula{0})) return self::_wrapResult($formula);
+		$formula = ltrim(substr($formula, 1));
+		if ( ! isset($formula{0})) return self::_wrapResult($formula);
 
 		$wsTitle = "\x00Wrk";
 		if ($pCell !== NULL) {
@@ -2304,7 +2304,7 @@ 
 			}
 		}
 
-		if ((in_array($wsTitle.'!'.$cellID,$this->debugLogStack)) && ($wsTitle != "\x00Wrk")) {
+		if ((in_array($wsTitle.'!'.$cellID, $this->debugLogStack)) && ($wsTitle != "\x00Wrk")) {
 			if ($this->cyclicFormulaCount <= 0) {
 				return $this->_raiseFormulaError('Cyclic Reference in Formula');
 			} elseif (($this->_cyclicFormulaCount >= $this->cyclicFormulaCount) &&
@@ -2352,33 +2352,33 @@ 
 	 *											1 = shrink to fit
 	 *											2 = extend to fit
 	 */
-	private static function _checkMatrixOperands(&$operand1,&$operand2,$resize = 1) {
+	private static function _checkMatrixOperands(&$operand1, &$operand2, $resize = 1) {
 		//	Examine each of the two operands, and turn them into an array if they aren't one already
 		//	Note that this function should only be called if one or both of the operand is already an array
-		if (!is_array($operand1)) {
-			list($matrixRows,$matrixColumns) = self::_getMatrixDimensions($operand2);
-			$operand1 = array_fill(0,$matrixRows,array_fill(0,$matrixColumns,$operand1));
+		if ( ! is_array($operand1)) {
+			list($matrixRows, $matrixColumns) = self::_getMatrixDimensions($operand2);
+			$operand1 = array_fill(0, $matrixRows, array_fill(0, $matrixColumns, $operand1));
 			$resize = 0;
-		} elseif (!is_array($operand2)) {
-			list($matrixRows,$matrixColumns) = self::_getMatrixDimensions($operand1);
-			$operand2 = array_fill(0,$matrixRows,array_fill(0,$matrixColumns,$operand2));
+		} elseif ( ! is_array($operand2)) {
+			list($matrixRows, $matrixColumns) = self::_getMatrixDimensions($operand1);
+			$operand2 = array_fill(0, $matrixRows, array_fill(0, $matrixColumns, $operand2));
 			$resize = 0;
 		}
 
-		list($matrix1Rows,$matrix1Columns) = self::_getMatrixDimensions($operand1);
-		list($matrix2Rows,$matrix2Columns) = self::_getMatrixDimensions($operand2);
+		list($matrix1Rows, $matrix1Columns) = self::_getMatrixDimensions($operand1);
+		list($matrix2Rows, $matrix2Columns) = self::_getMatrixDimensions($operand2);
 		if (($matrix1Rows == $matrix2Columns) && ($matrix2Rows == $matrix1Columns)) {
 			$resize = 1;
 		}
 
 		if ($resize == 2) {
 			//	Given two matrices of (potentially) unequal size, convert the smaller in each dimension to match the larger
-			self::_resizeMatricesExtend($operand1,$operand2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns);
+			self::_resizeMatricesExtend($operand1, $operand2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
 		} elseif ($resize == 1) {
 			//	Given two matrices of (potentially) unequal size, convert the larger in each dimension to match the smaller
-			self::_resizeMatricesShrink($operand1,$operand2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns);
+			self::_resizeMatricesShrink($operand1, $operand2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
 		}
-		return array( $matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns);
+		return array($matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns);
 	}	//	function _checkMatrixOperands()
 
 
@@ -2391,16 +2391,16 @@ 
 	public static function _getMatrixDimensions(&$matrix) {
 		$matrixRows = count($matrix);
 		$matrixColumns = 0;
-		foreach($matrix as $rowKey => $rowValue) {
-			$matrixColumns = max(count($rowValue),$matrixColumns);
-			if (!is_array($rowValue)) {
+		foreach ($matrix as $rowKey => $rowValue) {
+			$matrixColumns = max(count($rowValue), $matrixColumns);
+			if ( ! is_array($rowValue)) {
 				$matrix[$rowKey] = array($rowValue);
 			} else {
 				$matrix[$rowKey] = array_values($rowValue);
 			}
 		}
 		$matrix = array_values($matrix);
-		return array($matrixRows,$matrixColumns);
+		return array($matrixRows, $matrixColumns);
 	}	//	function _getMatrixDimensions()
 
 
@@ -2410,7 +2410,7 @@ 
 	 * @param	mixed		&$matrix1	First matrix operand
 	 * @param	mixed		&$matrix2	Second matrix operand
 	 */
-	private static function _resizeMatricesShrink(&$matrix1,&$matrix2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns) {
+	private static function _resizeMatricesShrink(&$matrix1, &$matrix2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns) {
 		if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
 			if ($matrix2Columns < $matrix1Columns) {
 				for ($i = 0; $i < $matrix1Rows; ++$i) {
@@ -2449,18 +2449,18 @@ 
 	 * @param	mixed		&$matrix1	First matrix operand
 	 * @param	mixed		&$matrix2	Second matrix operand
 	 */
-	private static function _resizeMatricesExtend(&$matrix1,&$matrix2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns) {
+	private static function _resizeMatricesExtend(&$matrix1, &$matrix2, $matrix1Rows, $matrix1Columns, $matrix2Rows, $matrix2Columns) {
 		if (($matrix2Columns < $matrix1Columns) || ($matrix2Rows < $matrix1Rows)) {
 			if ($matrix2Columns < $matrix1Columns) {
 				for ($i = 0; $i < $matrix2Rows; ++$i) {
-					$x = $matrix2[$i][$matrix2Columns-1];
+					$x = $matrix2[$i][$matrix2Columns - 1];
 					for ($j = $matrix2Columns; $j < $matrix1Columns; ++$j) {
 						$matrix2[$i][$j] = $x;
 					}
 				}
 			}
 			if ($matrix2Rows < $matrix1Rows) {
-				$x = $matrix2[$matrix2Rows-1];
+				$x = $matrix2[$matrix2Rows - 1];
 				for ($i = 0; $i < $matrix1Rows; ++$i) {
 					$matrix2[$i] = $x;
 				}
@@ -2470,14 +2470,14 @@ 
 		if (($matrix1Columns < $matrix2Columns) || ($matrix1Rows < $matrix2Rows)) {
 			if ($matrix1Columns < $matrix2Columns) {
 				for ($i = 0; $i < $matrix1Rows; ++$i) {
-					$x = $matrix1[$i][$matrix1Columns-1];
+					$x = $matrix1[$i][$matrix1Columns - 1];
 					for ($j = $matrix1Columns; $j < $matrix2Columns; ++$j) {
 						$matrix1[$i][$j] = $x;
 					}
 				}
 			}
 			if ($matrix1Rows < $matrix2Rows) {
-				$x = $matrix1[$matrix1Rows-1];
+				$x = $matrix1[$matrix1Rows - 1];
 				for ($i = 0; $i < $matrix2Rows; ++$i) {
 					$matrix1[$i] = $x;
 				}
@@ -2502,18 +2502,18 @@ 
 			if (is_array($value)) {
 				$returnMatrix = array();
 				$pad = $rpad = ', ';
-				foreach($value as $row) {
+				foreach ($value as $row) {
 					if (is_array($row)) {
-						$returnMatrix[] = implode($pad,array_map(array($this,'_showValue'),$row));
+						$returnMatrix[] = implode($pad, array_map(array($this, '_showValue'), $row));
 						$rpad = '; ';
 					} else {
 						$returnMatrix[] = $this->_showValue($row);
 					}
 				}
-				return '{ '.implode($rpad,$returnMatrix).' }';
-			} elseif(is_string($value) && (trim($value,'"') == $value)) {
+				return '{ '.implode($rpad, $returnMatrix).' }';
+			} elseif (is_string($value) && (trim($value, '"') == $value)) {
 				return '"'.$value.'"';
-			} elseif(is_bool($value)) {
+			} elseif (is_bool($value)) {
 				return ($value) ? self::$_localeBoolean['TRUE'] : self::$_localeBoolean['FALSE'];
 			}
 		}
@@ -2538,11 +2538,11 @@ 
 				return 'a NULL value';
 			} elseif (is_float($value)) {
 				$typeString = 'a floating point number';
-			} elseif(is_int($value)) {
+			} elseif (is_int($value)) {
 				$typeString = 'an integer number';
-			} elseif(is_bool($value)) {
+			} elseif (is_bool($value)) {
 				$typeString = 'a boolean';
-			} elseif(is_array($value)) {
+			} elseif (is_array($value)) {
 				$typeString = 'a matrix';
 			} else {
 				if ($value == '') {
@@ -2559,35 +2559,35 @@ 
 
 
 	private static function _convertMatrixReferences($formula) {
-		static $matrixReplaceFrom = array('{',';','}');
-		static $matrixReplaceTo = array('MKMATRIX(MKMATRIX(','),MKMATRIX(','))');
+		static $matrixReplaceFrom = array('{', ';', '}');
+		static $matrixReplaceTo = array('MKMATRIX(MKMATRIX(', '),MKMATRIX(', '))');
 
 		//	Convert any Excel matrix references to the MKMATRIX() function
-		if (strpos($formula,'{') !== false) {
+		if (strpos($formula, '{') !== false) {
 			//	If there is the possibility of braces within a quoted string, then we don't treat those as matrix indicators
-			if (strpos($formula,'"') !== false) {
+			if (strpos($formula, '"') !== false) {
 				//	So instead we skip replacing in any quoted strings by only replacing in every other array element after we've exploded
 				//		the formula
-				$temp = explode('"',$formula);
+				$temp = explode('"', $formula);
 				//	Open and Closed counts used for trapping mismatched braces in the formula
 				$openCount = $closeCount = 0;
 				$i = false;
-				foreach($temp as &$value) {
+				foreach ($temp as &$value) {
 					//	Only count/replace in alternating array entries
-					if ($i = !$i) {
-						$openCount += substr_count($value,'{');
-						$closeCount += substr_count($value,'}');
-						$value = str_replace($matrixReplaceFrom,$matrixReplaceTo,$value);
+					if ($i = ! $i) {
+						$openCount += substr_count($value, '{');
+						$closeCount += substr_count($value, '}');
+						$value = str_replace($matrixReplaceFrom, $matrixReplaceTo, $value);
 					}
 				}
 				unset($value);
 				//	Then rebuild the formula string
-				$formula = implode('"',$temp);
+				$formula = implode('"', $temp);
 			} else {
 				//	If there's no quoted strings, then we do a simple count/replace
-				$openCount = substr_count($formula,'{');
-				$closeCount = substr_count($formula,'}');
-				$formula = str_replace($matrixReplaceFrom,$matrixReplaceTo,$formula);
+				$openCount = substr_count($formula, '{');
+				$closeCount = substr_count($formula, '}');
+				$formula = str_replace($matrixReplaceFrom, $matrixReplaceTo, $formula);
 			}
 			//	Trap for mismatched braces and trigger an appropriate error
 			if ($openCount < $closeCount) {
@@ -2627,28 +2627,28 @@ 
 		//	Binary Operators
 		//	These operators always work on two values
 		//	Array key is the operator, the value indicates whether this is a left or right associative operator
-		$operatorAssociativity	= array('^' => 0,															//	Exponentiation
-										'*' => 0, '/' => 0, 												//	Multiplication and Division
-										'+' => 0, '-' => 0,													//	Addition and Subtraction
-										'&' => 0,															//	Concatenation
-										'|' => 0, ':' => 0,													//	Intersect and Range
+		$operatorAssociativity = array('^' => 0, //	Exponentiation
+										'*' => 0, '/' => 0, //	Multiplication and Division
+										'+' => 0, '-' => 0, //	Addition and Subtraction
+										'&' => 0, //	Concatenation
+										'|' => 0, ':' => 0, //	Intersect and Range
 										'>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0		//	Comparison
 								 	  );
 		//	Comparison (Boolean) Operators
 		//	These operators work on two values, but always return a boolean result
-		$comparisonOperators	= array('>' => true, '<' => true, '=' => true, '>=' => true, '<=' => true, '<>' => true);
+		$comparisonOperators = array('>' => true, '<' => true, '=' => true, '>=' => true, '<=' => true, '<>' => true);
 
 		//	Operator Precedence
 		//	This list includes all valid operators, whether binary (including boolean) or unary (such as %)
 		//	Array key is the operator, the value is its precedence
-		$operatorPrecedence	= array(':' => 8,																//	Range
-									'|' => 7,																//	Intersect
-									'~' => 6,																//	Negation
-									'%' => 5,																//	Percentage
-									'^' => 4,																//	Exponentiation
-									'*' => 3, '/' => 3, 													//	Multiplication and Division
-									'+' => 2, '-' => 2,														//	Addition and Subtraction
-									'&' => 1,																//	Concatenation
+		$operatorPrecedence = array(':' => 8, //	Range
+									'|' => 7, //	Intersect
+									'~' => 6, //	Negation
+									'%' => 5, //	Percentage
+									'^' => 4, //	Exponentiation
+									'*' => 3, '/' => 3, //	Multiplication and Division
+									'+' => 2, '-' => 2, //	Addition and Subtraction
+									'&' => 1, //	Concatenation
 									'>' => 0, '<' => 0, '=' => 0, '>=' => 0, '<=' => 0, '<>' => 0			//	Comparison
 								   );
 
@@ -2665,17 +2665,17 @@ 
 		$index = 0;
 		$stack = new PHPExcel_Token_Stack;
 		$output = array();
-		$expectingOperator = false;					//	We use this test in syntax-checking the expression to determine when a
+		$expectingOperator = false; //	We use this test in syntax-checking the expression to determine when a
 													//		- is a negation or + is a positive operator rather than an operation
-		$expectingOperand = false;					//	We use this test in syntax-checking the expression to determine whether an operand
+		$expectingOperand = false; //	We use this test in syntax-checking the expression to determine whether an operand
 													//		should be null in a function call
 		//	The guts of the lexical parser
 		//	Loop through the formula extracting each operator and operand in turn
-		while(true) {
+		while (true) {
 //			echo 'Assessing Expression <b>'.substr($formula, $index).'</b><br />';
 			$opCharacter = $formula{$index};	//	Get the first character of the value at the current index position
 //			echo 'Initial character of expression block is '.$opCharacter.'<br />';
-			if ((isset($comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset($comparisonOperators[$formula{$index+1}]))) {
+			if ((isset($comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset($comparisonOperators[$formula{$index + 1}]))) {
 				$opCharacter .= $formula{++$index};
 //				echo 'Initial character of expression block is comparison operator '.$opCharacter.'<br />';
 			}
@@ -2685,29 +2685,29 @@ 
 //			echo '$isOperandOrFunction is '.(($isOperandOrFunction) ? 'True' : 'False').'<br />';
 //			var_dump($match);
 
-			if ($opCharacter == '-' && !$expectingOperator) {				//	Is it a negation instead of a minus?
+			if ($opCharacter == '-' && ! $expectingOperator) {				//	Is it a negation instead of a minus?
 //				echo 'Element is a Negation operator<br />';
-				$stack->push('Unary Operator','~');							//	Put a negation on the stack
-				++$index;													//		and drop the negation symbol
+				$stack->push('Unary Operator', '~'); //	Put a negation on the stack
+				++$index; //		and drop the negation symbol
 			} elseif ($opCharacter == '%' && $expectingOperator) {
 //				echo 'Element is a Percentage operator<br />';
-				$stack->push('Unary Operator','%');							//	Put a percentage on the stack
+				$stack->push('Unary Operator', '%'); //	Put a percentage on the stack
 				++$index;
-			} elseif ($opCharacter == '+' && !$expectingOperator) {			//	Positive (unary plus rather than binary operator plus) can be discarded?
+			} elseif ($opCharacter == '+' && ! $expectingOperator) {			//	Positive (unary plus rather than binary operator plus) can be discarded?
 //				echo 'Element is a Positive number, not Plus operator<br />';
-				++$index;													//	Drop the redundant plus symbol
-			} elseif ((($opCharacter == '~') || ($opCharacter == '|')) && (!$isOperandOrFunction)) {	//	We have to explicitly deny a tilde or pipe, because they are legal
-				return $this->_raiseFormulaError("Formula Error: Illegal character '~'");				//		on the stack but not in the input expression
+				++$index; //	Drop the redundant plus symbol
+			} elseif ((($opCharacter == '~') || ($opCharacter == '|')) && ( ! $isOperandOrFunction)) {	//	We have to explicitly deny a tilde or pipe, because they are legal
+				return $this->_raiseFormulaError("Formula Error: Illegal character '~'"); //		on the stack but not in the input expression
 
 			} elseif ((isset(self::$_operators[$opCharacter]) or $isOperandOrFunction) && $expectingOperator) {	//	Are we putting an operator on the stack?
 //				echo 'Element with value '.$opCharacter.' is an Operator<br />';
-				while($stack->count() > 0 &&
+				while ($stack->count() > 0 &&
 					($o2 = $stack->last()) &&
 					isset(self::$_operators[$o2['value']]) &&
 					@($operatorAssociativity[$opCharacter] ? $operatorPrecedence[$opCharacter] < $operatorPrecedence[$o2['value']] : $operatorPrecedence[$opCharacter] <= $operatorPrecedence[$o2['value']])) {
-					$output[] = $stack->pop();								//	Swap operands and higher precedence operators from the stack to the output
+					$output[] = $stack->pop(); //	Swap operands and higher precedence operators from the stack to the output
 				}
-				$stack->push('Binary Operator',$opCharacter);	//	Finally put our current operator onto the stack
+				$stack->push('Binary Operator', $opCharacter); //	Finally put our current operator onto the stack
 				++$index;
 				$expectingOperator = false;
 
@@ -2720,10 +2720,10 @@ 
 				}
 				$d = $stack->last(2);
 				if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {	//	Did this parenthesis just close a function?
-					$functionName = $matches[1];										//	Get the function name
+					$functionName = $matches[1]; //	Get the function name
 //					echo 'Closed Function is '.$functionName.'<br />';
 					$d = $stack->pop();
-					$argumentCount = $d['value'];		//	See how many arguments there were (argument count is the next value stored on the stack)
+					$argumentCount = $d['value']; //	See how many arguments there were (argument count is the next value stored on the stack)
 //					if ($argumentCount == 0) {
 //						echo 'With no arguments<br />';
 //					} elseif ($argumentCount == 1) {
@@ -2731,8 +2731,8 @@ 
 //					} else {
 //						echo 'With '.$argumentCount.' arguments<br />';
 //					}
-					$output[] = $d;						//	Dump the argument count on the output
-					$output[] = $stack->pop();			//	Pop the function and push onto the output
+					$output[] = $d; //	Dump the argument count on the output
+					$output[] = $stack->pop(); //	Pop the function and push onto the output
 					if (isset(self::$_controlFunctions[$functionName])) {
 //						echo 'Built-in function '.$functionName.'<br />';
 						$expectedArgumentCount = self::$_controlFunctions[$functionName]['argumentCount'];
@@ -2761,7 +2761,7 @@ 
 							}
 						}
 					} elseif ($expectedArgumentCount != '*') {
-						$isOperandOrFunction = preg_match('/(\d*)([-+,])(\d*)/',$expectedArgumentCount,$argMatch);
+						$isOperandOrFunction = preg_match('/(\d*)([-+,])(\d*)/', $expectedArgumentCount, $argMatch);
 //						print_r($argMatch);
 //						echo '<br />';
 						switch ($argMatch[2]) {
@@ -2795,30 +2795,30 @@ 
 //				echo 'Element is a Function argument separator<br />';
 				while (($o2 = $stack->pop()) && $o2['value'] != '(') {		//	Pop off the stack back to the last (
 					if ($o2 === NULL) return $this->_raiseFormulaError("Formula Error: Unexpected ,");
-					else $output[] = $o2;	// pop the argument expression stuff and push onto the output
+					else $output[] = $o2; // pop the argument expression stuff and push onto the output
 				}
 				//	If we've a comma when we're expecting an operand, then what we actually have is a null operand;
 				//		so push a null onto the stack
-				if (($expectingOperand) || (!$expectingOperator)) {
+				if (($expectingOperand) || ( ! $expectingOperator)) {
 					$output[] = array('type' => 'NULL Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => null);
 				}
 				// make sure there was a function
 				$d = $stack->last(2);
-				if (!preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches))
+				if ( ! preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches))
 					return $this->_raiseFormulaError("Formula Error: Unexpected ,");
 				$d = $stack->pop();
-				$stack->push($d['type'],++$d['value'],$d['reference']);	// increment the argument count
-				$stack->push('Brace', '(');	// put the ( back on, we'll need to pop back to it again
+				$stack->push($d['type'], ++$d['value'], $d['reference']); // increment the argument count
+				$stack->push('Brace', '('); // put the ( back on, we'll need to pop back to it again
 				$expectingOperator = false;
 				$expectingOperand = true;
 				++$index;
 
-			} elseif ($opCharacter == '(' && !$expectingOperator) {
+			} elseif ($opCharacter == '(' && ! $expectingOperator) {
 //				echo 'Element is an Opening Bracket<br />';
 				$stack->push('Brace', '(');
 				++$index;
 
-			} elseif ($isOperandOrFunction && !$expectingOperator) {	// do we now have a function/variable/number?
+			} elseif ($isOperandOrFunction && ! $expectingOperator) {	// do we now have a function/variable/number?
 				$expectingOperator = true;
 				$expectingOperand = false;
 				$val = $match[1];
@@ -2826,11 +2826,11 @@ 
 //				echo 'Element with value '.$val.' is an Operand, Variable, Constant, String, Number, Cell Reference or Function<br />';
 
 				if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $val, $matches)) {
-					$val = preg_replace('/\s/','',$val);
+					$val = preg_replace('/\s/', '', $val);
 //					echo 'Element '.$val.' is a Function<br />';
 					if (isset(self::$_PHPExcelFunctions[strtoupper($matches[1])]) || isset(self::$_controlFunctions[strtoupper($matches[1])])) {	// it's a function
 						$stack->push('Function', strtoupper($val));
-						$ax = preg_match('/^\s*(\s*\))/i', substr($formula, $index+$length), $amatch);
+						$ax = preg_match('/^\s*(\s*\))/i', substr($formula, $index + $length), $amatch);
 						if ($ax) {
 							$stack->push('Operand Count for Function '.strtoupper($val).')', 0);
 							$expectingOperator = true;
@@ -2854,7 +2854,7 @@ 
 						if ($matches[2] == '') {
 							//	Otherwise, we 'inherit' the worksheet reference from the start cell reference
 							//	The start of the cell range reference should be the last entry in $output
-							$startCellRef = $output[count($output)-1]['value'];
+							$startCellRef = $output[count($output) - 1]['value'];
 							preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $startCellRef, $startMatches);
 							if ($startMatches[2] > '') {
 								$val = $startMatches[2].'!'.$val;
@@ -2871,28 +2871,28 @@ 
 					//	If the last entry on the stack was a : operator, then we may have a row or column range reference
 					$testPrevOp = $stack->last(1);
 					if ($testPrevOp['value'] == ':') {
-						$startRowColRef = $output[count($output)-1]['value'];
+						$startRowColRef = $output[count($output) - 1]['value'];
 						$rangeWS1 = '';
-						if (strpos('!',$startRowColRef) !== false) {
-							list($rangeWS1,$startRowColRef) = explode('!',$startRowColRef);
+						if (strpos('!', $startRowColRef) !== false) {
+							list($rangeWS1, $startRowColRef) = explode('!', $startRowColRef);
 						}
 						if ($rangeWS1 != '') $rangeWS1 .= '!';
 						$rangeWS2 = $rangeWS1;
-						if (strpos('!',$val) !== false) {
-							list($rangeWS2,$val) = explode('!',$val);
+						if (strpos('!', $val) !== false) {
+							list($rangeWS2, $val) = explode('!', $val);
 						}
 						if ($rangeWS2 != '') $rangeWS2 .= '!';
 						if ((is_integer($startRowColRef)) && (ctype_digit($val)) &&
 							($startRowColRef <= 1048576) && ($val <= 1048576)) {
 							//	Row range
-							$endRowColRef = ($pCellParent !== NULL) ? $pCellParent->getHighestColumn() : 'XFD';	//	Max 16,384 columns for Excel2007
-							$output[count($output)-1]['value'] = $rangeWS1.'A'.$startRowColRef;
+							$endRowColRef = ($pCellParent !== NULL) ? $pCellParent->getHighestColumn() : 'XFD'; //	Max 16,384 columns for Excel2007
+							$output[count($output) - 1]['value'] = $rangeWS1.'A'.$startRowColRef;
 							$val = $rangeWS2.$endRowColRef.$val;
 						} elseif ((ctype_alpha($startRowColRef)) && (ctype_alpha($val)) &&
 							(strlen($startRowColRef) <= 3) && (strlen($val) <= 3)) {
 							//	Column range
-							$endRowColRef = ($pCellParent !== NULL) ? $pCellParent->getHighestRow() : 1048576;		//	Max 1,048,576 rows for Excel2007
-							$output[count($output)-1]['value'] = $rangeWS1.strtoupper($startRowColRef).'1';
+							$endRowColRef = ($pCellParent !== NULL) ? $pCellParent->getHighestRow() : 1048576; //	Max 1,048,576 rows for Excel2007
+							$output[count($output) - 1]['value'] = $rangeWS1.strtoupper($startRowColRef).'1';
 							$val = $rangeWS2.$val.$endRowColRef;
 						}
 					}
@@ -2901,10 +2901,10 @@ 
 					if ($opCharacter == '"') {
 //						echo 'Element is a String<br />';
 						//	UnEscape any quotes within the string
-						$val = self::_wrapResult(str_replace('""','"',self::_unwrapResult($val)));
+						$val = self::_wrapResult(str_replace('""', '"', self::_unwrapResult($val)));
 					} elseif (is_numeric($val)) {
 //						echo 'Element is a Number<br />';
-						if ((strpos($val,'.') !== false) || (stripos($val,'e') !== false) || ($val > PHP_INT_MAX) || ($val < -PHP_INT_MAX)) {
+						if ((strpos($val, '.') !== false) || (stripos($val, 'e') !== false) || ($val > PHP_INT_MAX) || ($val < -PHP_INT_MAX)) {
 //							echo 'Casting '.$val.' to float<br />';
 							$val = (float) $val;
 						} else {
@@ -2935,7 +2935,7 @@ 
 				} else {
 					return $this->_raiseFormulaError("Formula Error: Unexpected ')'");
 				}
-			} elseif (isset(self::$_operators[$opCharacter]) && !$expectingOperator) {
+			} elseif (isset(self::$_operators[$opCharacter]) && ! $expectingOperator) {
 				return $this->_raiseFormulaError("Formula Error: Unexpected operator '$opCharacter'");
 			} else {	// I don't even want to know what you did to get here
 				return $this->_raiseFormulaError("Formula Error: An unexpected error occured");
@@ -2962,15 +2962,15 @@ 
 				//		Cell References) then we have an INTERSECTION operator
 //				echo 'Possible Intersect Operator<br />';
 				if (($expectingOperator) && (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'.*/Ui', substr($formula, $index), $match)) &&
-					($output[count($output)-1]['type'] == 'Cell Reference')) {
+					($output[count($output) - 1]['type'] == 'Cell Reference')) {
 //					echo 'Element is an Intersect Operator<br />';
-					while($stack->count() > 0 &&
+					while ($stack->count() > 0 &&
 						($o2 = $stack->last()) &&
 						isset(self::$_operators[$o2['value']]) &&
 						@($operatorAssociativity[$opCharacter] ? $operatorPrecedence[$opCharacter] < $operatorPrecedence[$o2['value']] : $operatorPrecedence[$opCharacter] <= $operatorPrecedence[$o2['value']])) {
-						$output[] = $stack->pop();								//	Swap operands and higher precedence operators from the stack to the output
+						$output[] = $stack->pop(); //	Swap operands and higher precedence operators from the stack to the output
 					}
-					$stack->push('Binary Operator','|');	//	Put an Intersect Operator on the stack
+					$stack->push('Binary Operator', '|'); //	Put an Intersect Operator on the stack
 					$expectingOperator = false;
 				}
 			}
@@ -2978,7 +2978,7 @@ 
 
 		while (($op = $stack->pop()) !== NULL) {	// pop everything off the stack and push onto output
 			if ((is_array($opCharacter) && $opCharacter['value'] == '(') || ($opCharacter === '('))
-				return $this->_raiseFormulaError("Formula Error: Expecting ')'");	// if there are any opening braces on the stack, then braces were unbalanced
+				return $this->_raiseFormulaError("Formula Error: Expecting ')'"); // if there are any opening braces on the stack, then braces were unbalanced
 			$output[] = $op;
 		}
 		return $output;
@@ -3041,18 +3041,18 @@ 
 					case '<='	:			//	Less than or Equal to
 					case '='	:			//	Equality
 					case '<>'	:			//	Inequality
-						$this->_executeBinaryComparisonOperation($cellID,$operand1,$operand2,$token,$stack);
+						$this->_executeBinaryComparisonOperation($cellID, $operand1, $operand2, $token, $stack);
 						break;
 					//	Binary Operators
 					case ':'	:			//	Range
 						$sheet1 = $sheet2 = '';
-						if (strpos($operand1Data['reference'],'!') !== false) {
-							list($sheet1,$operand1Data['reference']) = explode('!',$operand1Data['reference']);
+						if (strpos($operand1Data['reference'], '!') !== false) {
+							list($sheet1, $operand1Data['reference']) = explode('!', $operand1Data['reference']);
 						} else {
 							$sheet1 = ($pCellParent !== NULL) ? $pCellParent->getTitle() : '';
 						}
-						if (strpos($operand2Data['reference'],'!') !== false) {
-							list($sheet2,$operand2Data['reference']) = explode('!',$operand2Data['reference']);
+						if (strpos($operand2Data['reference'], '!') !== false) {
+							list($sheet2, $operand2Data['reference']) = explode('!', $operand2Data['reference']);
 						} else {
 							$sheet2 = $sheet1;
 						}
@@ -3076,9 +3076,9 @@ 
 								}
 							}
 
-							$oData = array_merge(explode(':',$operand1Data['reference']),explode(':',$operand2Data['reference']));
+							$oData = array_merge(explode(':', $operand1Data['reference']), explode(':', $operand2Data['reference']));
 							$oCol = $oRow = array();
-							foreach($oData as $oDatum) {
+							foreach ($oData as $oDatum) {
 								$oCR = PHPExcel_Cell::coordinateFromString($oDatum);
 								$oCol[] = PHPExcel_Cell::columnIndexFromString($oCR[0]) - 1;
 								$oRow[] = $oCR[1];
@@ -3089,26 +3089,26 @@ 
 							} else {
 								return $this->_raiseFormulaError('Unable to access Cell Reference');
 							}
-							$stack->push('Cell Reference',$cellValue,$cellRef);
+							$stack->push('Cell Reference', $cellValue, $cellRef);
 						} else {
-							$stack->push('Error',PHPExcel_Calculation_Functions::REF(),null);
+							$stack->push('Error', PHPExcel_Calculation_Functions::REF(), null);
 						}
 
 						break;
 					case '+'	:			//	Addition
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'plusEquals',$stack);
+						$this->_executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'plusEquals', $stack);
 						break;
 					case '-'	:			//	Subtraction
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'minusEquals',$stack);
+						$this->_executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'minusEquals', $stack);
 						break;
 					case '*'	:			//	Multiplication
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'arrayTimesEquals',$stack);
+						$this->_executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'arrayTimesEquals', $stack);
 						break;
 					case '/'	:			//	Division
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'arrayRightDivide',$stack);
+						$this->_executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'arrayRightDivide', $stack);
 						break;
 					case '^'	:			//	Exponential
-						$this->_executeNumericBinaryOperation($cellID,$operand1,$operand2,$token,'power',$stack);
+						$this->_executeNumericBinaryOperation($cellID, $operand1, $operand2, $token, 'power', $stack);
 						break;
 					case '&'	:			//	Concatenation
 						//	If either of the operands is a matrix, we need to treat them both as matrices
@@ -3122,7 +3122,7 @@ 
 						}
 						if ((is_array($operand1)) || (is_array($operand2))) {
 							//	Ensure that both operands are arrays/matrices
-							self::_checkMatrixOperands($operand1,$operand2,2);
+							self::_checkMatrixOperands($operand1, $operand2, 2);
 							try {
 								//	Convert operand 1 from a PHP array to a matrix
 								$matrix = new PHPExcel_Shared_JAMA_Matrix($operand1);
@@ -3134,24 +3134,24 @@ 
 								$result = '#VALUE!';
 							}
 						} else {
-							$result = '"'.str_replace('""','"',self::_unwrapResult($operand1,'"').self::_unwrapResult($operand2,'"')).'"';
+							$result = '"'.str_replace('""', '"', self::_unwrapResult($operand1, '"').self::_unwrapResult($operand2, '"')).'"';
 						}
 						$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($result));
-						$stack->push('Value',$result);
+						$stack->push('Value', $result);
 						break;
 					case '|'	:			//	Intersect
-						$rowIntersect = array_intersect_key($operand1,$operand2);
+						$rowIntersect = array_intersect_key($operand1, $operand2);
 						$cellIntersect = $oCol = $oRow = array();
-						foreach(array_keys($rowIntersect) as $row) {
+						foreach (array_keys($rowIntersect) as $row) {
 							$oRow[] = $row;
-							foreach($rowIntersect[$row] as $col => $data) {
+							foreach ($rowIntersect[$row] as $col => $data) {
 								$oCol[] = PHPExcel_Cell::columnIndexFromString($col) - 1;
-								$cellIntersect[$row] = array_intersect_key($operand1[$row],$operand2[$row]);
+								$cellIntersect[$row] = array_intersect_key($operand1[$row], $operand2[$row]);
 							}
 						}
 						$cellRef = PHPExcel_Cell::stringFromColumnIndex(min($oCol)).min($oRow).':'.PHPExcel_Cell::stringFromColumnIndex(max($oCol)).max($oRow);
 						$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($cellIntersect));
-						$stack->push('Value',$cellIntersect,$cellRef);
+						$stack->push('Value', $cellIntersect, $cellRef);
 						break;
 				}
 
@@ -3170,7 +3170,7 @@ 
 					$multiplier = 0.01;
 				}
 				if (is_array($arg)) {
-					self::_checkMatrixOperands($arg,$multiplier,2);
+					self::_checkMatrixOperands($arg, $multiplier, 2);
 					try {
 						$matrix1 = new PHPExcel_Shared_JAMA_Matrix($arg);
 						$matrixResult = $matrix1->arrayTimesEquals($multiplier);
@@ -3180,9 +3180,9 @@ 
 						$result = '#VALUE!';
 					}
 					$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($result));
-					$stack->push('Value',$result);
+					$stack->push('Value', $result);
 				} else {
-					$this->_executeNumericBinaryOperation($cellID,$multiplier,$arg,'*','arrayTimesEquals',$stack);
+					$this->_executeNumericBinaryOperation($cellID, $multiplier, $arg, '*', 'arrayTimesEquals', $stack);
 				}
 
 			} elseif (preg_match('/^'.self::CALCULATION_REGEXP_CELLREF.'$/i', $token, $matches)) {
@@ -3196,12 +3196,12 @@ 
 					} else {
 						$cellRef = $matches[6].$matches[7].':'.$matches[9].$matches[10];
 						if ($matches[2] > '') {
-							$matches[2] = trim($matches[2],"\"'");
-							if ((strpos($matches[2],'[') !== false) || (strpos($matches[2],']') !== false)) {
+							$matches[2] = trim($matches[2], "\"'");
+							if ((strpos($matches[2], '[') !== false) || (strpos($matches[2], ']') !== false)) {
 								//	It's a Reference to an external workbook (not currently supported)
 								return $this->_raiseFormulaError('Unable to access External Workbook');
 							}
-							$matches[2] = trim($matches[2],"\"'");
+							$matches[2] = trim($matches[2], "\"'");
 //							echo '$cellRef='.$cellRef.' in worksheet '.$matches[2].'<br />';
 							$this->_writeDebug('Evaluating Cell Range '.$cellRef.' in worksheet '.$matches[2]);
 							if ($pCellParent !== NULL) {
@@ -3230,8 +3230,8 @@ 
 					} else {
 						$cellRef = $matches[6].$matches[7];
 						if ($matches[2] > '') {
-							$matches[2] = trim($matches[2],"\"'");
-							if ((strpos($matches[2],'[') !== false) || (strpos($matches[2],']') !== false)) {
+							$matches[2] = trim($matches[2], "\"'");
+							if ((strpos($matches[2], '[') !== false) || (strpos($matches[2], ']') !== false)) {
 								//	It's a Reference to an external workbook (not currently supported)
 								return $this->_raiseFormulaError('Unable to access External Workbook');
 							}
@@ -3262,7 +3262,7 @@ 
 						}
 					}
 				}
-				$stack->push('Value',$cellValue,$cellRef);
+				$stack->push('Value', $cellValue, $cellRef);
 
 			// if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
 			} elseif (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $token, $matches)) {
@@ -3316,7 +3316,7 @@ 
 					if ($functionName != 'MKMATRIX') {
 						if ($this->writeDebugLog) {
 							krsort($argArrayVals);
-							$this->_writeDebug('Evaluating '. self::_localeFunc($functionName).'( '.implode(self::$_localeArgumentSeparator.' ',PHPExcel_Calculation_Functions::flattenArray($argArrayVals)).' )');
+							$this->_writeDebug('Evaluating '.self::_localeFunc($functionName).'( '.implode(self::$_localeArgumentSeparator.' ', PHPExcel_Calculation_Functions::flattenArray($argArrayVals)).' )');
 						}
 					}
 					//	Process each argument in turn, building the return value as an array
@@ -3346,20 +3346,20 @@ 
 						if ($passCellReference) {
 							$args[] = $pCell;
 						}
-						if (strpos($functionCall,'::') !== false) {
-							$result = call_user_func_array(explode('::',$functionCall),$args);
+						if (strpos($functionCall, '::') !== false) {
+							$result = call_user_func_array(explode('::', $functionCall), $args);
 						} else {
-							foreach($args as &$arg) {
+							foreach ($args as &$arg) {
 								$arg = PHPExcel_Calculation_Functions::flattenSingleValue($arg);
 							}
 							unset($arg);
-							$result = call_user_func_array($functionCall,$args);
+							$result = call_user_func_array($functionCall, $args);
 						}
 //					}
 					if ($functionName != 'MKMATRIX') {
 						$this->_writeDebug('Evaluation Result for '.self::_localeFunc($functionName).'() function call is '.$this->_showTypeDetails($result));
 					}
-					$stack->push('Value',self::_wrapResult($result));
+					$stack->push('Value', self::_wrapResult($result));
 				}
 
 			} else {
@@ -3367,11 +3367,11 @@ 
 				if (isset(self::$_ExcelConstants[strtoupper($token)])) {
 					$excelConstant = strtoupper($token);
 //					echo 'Token is a PHPExcel constant: '.$excelConstant.'<br />';
-					$stack->push('Constant Value',self::$_ExcelConstants[$excelConstant]);
+					$stack->push('Constant Value', self::$_ExcelConstants[$excelConstant]);
 					$this->_writeDebug('Evaluating Constant '.$excelConstant.' as '.$this->_showTypeDetails(self::$_ExcelConstants[$excelConstant]));
 				} elseif ((is_numeric($token)) || ($token === NULL) || (is_bool($token)) || ($token == '') || ($token{0} == '"') || ($token{0} == '#')) {
 //					echo 'Token is a number, boolean, string, null or an Excel error<br />';
-					$stack->push('Value',$token);
+					$stack->push('Value', $token);
 				// if the token is a named range, push the named range name onto the stack
 				} elseif (preg_match('/^'.self::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $token, $matches)) {
 //					echo 'Token is a named range<br />';
@@ -3381,7 +3381,7 @@ 
 					$cellValue = $this->extractNamedRange($namedRange, ((null !== $pCell) ? $pCellParent : null), false);
 					$pCell->attach($pCellParent);
 					$this->_writeDebug('Evaluation Result for named range '.$namedRange.' is '.$this->_showTypeDetails($cellValue));
-					$stack->push('Named Range',$cellValue,$namedRange);
+					$stack->push('Named Range', $cellValue, $namedRange);
 				} else {
 					return $this->_raiseFormulaError("undefined variable '$token'");
 				}
@@ -3399,20 +3399,20 @@ 
 	}	//	function _processTokenStack()
 
 
-	private function _validateBinaryOperand($cellID,&$operand,&$stack) {
+	private function _validateBinaryOperand($cellID, &$operand, &$stack) {
 		//	Numbers, matrices and booleans can pass straight through, as they're already valid
 		if (is_string($operand)) {
 			//	We only need special validations for the operand if it is a string
 			//	Start by stripping off the quotation marks we use to identify true excel string values internally
 			if ($operand > '' && $operand{0} == '"') { $operand = self::_unwrapResult($operand); }
 			//	If the string is a numeric value, we treat it as a numeric, so no further testing
-			if (!is_numeric($operand)) {
+			if ( ! is_numeric($operand)) {
 				//	If not a numeric, test to see if the value is an Excel error, and so can't be used in normal binary operations
 				if ($operand > '' && $operand{0} == '#') {
 					$stack->push('Value', $operand);
 					$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($operand));
 					return false;
-				} elseif (!PHPExcel_Shared_String::convertToNumberIfFraction($operand)) {
+				} elseif ( ! PHPExcel_Shared_String::convertToNumberIfFraction($operand)) {
 					//	If not a numeric or a fraction, then it's a text string, and so can't be used in mathematical binary operations
 					$stack->push('Value', '#VALUE!');
 					$this->_writeDebug('Evaluation Result is a '.$this->_showTypeDetails('#VALUE!'));
@@ -3426,29 +3426,29 @@ 
 	}	//	function _validateBinaryOperand()
 
 
-	private function _executeBinaryComparisonOperation($cellID,$operand1,$operand2,$operation,&$stack,$recursingArrays=false) {
+	private function _executeBinaryComparisonOperation($cellID, $operand1, $operand2, $operation, &$stack, $recursingArrays = false) {
 		//	If we're dealing with matrix operations, we want a matrix result
 		if ((is_array($operand1)) || (is_array($operand2))) {
 			$result = array();
-			if ((is_array($operand1)) && (!is_array($operand2))) {
-				foreach($operand1 as $x => $operandData) {
+			if ((is_array($operand1)) && ( ! is_array($operand2))) {
+				foreach ($operand1 as $x => $operandData) {
 					$this->_writeDebug('Evaluating Comparison '.$this->_showValue($operandData).' '.$operation.' '.$this->_showValue($operand2));
-					$this->_executeBinaryComparisonOperation($cellID,$operandData,$operand2,$operation,$stack);
+					$this->_executeBinaryComparisonOperation($cellID, $operandData, $operand2, $operation, $stack);
 					$r = $stack->pop();
 					$result[$x] = $r['value'];
 				}
-			} elseif ((!is_array($operand1)) && (is_array($operand2))) {
-				foreach($operand2 as $x => $operandData) {
+			} elseif (( ! is_array($operand1)) && (is_array($operand2))) {
+				foreach ($operand2 as $x => $operandData) {
 					$this->_writeDebug('Evaluating Comparison '.$this->_showValue($operand1).' '.$operation.' '.$this->_showValue($operandData));
-					$this->_executeBinaryComparisonOperation($cellID,$operand1,$operandData,$operation,$stack);
+					$this->_executeBinaryComparisonOperation($cellID, $operand1, $operandData, $operation, $stack);
 					$r = $stack->pop();
 					$result[$x] = $r['value'];
 				}
 			} else {
-				if (!$recursingArrays) { self::_checkMatrixOperands($operand1,$operand2,2); }
-				foreach($operand1 as $x => $operandData) {
+				if ( ! $recursingArrays) { self::_checkMatrixOperands($operand1, $operand2, 2); }
+				foreach ($operand1 as $x => $operandData) {
 					$this->_writeDebug('Evaluating Comparison '.$this->_showValue($operandData).' '.$operation.' '.$this->_showValue($operand2[$x]));
-					$this->_executeBinaryComparisonOperation($cellID,$operandData,$operand2[$x],$operation,$stack,true);
+					$this->_executeBinaryComparisonOperation($cellID, $operandData, $operand2[$x], $operation, $stack, true);
 					$r = $stack->pop();
 					$result[$x] = $r['value'];
 				}
@@ -3456,7 +3456,7 @@ 
 			//	Log the result details
 			$this->_writeDebug('Comparison Evaluation Result is '.$this->_showTypeDetails($result));
 			//	And push the result onto the stack
-			$stack->push('Array',$result);
+			$stack->push('Array', $result);
 			return true;
 		}
 
@@ -3495,15 +3495,15 @@ 
 		//	Log the result details
 		$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($result));
 		//	And push the result onto the stack
-		$stack->push('Value',$result);
+		$stack->push('Value', $result);
 		return true;
 	}	//	function _executeBinaryComparisonOperation()
 
 
-	private function _executeNumericBinaryOperation($cellID,$operand1,$operand2,$operation,$matrixFunction,&$stack) {
+	private function _executeNumericBinaryOperation($cellID, $operand1, $operand2, $operation, $matrixFunction, &$stack) {
 		//	Validate the two operands
-		if (!$this->_validateBinaryOperand($cellID,$operand1,$stack)) return false;
-		if (!$this->_validateBinaryOperand($cellID,$operand2,$stack)) return false;
+		if ( ! $this->_validateBinaryOperand($cellID, $operand1, $stack)) return false;
+		if ( ! $this->_validateBinaryOperand($cellID, $operand2, $stack)) return false;
 
 		$executeMatrixOperation = false;
 		//	If either of the operands is a matrix, we need to treat them both as matrices
@@ -3513,7 +3513,7 @@ 
 			//	Ensure that both operands are arrays/matrices
 			$executeMatrixOperation = true;
 			$mSize = array();
-			list($mSize[],$mSize[],$mSize[],$mSize[]) = self::_checkMatrixOperands($operand1,$operand2,2);
+			list($mSize[], $mSize[], $mSize[], $mSize[]) = self::_checkMatrixOperands($operand1, $operand2, 2);
 
 			//	But if they're both single cell matrices, then we can treat them as simple values
 			if (array_sum($mSize) == 4) {
@@ -3536,37 +3536,37 @@ 
 			}
 		} else {
 			if ((PHPExcel_Calculation_Functions::getCompatibilityMode() != PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) &&
-				((is_string($operand1) && !is_numeric($operand1)) || (is_string($operand2) && !is_numeric($operand2)))) {
+				((is_string($operand1) && ! is_numeric($operand1)) || (is_string($operand2) && ! is_numeric($operand2)))) {
 				$result = PHPExcel_Calculation_Functions::VALUE();
 			} else {
 				//	If we're dealing with non-matrix operations, execute the necessary operation
 				switch ($operation) {
 					//	Addition
 					case '+':
-						$result = $operand1+$operand2;
+						$result = $operand1 + $operand2;
 						break;
 					//	Subtraction
 					case '-':
-						$result = $operand1-$operand2;
+						$result = $operand1 - $operand2;
 						break;
 					//	Multiplication
 					case '*':
-						$result = $operand1*$operand2;
+						$result = $operand1 * $operand2;
 						break;
 					//	Division
 					case '/':
 						if ($operand2 == 0) {
 							//	Trap for Divide by Zero error
-							$stack->push('Value','#DIV/0!');
+							$stack->push('Value', '#DIV/0!');
 							$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails('#DIV/0!'));
 							return false;
 						} else {
-							$result = $operand1/$operand2;
+							$result = $operand1 / $operand2;
 						}
 						break;
 					//	Power
 					case '^':
-						$result = pow($operand1,$operand2);
+						$result = pow($operand1, $operand2);
 						break;
 				}
 			}
@@ -3575,7 +3575,7 @@ 
 		//	Log the result details
 		$this->_writeDebug('Evaluation Result is '.$this->_showTypeDetails($result));
 		//	And push the result onto the stack
-		$stack->push('Value',$result);
+		$stack->push('Value', $result);
 		return true;
 	}	//	function _executeNumericBinaryOperation()
 
@@ -3584,9 +3584,9 @@ 
 		//	Only write the debug log if logging is enabled
 		if ($this->writeDebugLog) {
 			if ($this->echoDebugLog) {
-				echo implode(' -> ',$this->debugLogStack).' -> '.$message,'<br />';
+				echo implode(' -> ', $this->debugLogStack).' -> '.$message, '<br />';
 			}
-			$this->debugLog[] = implode(' -> ',$this->debugLogStack).' -> '.$message;
+			$this->debugLog[] = implode(' -> ', $this->debugLogStack).' -> '.$message;
 		}
 	}	//	function _writeDebug()
 
@@ -3595,7 +3595,7 @@ 
 	protected function _raiseFormulaError($errorMessage) {
 		$this->formulaError = $errorMessage;
 		$this->debugLogStack = array();
-		if (!$this->suppressFormulaErrors) throw new Exception($errorMessage);
+		if ( ! $this->suppressFormulaErrors) throw new Exception($errorMessage);
 		trigger_error($errorMessage, E_USER_ERROR);
 	}	//	function _raiseFormulaError()
 
@@ -3608,15 +3608,15 @@ 
 	 * @return  mixed				Array of values in range if range contains more than one element. Otherwise, a single value is returned.
 	 * @throws	Exception
 	 */
-	public function extractCellRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog=true) {
+	public function extractCellRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog = true) {
 		// Return value
-		$returnValue = array ();
+		$returnValue = array();
 
 //		echo 'extractCellRange('.$pRange.')<br />';
 		if ($pSheet !== NULL) {
 //			echo 'Passed sheet name is '.$pSheet->getTitle().'<br />';
 //			echo 'Range reference is '.$pRange.'<br />';
-			if (strpos ($pRange, '!') !== false) {
+			if (strpos($pRange, '!') !== false) {
 //				echo '$pRange reference includes sheet reference<br />';
 				$worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pRange, true);
 				$pSheet = $pSheet->getParent()->getSheetByName($worksheetReference[0]);
@@ -3628,9 +3628,9 @@ 
 			// Extract range
 			$aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
 			$pRange = $pSheet->getTitle().'!'.$pRange;
-			if (!isset($aReferences[1])) {
+			if ( ! isset($aReferences[1])) {
 				//	Single cell in range
-				list($currentCol,$currentRow) = sscanf($aReferences[0],'%[A-Z]%d');
+				list($currentCol, $currentRow) = sscanf($aReferences[0], '%[A-Z]%d');
 				if ($pSheet->cellExists($aReferences[0])) {
 					$returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
 				} else {
@@ -3640,7 +3640,7 @@ 
 				// Extract cell data for all cells in the range
 				foreach ($aReferences as $reference) {
 					// Extract range
-					list($currentCol,$currentRow) = sscanf($reference,'%[A-Z]%d');
+					list($currentCol, $currentRow) = sscanf($reference, '%[A-Z]%d');
 
 					if ($pSheet->cellExists($reference)) {
 						$returnValue[$currentRow][$currentCol] = $pSheet->getCell($reference)->getCalculatedValue($resetLog);
@@ -3664,15 +3664,15 @@ 
 	 * @return  mixed				Array of values in range if range contains more than one element. Otherwise, a single value is returned.
 	 * @throws	Exception
 	 */
-	public function extractNamedRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog=true) {
+	public function extractNamedRange(&$pRange = 'A1', PHPExcel_Worksheet $pSheet = null, $resetLog = true) {
 		// Return value
-		$returnValue = array ();
+		$returnValue = array();
 
 //		echo 'extractNamedRange('.$pRange.')<br />';
 		if ($pSheet !== NULL) {
 //			echo 'Current sheet name is '.$pSheet->getTitle().'<br />';
 //			echo 'Range reference is '.$pRange.'<br />';
-			if (strpos ($pRange, '!') !== false) {
+			if (strpos($pRange, '!') !== false) {
 //				echo '$pRange reference includes sheet reference<br />';
 				$worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pRange, true);
 				$pSheet = $pSheet->getParent()->getSheetByName($worksheetReference[0]);
@@ -3690,9 +3690,9 @@ 
 				$splitRange = PHPExcel_Cell::splitRange($pRange);
 				//	Convert row and column references
 				if (ctype_alpha($splitRange[0][0])) {
-					$pRange = $splitRange[0][0] . '1:' . $splitRange[0][1] . $namedRange->getWorksheet()->getHighestRow();
-				} elseif(ctype_digit($splitRange[0][0])) {
-					$pRange = 'A' . $splitRange[0][0] . ':' . $namedRange->getWorksheet()->getHighestColumn() . $splitRange[0][1];
+					$pRange = $splitRange[0][0].'1:'.$splitRange[0][1].$namedRange->getWorksheet()->getHighestRow();
+				} elseif (ctype_digit($splitRange[0][0])) {
+					$pRange = 'A'.$splitRange[0][0].':'.$namedRange->getWorksheet()->getHighestColumn().$splitRange[0][1];
 				}
 //				echo $pRange.') is in sheet '.$namedRange->getWorksheet()->getTitle().'<br />';
 
@@ -3710,9 +3710,9 @@ 
 			// Extract range
 			$aReferences = PHPExcel_Cell::extractAllCellReferencesInRange($pRange);
 //			var_dump($aReferences);
-			if (!isset($aReferences[1])) {
+			if ( ! isset($aReferences[1])) {
 				//	Single cell (or single column or row) in range
-				list($currentCol,$currentRow) = PHPExcel_Cell::coordinateFromString($aReferences[0]);
+				list($currentCol, $currentRow) = PHPExcel_Cell::coordinateFromString($aReferences[0]);
 				if ($pSheet->cellExists($aReferences[0])) {
 					$returnValue[$currentRow][$currentCol] = $pSheet->getCell($aReferences[0])->getCalculatedValue($resetLog);
 				} else {
@@ -3722,7 +3722,7 @@ 
 				// Extract cell data for all cells in the range
 				foreach ($aReferences as $reference) {
 					// Extract range
-					list($currentCol,$currentRow) = PHPExcel_Cell::coordinateFromString($reference);
+					list($currentCol, $currentRow) = PHPExcel_Cell::coordinateFromString($reference);
 //					echo 'NAMED RANGE: $currentCol='.$currentCol.' $currentRow='.$currentRow.'<br />';
 					if ($pSheet->cellExists($reference)) {
 						$returnValue[$currentRow][$currentCol] = $pSheet->getCell($reference)->getCalculatedValue($resetLog);
@@ -3747,7 +3747,7 @@ 
 	 * @return	boolean
 	 */
 	public function isImplemented($pFunction = '') {
-		$pFunction = strtoupper ($pFunction);
+		$pFunction = strtoupper($pFunction);
 		if (isset(self::$_PHPExcelFunctions[$pFunction])) {
 			return (self::$_PHPExcelFunctions[$pFunction]['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY');
 		} else {
@@ -3765,7 +3765,7 @@ 
 		// Return value
 		$returnValue = array();
 		// Loop functions
-		foreach(self::$_PHPExcelFunctions as $functionName => $function) {
+		foreach (self::$_PHPExcelFunctions as $functionName => $function) {
 			if ($function['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY') {
 				$returnValue[$functionName] = new PHPExcel_Calculation_Function($function['category'],
 																				$functionName,
@@ -3797,7 +3797,7 @@ 
 		// Return value
 		$returnValue = array();
 		// Loop functions
-		foreach(self::$_PHPExcelFunctions as $functionName => $function) {
+		foreach (self::$_PHPExcelFunctions as $functionName => $function) {
 			if ($function['functionCall'] != 'PHPExcel_Calculation_Functions::DUMMY') {
 				$returnValue[] = $functionName;
 			}
@@ -3824,7 +3824,7 @@ 
 	}	//	function count()
 
 
-	public function push($type,$value,$reference=null) {
+	public function push($type, $value, $reference = null) {
 		$this->_stack[$this->_count++] = array('type'		=> $type,
 											   'value'		=> $value,
 											   'reference'	=> $reference
@@ -3846,11 +3846,11 @@ 
 	}	//	function pop()
 
 
-	public function last($n=1) {
-		if ($this->_count-$n < 0) {
+	public function last($n = 1) {
+		if ($this->_count - $n < 0) {
 			return null;
 		}
-		return $this->_stack[$this->_count-$n];
+		return $this->_stack[$this->_count - $n];
 	}	//	function last()
 
 

Braces +60 added lines, -22 removed lines

@@ -2208,9 +2208,13 @@ 
 		//	Basic validation that this is indeed a formula
 		//	We return an empty array if not
 		$formula = trim($formula);
-		if ((!isset($formula{0})) || ($formula{0} != '=')) return array();
+		if ((!isset($formula{0})) || ($formula{0} != '=')) {
+			return array();
+		}
 		$formula = ltrim(substr($formula,1));
-		if (!isset($formula{0})) return array();
+		if (!isset($formula{0})) {
+			return array();
+		}
 
 		//	Parse the formula and return the token stack
 		return $this->_parseFormula($formula);
@@ -2263,9 +2267,13 @@ 
 		//	Basic validation that this is indeed a formula
 		//	We simply return the "cell value" (formula) if not
 		$formula = trim($formula);
-		if ($formula{0} != '=') return self::_wrapResult($formula);
+		if ($formula{0} != '=') {
+			return self::_wrapResult($formula);
+		}
 		$formula = ltrim(substr($formula,1));
-		if (!isset($formula{0})) return self::_wrapResult($formula);
+		if (!isset($formula{0})) {
+			return self::_wrapResult($formula);
+		}
 
 		$wsTitle = "\x00Wrk";
 		if ($pCell !== NULL) {
@@ -2715,8 +2723,11 @@ 
 //				echo 'Element is a Closing bracket<br />';
 				$expectingOperand = false;
 				while (($o2 = $stack->pop()) && $o2['value'] != '(') {		//	Pop off the stack back to the last (
-					if ($o2 === NULL) return $this->_raiseFormulaError('Formula Error: Unexpected closing brace ")"');
-					else $output[] = $o2;
+					if ($o2 === NULL) {
+						return $this->_raiseFormulaError('Formula Error: Unexpected closing brace ")"');
+					} else {
+						$output[] = $o2;
+					}
 				}
 				$d = $stack->last(2);
 				if (preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {	//	Did this parenthesis just close a function?
@@ -2794,8 +2805,12 @@ 
 			} elseif ($opCharacter == ',') {			//	Is this the separator for function arguments?
 //				echo 'Element is a Function argument separator<br />';
 				while (($o2 = $stack->pop()) && $o2['value'] != '(') {		//	Pop off the stack back to the last (
-					if ($o2 === NULL) return $this->_raiseFormulaError("Formula Error: Unexpected ,");
-					else $output[] = $o2;	// pop the argument expression stuff and push onto the output
+					if ($o2 === NULL) {
+						return $this->_raiseFormulaError("Formula Error: Unexpected ,");
+					} else {
+						$output[] = $o2;
+					}
+					// pop the argument expression stuff and push onto the output
 				}
 				//	If we've a comma when we're expecting an operand, then what we actually have is a null operand;
 				//		so push a null onto the stack
@@ -2804,8 +2819,9 @@ 
 				}
 				// make sure there was a function
 				$d = $stack->last(2);
-				if (!preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches))
-					return $this->_raiseFormulaError("Formula Error: Unexpected ,");
+				if (!preg_match('/^'.self::CALCULATION_REGEXP_FUNCTION.'$/i', $d['value'], $matches)) {
+									return $this->_raiseFormulaError("Formula Error: Unexpected ,");
+				}
 				$d = $stack->pop();
 				$stack->push($d['type'],++$d['value'],$d['reference']);	// increment the argument count
 				$stack->push('Brace', '(');	// put the ( back on, we'll need to pop back to it again
@@ -2876,12 +2892,16 @@ 
 						if (strpos('!',$startRowColRef) !== false) {
 							list($rangeWS1,$startRowColRef) = explode('!',$startRowColRef);
 						}
-						if ($rangeWS1 != '') $rangeWS1 .= '!';
+						if ($rangeWS1 != '') {
+							$rangeWS1 .= '!';
+						}
 						$rangeWS2 = $rangeWS1;
 						if (strpos('!',$val) !== false) {
 							list($rangeWS2,$val) = explode('!',$val);
 						}
-						if ($rangeWS2 != '') $rangeWS2 .= '!';
+						if ($rangeWS2 != '') {
+							$rangeWS2 .= '!';
+						}
 						if ((is_integer($startRowColRef)) && (ctype_digit($val)) &&
 							($startRowColRef <= 1048576) && ($val <= 1048576)) {
 							//	Row range
@@ -2977,8 +2997,10 @@ 
 		}
 
 		while (($op = $stack->pop()) !== NULL) {	// pop everything off the stack and push onto output
-			if ((is_array($opCharacter) && $opCharacter['value'] == '(') || ($opCharacter === '('))
-				return $this->_raiseFormulaError("Formula Error: Expecting ')'");	// if there are any opening braces on the stack, then braces were unbalanced
+			if ((is_array($opCharacter) && $opCharacter['value'] == '(') || ($opCharacter === '(')) {
+							return $this->_raiseFormulaError("Formula Error: Expecting ')'");
+			}
+			// if there are any opening braces on the stack, then braces were unbalanced
 			$output[] = $op;
 		}
 		return $output;
@@ -3002,7 +3024,9 @@ 
 
 	// evaluate postfix notation
 	private function _processTokenStack($tokens, $cellID = null, PHPExcel_Cell $pCell = null) {
-		if ($tokens == false) return false;
+		if ($tokens == false) {
+			return false;
+		}
 
 		//	If we're using cell caching, then $pCell may well be flushed back to the cache (which detaches the parent worksheet),
 		//		so we store the parent worksheet so that we can re-attach it when necessary
@@ -3019,8 +3043,12 @@ 
 			if (isset(self::$_binaryOperators[$token])) {
 //				echo 'Token is a binary operator<br />';
 				//	We must have two operands, error if we don't
-				if (($operand2Data = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
-				if (($operand1Data = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
+				if (($operand2Data = $stack->pop()) === NULL) {
+					return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
+				}
+				if (($operand1Data = $stack->pop()) === NULL) {
+					return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
+				}
 
 				$operand1 = self::_dataTestReference($operand1Data);
 				$operand2 = self::_dataTestReference($operand2Data);
@@ -3158,7 +3186,9 @@ 
 			// if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
 			} elseif (($token === '~') || ($token === '%')) {
 //				echo 'Token is a unary operator<br />';
-				if (($arg = $stack->pop()) === NULL) return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
+				if (($arg = $stack->pop()) === NULL) {
+					return $this->_raiseFormulaError('Internal error - Operand value missing from stack');
+				}
 				$arg = $arg['value'];
 				if ($token === '~') {
 //					echo 'Token is a negation operator<br />';
@@ -3388,7 +3418,9 @@ 
 			}
 		}
 		// when we're out of tokens, the stack should have a single element, the final result
-		if ($stack->count() != 1) return $this->_raiseFormulaError("internal error");
+		if ($stack->count() != 1) {
+			return $this->_raiseFormulaError("internal error");
+		}
 		$output = $stack->pop();
 		$output = $output['value'];
 
@@ -3502,8 +3534,12 @@ 
 
 	private function _executeNumericBinaryOperation($cellID,$operand1,$operand2,$operation,$matrixFunction,&$stack) {
 		//	Validate the two operands
-		if (!$this->_validateBinaryOperand($cellID,$operand1,$stack)) return false;
-		if (!$this->_validateBinaryOperand($cellID,$operand2,$stack)) return false;
+		if (!$this->_validateBinaryOperand($cellID,$operand1,$stack)) {
+			return false;
+		}
+		if (!$this->_validateBinaryOperand($cellID,$operand2,$stack)) {
+			return false;
+		}
 
 		$executeMatrixOperation = false;
 		//	If either of the operands is a matrix, we need to treat them both as matrices
@@ -3595,7 +3631,9 @@ 
 	protected function _raiseFormulaError($errorMessage) {
 		$this->formulaError = $errorMessage;
 		$this->debugLogStack = array();
-		if (!$this->suppressFormulaErrors) throw new Exception($errorMessage);
+		if (!$this->suppressFormulaErrors) {
+			throw new Exception($errorMessage);
+		}
 		trigger_error($errorMessage, E_USER_ERROR);
 	}	//	function _raiseFormulaError()