From f546be620e19148bb65c3ae7f18e7b20b4d74ec0 Mon Sep 17 00:00:00 2001
From: Progi1984 <progi1984@gmail.com>
Date: Tue, 22 Mar 2016 16:26:31 +0100
Subject: [PATCH] #401 : Support for namespaces

---
 src/PhpSpreadsheet/Calculation/Statistical.php         | 1 -
 src/PhpSpreadsheet/NamedRange.php                      | 4 ++--
 src/PhpSpreadsheet/Shared/trend/exponentialBestFit.php | 2 +-
 src/PhpSpreadsheet/Shared/trend/linearBestFit.php      | 2 +-
 src/PhpSpreadsheet/Shared/trend/logarithmicBestFit.php | 2 +-
 src/PhpSpreadsheet/Shared/trend/polynomialBestFit.php  | 2 +-
 src/PhpSpreadsheet/Shared/trend/powerBestFit.php       | 2 +-
 src/PhpSpreadsheet/Worksheet.php                       | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/PhpSpreadsheet/Calculation/Statistical.php b/src/PhpSpreadsheet/Calculation/Statistical.php
index 43cea81e..0ba90b13 100644
--- a/src/PhpSpreadsheet/Calculation/Statistical.php
+++ b/src/PhpSpreadsheet/Calculation/Statistical.php
@@ -2,7 +2,6 @@
 
 namespace PHPExcel\Calculation;
 
-
 /** LOG_GAMMA_X_MAX_VALUE */
 define('LOG_GAMMA_X_MAX_VALUE', 2.55e305);
 
diff --git a/src/PhpSpreadsheet/NamedRange.php b/src/PhpSpreadsheet/NamedRange.php
index c8048889..fdad0929 100644
--- a/src/PhpSpreadsheet/NamedRange.php
+++ b/src/PhpSpreadsheet/NamedRange.php
@@ -74,7 +74,7 @@ class NamedRange
      * @param Worksheet|null $pScope    Scope. Only applies when $pLocalOnly = true. Null for global scope.
      * @throws Exception
      */
-    public function __construct($pName = null, Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null)
+    public function __construct($pName, Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null)
     {
         // Validate data
         if (($pName === null) || ($pWorksheet === null) || ($pRange === null)) {
@@ -229,7 +229,7 @@ class NamedRange
      * @param Worksheet|null $pSheet Scope. Use null for global scope
      * @return NamedRange
      */
-    public static function resolveRange($pNamedRange = '', Worksheet $pSheet)
+    public static function resolveRange($pNamedRange, Worksheet $pSheet)
     {
         return $pSheet->getParent()->getNamedRange($pNamedRange, $pSheet);
     }
diff --git a/src/PhpSpreadsheet/Shared/trend/exponentialBestFit.php b/src/PhpSpreadsheet/Shared/trend/exponentialBestFit.php
index b3a5117b..be705165 100644
--- a/src/PhpSpreadsheet/Shared/trend/exponentialBestFit.php
+++ b/src/PhpSpreadsheet/Shared/trend/exponentialBestFit.php
@@ -27,7 +27,7 @@ namespace PHPExcel\Shared\trend;
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-class exponentialBestFit extends bestFit
+class ExponentialBestFit extends BestFit
 {
     /**
      * Algorithm type to use for best-fit
diff --git a/src/PhpSpreadsheet/Shared/trend/linearBestFit.php b/src/PhpSpreadsheet/Shared/trend/linearBestFit.php
index 20ab8abf..0fad3072 100644
--- a/src/PhpSpreadsheet/Shared/trend/linearBestFit.php
+++ b/src/PhpSpreadsheet/Shared/trend/linearBestFit.php
@@ -27,7 +27,7 @@ namespace PHPExcel\Shared\trend;
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-class linearBestFit extends bestFit
+class LinearBestFit extends BestFit
 {
     /**
      * Algorithm type to use for best-fit
diff --git a/src/PhpSpreadsheet/Shared/trend/logarithmicBestFit.php b/src/PhpSpreadsheet/Shared/trend/logarithmicBestFit.php
index 028517c2..a0bfc59f 100644
--- a/src/PhpSpreadsheet/Shared/trend/logarithmicBestFit.php
+++ b/src/PhpSpreadsheet/Shared/trend/logarithmicBestFit.php
@@ -27,7 +27,7 @@ namespace PHPExcel\Shared\trend;
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-class logarithmicBestFit extends bestFit
+class LogarithmicBestFit extends BestFit
 {
     /**
      * Algorithm type to use for best-fit
diff --git a/src/PhpSpreadsheet/Shared/trend/polynomialBestFit.php b/src/PhpSpreadsheet/Shared/trend/polynomialBestFit.php
index b439d355..0c2c5894 100644
--- a/src/PhpSpreadsheet/Shared/trend/polynomialBestFit.php
+++ b/src/PhpSpreadsheet/Shared/trend/polynomialBestFit.php
@@ -27,7 +27,7 @@ namespace PHPExcel\Shared\trend;
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-class polynomialBestFit extends bestFit
+class PolynomialBestFit extends BestFit
 {
     /**
      * Algorithm type to use for best-fit
diff --git a/src/PhpSpreadsheet/Shared/trend/powerBestFit.php b/src/PhpSpreadsheet/Shared/trend/powerBestFit.php
index c395466c..c228cfa3 100644
--- a/src/PhpSpreadsheet/Shared/trend/powerBestFit.php
+++ b/src/PhpSpreadsheet/Shared/trend/powerBestFit.php
@@ -27,7 +27,7 @@ namespace PHPExcel\Shared\trend;
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-class powerBestFit extends bestFit
+class PowerBestFit extends BestFit
 {
     /**
      * Algorithm type to use for best-fit
diff --git a/src/PhpSpreadsheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet.php
index c57df5db..8fe4e1e6 100644
--- a/src/PhpSpreadsheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet.php
@@ -1476,7 +1476,7 @@ class Worksheet implements IComparable
      * @param $pValue Style\Conditional[]
      * @return Worksheet
      */
-    public function setConditionalStyles($pCoordinate = 'A1', $pValue)
+    public function setConditionalStyles($pCoordinate, $pValue)
     {
         $this->conditionalStylesCollection[strtoupper($pCoordinate)] = $pValue;
         return $this;