PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Calculation/Statistical.php

Doc Comments +6 added lines, -44 removed lines

@@ -130,7 +130,7 @@ 
      *
      * @param p require p>0
      * @param q require q>0
-     * @return 0 if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
+     * @return double if p<=0, q<=0 or p+q>2.55E305 to avoid errors and over/underflow
      * @author Jaco van Kooten
      */
     private static function logBeta($p, $q)
@@ -152,6 +152,8 @@ 
      * Evaluates of continued fraction part of incomplete beta function.
      * Based on an idea from Numerical Recipes (W.H. Press et al, 1992).
      * @author Jaco van Kooten
+     * @param double $p
+     * @param double $q
      */
     private static function betaFraction($x, $p, $q)
     {
@@ -708,7 +710,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function AVEDEV()
@@ -757,7 +758,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function AVERAGE()
@@ -800,7 +800,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function AVERAGEA()
@@ -847,7 +846,6 @@ 
      *
      * @access    public
      * @category Mathematical and Trigonometric Functions
-     * @param    mixed        $arg,...        Data values
      * @param    string        $condition        The criteria that defines which cells will be checked.
      * @param    mixed[]        $averageArgs    Data values
      * @return    float
@@ -892,7 +890,6 @@ 
      * @param    float        $value            Value at which you want to evaluate the distribution
      * @param    float        $alpha            Parameter to the distribution
      * @param    float        $beta            Parameter to the distribution
-     * @param    boolean        $cumulative
      * @return    float
      *
      */
@@ -929,9 +926,8 @@ 
      * @param    float        $probability    Probability at which you want to evaluate the distribution
      * @param    float        $alpha            Parameter to the distribution
      * @param    float        $beta            Parameter to the distribution
-     * @param    float        $rMin            Minimum value
-     * @param    float        $rMax            Maximum value
-     * @param    boolean        $cumulative
+     * @param    integer        $rMin            Minimum value
+     * @param    integer        $rMax            Maximum value
      * @return    float
      *
      */
@@ -1180,7 +1176,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    int
      */
     public static function COUNT()
@@ -1214,7 +1209,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    int
      */
     public static function COUNTA()
@@ -1244,7 +1238,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    int
      */
     public static function COUNTBLANK()
@@ -1274,7 +1267,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @param    string        $condition        The criteria that defines which cells will be counted.
      * @return    int
      */
@@ -1462,7 +1454,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function DEVSQ()
@@ -1744,7 +1735,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function GEOMEAN()
@@ -1805,7 +1795,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function HARMEAN()
@@ -1961,8 +1950,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
-     * @param    int            $entry            Position (ordered from the largest) in the array or range of data to return
      * @return    float
      *
      */
@@ -2187,7 +2174,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function MAX()
@@ -2222,7 +2208,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function MAXA()
@@ -2262,7 +2247,6 @@ 
      *
      * @access    public
      * @category Mathematical and Trigonometric Functions
-     * @param    mixed        $arg,...        Data values
      * @param    string        $condition        The criteria that defines which cells will be checked.
      * @return    float
      */
@@ -2302,7 +2286,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function MEDIAN()
@@ -2346,7 +2329,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function MIN()
@@ -2381,7 +2363,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function MINA()
@@ -2421,7 +2402,6 @@ 
      *
      * @access    public
      * @category Mathematical and Trigonometric Functions
-     * @param    mixed        $arg,...        Data values
      * @param    string        $condition        The criteria that defines which cells will be checked.
      * @return    float
      */
@@ -2499,7 +2479,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function MODE()
@@ -2604,9 +2583,9 @@ 
      *
      * Returns the inverse of the normal cumulative distribution for the specified mean and standard deviation.
      *
-     * @param    float        $value
      * @param    float        $mean        Mean Value
      * @param    float        $stdDev        Standard Deviation
+     * @param double $probability
      * @return    float
      *
      */
@@ -2671,8 +2650,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
-     * @param    float        $entry            Percentile value in the range 0..1, inclusive.
      * @return    float
      */
     public static function PERCENTILE()
@@ -2836,8 +2813,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
-     * @param    int            $entry            Quartile value in the range 1..3, inclusive.
      * @return    float
      */
     public static function QUARTILE()
@@ -2999,8 +2974,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
-     * @param    int            $entry            Position (ordered from the smallest) in the array or range of data to return
      * @return    float
      */
     public static function SMALL()
@@ -3067,7 +3040,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function STDEV()
@@ -3115,7 +3087,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function STDEVA()
@@ -3166,7 +3137,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function STDEVP()
@@ -3212,7 +3182,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function STDEVPA()
@@ -3445,8 +3414,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
-     * @param    float        $discard        Percentage to discard
      * @return    float
      */
     public static function TRIMMEAN()
@@ -3489,7 +3456,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function VARFunc()
@@ -3532,7 +3498,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function VARA()
@@ -3584,7 +3549,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function VARP()
@@ -3628,7 +3592,6 @@ 
      *
      * @access    public
      * @category Statistical Functions
-     * @param    mixed        $arg,...        Data values
      * @return    float
      */
     public static function VARPA()
@@ -3714,7 +3677,6 @@ 
      * @param    float        $dataSet
      * @param    float        $m0        Alpha Parameter
      * @param    float        $sigma    Beta Parameter
-     * @param    boolean        $cumulative
      * @return    float
      *
      */

Spacing +38 added lines, -38 removed lines

@@ -167,10 +167,10 @@ 
         $frac = $h;
         $m     = 1;
         $delta = 0.0;
-        while ($m <= MAX_ITERATIONS && abs($delta-1.0) > PRECISION) {
+        while ($m <= MAX_ITERATIONS && abs($delta - 1.0) > PRECISION) {
             $m2 = 2 * $m;
             // even index for d
-            $d = $m * ($q - $m) * $x / ( ($p_minus + $m2) * ($p + $m2));
+            $d = $m * ($q - $m) * $x / (($p_minus + $m2) * ($p + $m2));
             $h = 1.0 + $d * $h;
             if (abs($h) < XMININ) {
                 $h = XMININ;
@@ -314,7 +314,7 @@ 
             341747634550.7377132798597,
             446315818741.9713286462081
         );
-        static $lg_c  = array(
+        static $lg_c = array(
             -0.001910444077728,
             8.4171387781295e-4,
             -5.952379913043012e-4,
@@ -428,14 +428,14 @@ 
     {
         static $max = 32;
         $summer = 0;
-        for ($n=0; $n<=$max; ++$n) {
+        for ($n = 0; $n <= $max; ++$n) {
             $divisor = $a;
-            for ($i=1; $i<=$n; ++$i) {
+            for ($i = 1; $i <= $n; ++$i) {
                 $divisor *= ($a + $i);
             }
             $summer += (pow($x, $n) / $divisor);
         }
-        return pow($x, $a) * exp(0-$x) * $summer;
+        return pow($x, $a) * exp(0 - $x) * $summer;
     }
 
 
@@ -463,7 +463,7 @@ 
         $tmp -= ($x + 0.5) * log($tmp);
 
         $summer = $p0;
-        for ($j=1; $j<=6; ++$j) {
+        for ($j = 1; $j <= 6; ++$j) {
             $summer += ($p[$j] / ++$y);
         }
         return exp(0 - $tmp + log(SQRT2PI * $summer / $x));
@@ -527,8 +527,8 @@ 
         );
 
         //    Define lower and upper region break-points.
-        $p_low = 0.02425;            //Use lower region approx. below this
-        $p_high = 1 - $p_low;        //Use upper region approx. above this
+        $p_low = 0.02425; //Use lower region approx. below this
+        $p_high = 1 - $p_low; //Use upper region approx. above this
 
         if (0 < $p && $p < $p_low) {
             //    Rational approximation for lower region.
@@ -868,7 +868,7 @@ 
             if (!is_numeric($arg)) {
                 $arg = \PHPExcel\Calculation::wrapResult(strtoupper($arg));
             }
-            $testCondition = '='.$arg.$condition;
+            $testCondition = '=' . $arg . $condition;
             if (\PHPExcel\Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 if ((is_null($returnValue)) || ($arg > $returnValue)) {
                     $returnValue += $arg;
@@ -1015,7 +1015,7 @@ 
                     }
                     return $summer;
                 } else {
-                    return MathTrig::COMBIN($trials, $value) * pow($probability, $value) * pow(1 - $probability, $trials - $value) ;
+                    return MathTrig::COMBIN($trials, $value) * pow($probability, $value) * pow(1 - $probability, $trials - $value);
                 }
             }
         }
@@ -1047,7 +1047,7 @@ 
                 }
                 return Functions::NAN();
             }
-            return 1 - (self::incompleteGamma($degrees/2, $value/2) / self::gamma($degrees/2));
+            return 1 - (self::incompleteGamma($degrees / 2, $value / 2) / self::gamma($degrees / 2));
         }
         return Functions::VALUE();
     }
@@ -1072,7 +1072,7 @@ 
             $xHi = 0;
 
             $x = $xNew = 1;
-            $dx    = 1;
+            $dx = 1;
             $i = 0;
 
             while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
@@ -1289,7 +1289,7 @@ 
             if (!is_numeric($arg)) {
                 $arg = \PHPExcel\Calculation::wrapResult(strtoupper($arg));
             }
-            $testCondition = '='.$arg.$condition;
+            $testCondition = '=' . $arg . $condition;
             if (\PHPExcel\Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 // Is it a value within our criteria
                 ++$returnValue;
@@ -1517,9 +1517,9 @@ 
      */
     public static function EXPONDIST($value, $lambda, $cumulative)
     {
-        $value    = Functions::flattenSingleValue($value);
-        $lambda    = Functions::flattenSingleValue($lambda);
-        $cumulative    = Functions::flattenSingleValue($cumulative);
+        $value = Functions::flattenSingleValue($value);
+        $lambda = Functions::flattenSingleValue($lambda);
+        $cumulative = Functions::flattenSingleValue($cumulative);
 
         if ((is_numeric($value)) && (is_numeric($lambda))) {
             if (($value < 0) || ($lambda < 0)) {
@@ -1527,9 +1527,9 @@ 
             }
             if ((is_numeric($cumulative)) || (is_bool($cumulative))) {
                 if ($cumulative) {
-                    return 1 - exp(0-$value*$lambda);
+                    return 1 - exp(0 - $value * $lambda);
                 } else {
-                    return $lambda * exp(0-$value*$lambda);
+                    return $lambda * exp(0 - $value * $lambda);
                 }
             }
         }
@@ -1549,13 +1549,13 @@ 
      */
     public static function FISHER($value)
     {
-        $value    = Functions::flattenSingleValue($value);
+        $value = Functions::flattenSingleValue($value);
 
         if (is_numeric($value)) {
             if (($value <= -1) || ($value >= 1)) {
                 return Functions::NAN();
             }
-            return 0.5 * log((1+$value)/(1-$value));
+            return 0.5 * log((1 + $value) / (1 - $value));
         }
         return Functions::VALUE();
     }
@@ -1573,7 +1573,7 @@ 
      */
     public static function FISHERINV($value)
     {
-        $value    = Functions::flattenSingleValue($value);
+        $value = Functions::flattenSingleValue($value);
 
         if (is_numeric($value)) {
             return (exp(2 * $value) - 1) / (exp(2 * $value) + 1);
@@ -1594,7 +1594,7 @@ 
      */
     public static function FORECAST($xValue, $yValues, $xValues)
     {
-        $xValue    = Functions::flattenSingleValue($xValue);
+        $xValue = Functions::flattenSingleValue($xValue);
         if (!is_numeric($xValue)) {
             return Functions::VALUE();
         } elseif (!self::checkTrendArrays($yValues, $xValues)) {
@@ -1640,7 +1640,7 @@ 
                 if ($cumulative) {
                     return self::incompleteGamma($a, $value / $b) / self::gamma($a);
                 } else {
-                    return (1 / (pow($b, $a) * self::gamma($a))) * pow($value, $a-1) * exp(0-($value / $b));
+                    return (1 / (pow($b, $a) * self::gamma($a))) * pow($value, $a - 1) * exp(0 - ($value / $b));
                 }
             }
         }
@@ -1720,7 +1720,7 @@ 
      */
     public static function GAMMALN($value)
     {
-        $value    = Functions::flattenSingleValue($value);
+        $value = Functions::flattenSingleValue($value);
 
         if (is_numeric($value)) {
             if ($value <= 0) {
@@ -1753,7 +1753,7 @@ 
 
         $aMean = MathTrig::PRODUCT($aArgs);
         if (is_numeric($aMean) && ($aMean > 0)) {
-            $aCount = self::COUNT($aArgs) ;
+            $aCount = self::COUNT($aArgs);
             if (self::MIN($aArgs) > 0) {
                 return pow($aMean, (1 / $aCount));
             }
@@ -1943,7 +1943,7 @@ 
 
             // Return
             if ($count > 3) {
-                return $summer * ($count * ($count+1) / (($count-1) * ($count-2) * ($count-3))) - (3 * pow($count-1, 2) / (($count-2) * ($count-3)));
+                return $summer * ($count * ($count + 1) / (($count - 1) * ($count - 2) * ($count - 3))) - (3 * pow($count - 1, 2) / (($count - 2) * ($count - 3)));
             }
         }
         return Functions::DIV0();
@@ -2281,7 +2281,7 @@ 
             if (!is_numeric($arg)) {
                 $arg = \PHPExcel\Calculation::wrapResult(strtoupper($arg));
             }
-            $testCondition = '='.$arg.$condition;
+            $testCondition = '=' . $arg . $condition;
             if (\PHPExcel\Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 if ((is_null($returnValue)) || ($arg > $returnValue)) {
                     $returnValue = $arg;
@@ -2440,7 +2440,7 @@ 
             if (!is_numeric($arg)) {
                 $arg = \PHPExcel\Calculation::wrapResult(strtoupper($arg));
             }
-            $testCondition = '='.$arg.$condition;
+            $testCondition = '=' . $arg . $condition;
             if (\PHPExcel\Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
                 if ((is_null($returnValue)) || ($arg < $returnValue)) {
                     $returnValue = $arg;
@@ -2697,14 +2697,14 @@ 
             if ($mValueCount > 0) {
                 sort($mArgs);
                 $count = self::COUNT($mArgs);
-                $index = $entry * ($count-1);
+                $index = $entry * ($count - 1);
                 $iBase = floor($index);
                 if ($index == $iBase) {
                     return $mArgs[$index];
                 } else {
                     $iNext = $iBase + 1;
                     $iProportion = $index - $iBase;
-                    return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion) ;
+                    return $mArgs[$iBase] + (($mArgs[$iNext] - $mArgs[$iBase]) * $iProportion);
                 }
             }
         }
@@ -2816,9 +2816,9 @@ 
                     for ($i = 0; $i <= floor($value); ++$i) {
                         $summer += pow($mean, $i) / MathTrig::FACT($i);
                     }
-                    return exp(0-$mean) * $summer;
+                    return exp(0 - $mean) * $summer;
                 } else {
-                    return (exp(0-$mean) * pow($mean, $value)) / MathTrig::FACT($value);
+                    return (exp(0 - $mean) * pow($mean, $value)) / MathTrig::FACT($value);
                 }
             }
         }
@@ -2954,7 +2954,7 @@ 
         }
 
         if ($count > 2) {
-            return $summer * ($count / (($count-1) * ($count-2)));
+            return $summer * ($count / (($count - 1) * ($count - 2)));
         }
         return Functions::DIV0();
     }
@@ -3050,7 +3050,7 @@ 
             if ($stdDev <= 0) {
                 return Functions::NAN();
             }
-            return ($value - $mean) / $stdDev ;
+            return ($value - $mean) / $stdDev;
         }
         return Functions::VALUE();
     }
@@ -3294,7 +3294,7 @@ 
     public static function TDIST($value, $degrees, $tails)
     {
         $value        = Functions::flattenSingleValue($value);
-        $degrees    = floor(Functions::flattenSingleValue($degrees));
+        $degrees = floor(Functions::flattenSingleValue($degrees));
         $tails        = floor(Functions::flattenSingleValue($tails));
 
         if ((is_numeric($value)) && (is_numeric($degrees)) && (is_numeric($tails))) {
@@ -3364,7 +3364,7 @@ 
             $xHi = 0;
 
             $x = $xNew = 1;
-            $dx    = 1;
+            $dx = 1;
             $i = 0;
 
             while ((abs($dx) > PRECISION) && ($i++ < MAX_ITERATIONS)) {
@@ -3469,7 +3469,7 @@ 
             }
             $discard = floor(self::COUNT($mArgs) * $percent / 2);
             sort($mArgs);
-            for ($i=0; $i < $discard; ++$i) {
+            for ($i = 0; $i < $discard; ++$i) {
                 array_pop($mArgs);
                 array_shift($mArgs);
             }

src/PhpSpreadsheet/Calculation/TextData.php

Doc Comments +6 added lines, -6 removed lines

@@ -56,7 +56,7 @@ 
      * CHARACTER
      *
      * @param    string    $character    Value
-     * @return    int
+     * @return    string
      */
     public static function CHARACTER($character)
     {
@@ -186,7 +186,7 @@ 
      * This function converts a number to text using currency format, with the decimals rounded to the specified place.
      * The format used is $#,##0.00_);($#,##0.00)..
      *
-     * @param    float    $value            The value to format
+     * @param    integer    $value            The value to format
      * @param    int        $decimals        The number of digits to display to the right of the decimal point.
      *                                    If decimals is negative, number is rounded to the left of the decimal point.
      *                                    If you omit decimals, it is assumed to be 2
@@ -299,7 +299,7 @@ 
      * @param    mixed        $value    Value to check
      * @param    integer        $decimals
      * @param    boolean        $no_commas
-     * @return    boolean
+     * @return    string
      */
     public static function FIXEDFORMAT($value, $decimals = 2, $no_commas = false)
     {
@@ -418,7 +418,7 @@ 
      * STRINGLENGTH
      *
      * @param    string    $value    Value
-     * @return    string
+     * @return    integer
      */
     public static function STRINGLENGTH($value = '')
     {
@@ -571,7 +571,7 @@ 
      * RETURNSTRING
      *
      * @param    mixed    $testValue    Value to check
-     * @return    boolean
+     * @return    string|null
      */
     public static function RETURNSTRING($testValue = '')
     {
@@ -589,7 +589,7 @@ 
      *
      * @param    mixed    $value    Value to check
      * @param    string    $format    Format mask to use
-     * @return    boolean
+     * @return    string
      */
     public static function TEXTFORMAT($value, $format)
     {

Spacing +17 added lines, -17 removed lines

@@ -33,18 +33,18 @@ 
 
     private static function unicodeToOrd($c)
     {
-        if (ord($c{0}) >=0 && ord($c{0}) <= 127) {
+        if (ord($c{0}) >= 0 && ord($c{0}) <= 127) {
             return ord($c{0});
         } elseif (ord($c{0}) >= 192 && ord($c{0}) <= 223) {
-            return (ord($c{0})-192)*64 + (ord($c{1})-128);
+            return (ord($c{0}) - 192) * 64 + (ord($c{1}) - 128);
         } elseif (ord($c{0}) >= 224 && ord($c{0}) <= 239) {
-            return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128);
+            return (ord($c{0}) - 224) * 4096 + (ord($c{1}) - 128) * 64 + (ord($c{2}) - 128);
         } elseif (ord($c{0}) >= 240 && ord($c{0}) <= 247) {
-            return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128);
+            return (ord($c{0}) - 240) * 262144 + (ord($c{1}) - 128) * 4096 + (ord($c{2}) - 128) * 64 + (ord($c{3}) - 128);
         } elseif (ord($c{0}) >= 248 && ord($c{0}) <= 251) {
-            return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128);
+            return (ord($c{0}) - 248) * 16777216 + (ord($c{1}) - 128) * 262144 + (ord($c{2}) - 128) * 4096 + (ord($c{3}) - 128) * 64 + (ord($c{4}) - 128);
         } elseif (ord($c{0}) >= 252 && ord($c{0}) <= 253) {
-            return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128);
+            return (ord($c{0}) - 252) * 1073741824 + (ord($c{1}) - 128) * 16777216 + (ord($c{2}) - 128) * 262144 + (ord($c{3}) - 128) * 4096 + (ord($c{4}) - 128) * 64 + (ord($c{5}) - 128);
         } elseif (ord($c{0}) >= 254 && ord($c{0}) <= 255) {
             // error
             return Functions::VALUE();
@@ -67,7 +67,7 @@ 
         }
 
         if (function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding('&#'.intval($character).';', 'UTF-8', 'HTML-ENTITIES');
+            return mb_convert_encoding('&#' . intval($character) . ';', 'UTF-8', 'HTML-ENTITIES');
         } else {
             return chr(intval($character));
         }
@@ -82,7 +82,7 @@ 
      */
     public static function TRIMNONPRINTABLE($stringValue = '')
     {
-        $stringValue    = Functions::flattenSingleValue($stringValue);
+        $stringValue = Functions::flattenSingleValue($stringValue);
 
         if (is_bool($stringValue)) {
             return ($stringValue) ? \PHPExcel\Calculation::getTRUE() : \PHPExcel\Calculation::getFALSE();
@@ -130,7 +130,7 @@ 
         if (($characters === null) || ($characters === '')) {
             return Functions::VALUE();
         }
-        $characters    = Functions::flattenSingleValue($characters);
+        $characters = Functions::flattenSingleValue($characters);
         if (is_bool($characters)) {
             if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE) {
                 $characters = (int) $characters;
@@ -194,8 +194,8 @@ 
      */
     public static function DOLLAR($value = 0, $decimals = 2)
     {
-        $value        = Functions::flattenSingleValue($value);
-        $decimals    = is_null($decimals) ? 0 : Functions::flattenSingleValue($decimals);
+        $value = Functions::flattenSingleValue($value);
+        $decimals = is_null($decimals) ? 0 : Functions::flattenSingleValue($decimals);
 
         // Validate parameters
         if (!is_numeric($value) || !is_numeric($decimals)) {
@@ -209,7 +209,7 @@ 
         } else {
             $round = pow(10, abs($decimals));
             if ($value < 0) {
-                $round = 0-$round;
+                $round = 0 - $round;
             }
             $value = MathTrig::MROUND($value, $round);
         }
@@ -512,10 +512,10 @@ 
         $chars   = Functions::flattenSingleValue($chars);
         $newText = Functions::flattenSingleValue($newText);
 
-        $left = self::LEFT($oldText, $start-1);
-        $right = self::RIGHT($oldText, self::STRINGLENGTH($oldText)-($start+$chars)+1);
+        $left = self::LEFT($oldText, $start - 1);
+        $right = self::RIGHT($oldText, self::STRINGLENGTH($oldText) - ($start + $chars) + 1);
 
-        return $left.$newText.$right;
+        return $left . $newText . $right;
     }
 
 
@@ -545,9 +545,9 @@ 
             $pos = -1;
             while ($instance > 0) {
                 if (function_exists('mb_strpos')) {
-                    $pos = mb_strpos($text, $fromText, $pos+1, 'UTF-8');
+                    $pos = mb_strpos($text, $fromText, $pos + 1, 'UTF-8');
                 } else {
-                    $pos = strpos($text, $fromText, $pos+1);
+                    $pos = strpos($text, $fromText, $pos + 1);
                 }
                 if ($pos === false) {
                     break;

src/PhpSpreadsheet/Cell.php

Doc Comments +3 added lines, -3 removed lines

@@ -93,7 +93,7 @@ 
     /**
      *    Send notification to the cache controller
      *
-     *    @return void
+     *    @return Cell
      **/
     public function notifyCacheController()
     {
@@ -580,7 +580,7 @@ 
      *    Coordinate from string
      *
      *    @param    string    $pCoordinateString
-     *    @return    array    Array containing column and row (indexes 0 and 1)
+     *    @return    string[]    Array containing column and row (indexes 0 and 1)
      *    @throws    Exception
      */
     public static function coordinateFromString($pCoordinateString = 'A1')
@@ -760,7 +760,7 @@ 
      *    Calculate range boundaries
      *
      *    @param    string    $pRange        Cell range (e.g. A1:A1)
-     *    @return    array    Range coordinates array(Start Cell, End Cell)
+     *    @return    integer    Range coordinates array(Start Cell, End Cell)
      *                    where Start Cell and End Cell are arrays (Column ID, Row Number)
      */
     public static function getRangeBoundaries($pRange = 'A1:A1')

Indentation +4 added lines, -4 removed lines

@@ -573,7 +573,7 @@ 
         // Verify if cell is in range
         return (($rangeStart[0] <= $myColumn) && ($rangeEnd[0] >= $myColumn) &&
                 ($rangeStart[1] <= $myRow) && ($rangeEnd[1] >= $myRow)
-               );
+                );
     }
 
     /**
@@ -845,11 +845,11 @@ 
                 $_indexCache[$pColumnIndex] = chr(65 + $pColumnIndex);
             } elseif ($pColumnIndex < 702) {
                 $_indexCache[$pColumnIndex] = chr(64 + ($pColumnIndex / 26)) .
-                                              chr(65 + $pColumnIndex % 26);
+                                                chr(65 + $pColumnIndex % 26);
             } else {
                 $_indexCache[$pColumnIndex] = chr(64 + (($pColumnIndex - 26) / 676)) .
-                                              chr(65 + ((($pColumnIndex - 26) % 676) / 26)) .
-                                              chr(65 + $pColumnIndex % 26);
+                                                chr(65 + ((($pColumnIndex - 26) % 676) / 26)) .
+                                                chr(65 + $pColumnIndex % 26);
             }
         }
         return $_indexCache[$pColumnIndex];

Spacing +10 added lines, -10 removed lines

@@ -291,7 +291,7 @@ 
 //echo 'Calculation Exception: '.$ex->getMessage().PHP_EOL;
                 $result = '#N/A';
                 throw new Calculation\Exception(
-                    $this->getWorksheet()->getTitle().'!'.$this->getCoordinate().' -> '.$ex->getMessage()
+                    $this->getWorksheet()->getTitle() . '!' . $this->getCoordinate() . ' -> ' . $ex->getMessage()
                 );
             }
 
@@ -586,14 +586,14 @@ 
     public static function coordinateFromString($pCoordinateString = 'A1')
     {
         if (preg_match("/^([$]?[A-Z]{1,3})([$]?\d{1,7})$/", $pCoordinateString, $matches)) {
-            return array($matches[1],$matches[2]);
+            return array($matches[1], $matches[2]);
         } elseif ((strpos($pCoordinateString, ':') !== false) || (strpos($pCoordinateString, ',') !== false)) {
             throw new Exception('Cell coordinate string can not be a range of cells');
         } elseif ($pCoordinateString == '') {
             throw new Exception('Cell coordinate can not be zero-length string');
         }
 
-        throw new Exception('Invalid cell coordinate '.$pCoordinateString);
+        throw new Exception('Invalid cell coordinate ' . $pCoordinateString);
     }
 
     /**
@@ -733,11 +733,11 @@ 
 
         // Calculate range outer borders
         $rangeStart = self::coordinateFromString($rangeA);
-        $rangeEnd    = self::coordinateFromString($rangeB);
+        $rangeEnd = self::coordinateFromString($rangeB);
 
         // Translate column into index
-        $rangeStart[0]    = self::columnIndexFromString($rangeStart[0]);
-        $rangeEnd[0]    = self::columnIndexFromString($rangeEnd[0]);
+        $rangeStart[0] = self::columnIndexFromString($rangeStart[0]);
+        $rangeEnd[0] = self::columnIndexFromString($rangeEnd[0]);
 
         return array($rangeStart, $rangeEnd);
     }
@@ -753,7 +753,7 @@ 
         // Calculate range outer borders
         list($rangeStart, $rangeEnd) = self::rangeBoundaries($pRange);
 
-        return array( ($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1) );
+        return array(($rangeEnd[0] - $rangeStart[0] + 1), ($rangeEnd[1] - $rangeStart[1] + 1));
     }
 
     /**
@@ -780,7 +780,7 @@ 
             list($rangeA, $rangeB) = explode(':', $pRange);
         }
 
-        return array( self::coordinateFromString($rangeA), self::coordinateFromString($rangeB));
+        return array(self::coordinateFromString($rangeA), self::coordinateFromString($rangeB));
     }
 
     /**
@@ -885,7 +885,7 @@ 
                 }
 
                 // Range...
-                list($rangeStart, $rangeEnd)    = $range;
+                list($rangeStart, $rangeEnd) = $range;
                 sscanf($rangeStart, '%[A-Z]%d', $startCol, $startRow);
                 sscanf($rangeEnd, '%[A-Z]%d', $endCol, $endRow);
                 ++$endCol;
@@ -897,7 +897,7 @@ 
                 // Loop cells
                 while ($currentCol != $endCol) {
                     while ($currentRow <= $endRow) {
-                        $returnValue[] = $currentCol.$currentRow;
+                        $returnValue[] = $currentCol . $currentRow;
                         ++$currentRow;
                     }
                     ++$currentCol;

src/PhpSpreadsheet/Chart/Axis.php

Doc Comments +1 added lines, -5 removed lines

@@ -332,7 +332,7 @@ 
     /**
      * Set Shadow Properties
      *
-     * @param int $shadow_presets
+     * @param int $sh_presets
      * @param string $sh_color_value
      * @param string $sh_color_type
      * @param string $sh_color_alpha
@@ -467,10 +467,6 @@ 
     /**
      * Get Glow Property
      *
-     * @param float $size
-     * @param string $color_value
-     * @param int $color_alpha
-     * @param string $color_type
      */
     public function getShadowProperty($elements)
     {

src/PhpSpreadsheet/Chart/DataSeries.php

Doc Comments +3 added lines, -3 removed lines

@@ -180,7 +180,7 @@ 
     /**
      * Get Plot Grouping Type
      *
-     * @return string
+     * @return boolean
      */
     public function getPlotGrouping()
     {
@@ -202,7 +202,7 @@ 
     /**
      * Get Plot Direction
      *
-     * @return string
+     * @return boolean
      */
     public function getPlotDirection()
     {
@@ -344,7 +344,7 @@ 
     /**
      * Get Smooth Line
      *
-     * @return boolean
+     * @return string
      */
     public function getSmoothLine()
     {

Spacing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
     const TYPE_PIECHART        = 'pieChart';
     const TYPE_PIECHART_3D     = 'pie3DChart';
     const TYPE_DOUGHTNUTCHART  = 'doughnutChart';
-    const TYPE_DONUTCHART      = self::TYPE_DOUGHTNUTCHART;    //    Synonym
+    const TYPE_DONUTCHART      = self::TYPE_DOUGHTNUTCHART; //    Synonym
     const TYPE_SCATTERCHART    = 'scatterChart';
     const TYPE_SURFACECHART    = 'surfaceChart';
     const TYPE_SURFACECHART_3D = 'surface3DChart';
     const TYPE_RADARCHART      = 'radarChart';
     const TYPE_BUBBLECHART     = 'bubbleChart';
     const TYPE_STOCKCHART      = 'stockChart';
-    const TYPE_CANDLECHART     = self::TYPE_STOCKCHART;       //    Synonym
+    const TYPE_CANDLECHART     = self::TYPE_STOCKCHART; //    Synonym
 
     const GROUPING_CLUSTERED       = 'clustered';
     const GROUPING_STACKED         = 'stacked';

src/PhpSpreadsheet/Chart/DataSeriesValues.php

Doc Comments +3 added lines, -2 removed lines

@@ -82,6 +82,7 @@ 
 
     /**
      * Create a new DataSeriesValues object
+     * @param string $dataSource
      */
     public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = array(), $marker = null)
     {
@@ -211,7 +212,7 @@ 
     /**
      * Identify if the Data Series is a multi-level or a simple series
      *
-     * @return    boolean
+     * @return    boolean|null
      */
     public function isMultiLevelSeries()
     {
@@ -224,7 +225,7 @@ 
     /**
      * Return the level count of a multi-level Data Series
      *
-     * @return    boolean
+     * @return    integer
      */
     public function multiLevelCount()
     {

Spacing +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
             $calcEngine = \PHPExcel\Calculation::getInstance($worksheet->getParent());
             $newDataValues = \PHPExcel\Calculation::unwrapResult(
                 $calcEngine->_calculateFormulaValue(
-                    '='.$this->dataSource,
+                    '=' . $this->dataSource,
                     null,
                     $worksheet->getCell('A1')
                 )

src/PhpSpreadsheet/Chart/Layout.php

Doc Comments +1 added lines

@@ -176,6 +176,7 @@
      * Set Layout Target
      *
      * @param Layout Target $value
+     * @param string $value
      * @return Layout
      */
     public function setLayoutTarget($value)

src/PhpSpreadsheet/Chart/Properties.php

Doc Comments +17 added lines

@@ -116,11 +116,17 @@ 
         SHADOW_PRESETS_PERSPECTIVE_LOWER_RIGHT = 22,
         SHADOW_PRESETS_PERSPECTIVE_LOWER_LEFT = 23;
 
+    /**
+     * @param double $width
+     */
     protected function getExcelPointsWidth($width)
     {
         return $width * 12700;
     }
 
+    /**
+     * @param integer $angle
+     */
     protected function getExcelPointsAngle($angle)
     {
         return $angle * 60000;
@@ -131,6 +137,11 @@ 
         return (string) 100 - $alpha . '000';
     }
 
+    /**
+     * @param string $color
+     * @param integer $alpha
+     * @param string $type
+     */
     protected function setColorProperties($color, $alpha, $type)
     {
         return array(
@@ -140,6 +151,9 @@ 
         );
     }
 
+    /**
+     * @param string $array_kay_selector
+     */
     protected function getLineStyleArrowSize($array_selector, $array_kay_selector)
     {
         $sizes = array(
@@ -157,6 +171,9 @@ 
         return $sizes[$array_selector][$array_kay_selector];
     }
 
+    /**
+     * @param integer $shadow_presets_option
+     */
     protected function getShadowPresetsMap($shadow_presets_option)
     {
         $presets_options = array(

src/PhpSpreadsheet/Chart/Renderer/JpGraph.php

Doc Comments +62 added lines

@@ -65,6 +65,9 @@ 
     private static $plotMark = 0;
 
 
+    /**
+     * @param string $markerID
+     */
     private function formatPointMarker($seriesPlot, $markerID)
     {
         $plotMarkKeys = array_keys(self::$markSet);
@@ -93,6 +96,9 @@ 
     }
 
 
+    /**
+     * @param integer $labelCount
+     */
     private function formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '')
     {
         $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
@@ -123,6 +129,9 @@ 
     }
 
 
+    /**
+     * @param integer $seriesCount
+     */
     private function percentageSumCalculation($groupID, $seriesCount)
     {
         //    Adjust our values to a percentage value across all series in the group
@@ -155,6 +164,9 @@ 
     }
 
 
+    /**
+     * @param \PHPExcel\Chart\Title $captionElement
+     */
     private function getCaption($captionElement)
     {
         //    Read any caption
@@ -267,6 +279,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupID
+     */
     private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d')
     {
         $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
@@ -331,6 +346,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupID
+     */
     private function renderPlotBar($groupID, $dimensions = '2d')
     {
         $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
@@ -417,6 +435,10 @@ 
     }
 
 
+    /**
+     * @param integer $groupID
+     * @param boolean $bubble
+     */
     private function renderPlotScatter($groupID, $bubble)
     {
         $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
@@ -463,6 +485,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupID
+     */
     private function renderPlotRadar($groupID)
     {
         $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
@@ -502,6 +527,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupID
+     */
     private function renderPlotContour($groupID)
     {
         $contourStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
@@ -523,6 +551,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupID
+     */
     private function renderPlotStock($groupID)
     {
         $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
@@ -563,6 +594,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderAreaChart($groupCount, $dimensions = '2d')
     {
         require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
@@ -575,6 +609,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderLineChart($groupCount, $dimensions = '2d')
     {
         require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
@@ -587,6 +624,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderBarChart($groupCount, $dimensions = '2d')
     {
         require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_bar.php');
@@ -599,6 +639,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderScatterChart($groupCount)
     {
         require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_scatter.php');
@@ -613,6 +656,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderBubbleChart($groupCount)
     {
         require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_scatter.php');
@@ -625,6 +671,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)
     {
         require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_pie.php');
@@ -702,6 +751,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderRadarChart($groupCount)
     {
         require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_radar.php');
@@ -714,6 +766,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderStockChart($groupCount)
     {
         require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_stock.php');
@@ -726,6 +781,10 @@ 
     }
 
 
+    /**
+     * @param integer $groupCount
+     * @param string|null $dimensions
+     */
     private function renderContourChart($groupCount, $dimensions)
     {
         require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_contour.php');
@@ -738,6 +797,9 @@ 
     }
 
 
+    /**
+     * @param integer $groupCount
+     */
     private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
     {
         require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');

Spacing +30 added lines, -30 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace PHPExcel\Chart\Renderer;
 
-require_once(\PHPExcel\Settings::getChartRendererPath().'/jpgraph.php');
+require_once(\PHPExcel\Settings::getChartRendererPath() . '/jpgraph.php');
 
 /**
  * PHPExcel_Chart_Renderer_jpgraph
@@ -31,15 +31,15 @@ 
  */
 class JpGraph
 {
-    private static $width    = 640;
+    private static $width = 640;
 
     private static $height    = 480;
 
     private static $colourSet = [
-        'mediumpurple1',    'palegreen3',     'gold1',          'cadetblue1',
-        'darkmagenta',      'coral',          'dodgerblue3',    'eggplant',
-        'mediumblue',       'magenta',        'sandybrown',     'cyan',
-        'firebrick1',       'forestgreen',    'deeppink4',      'darkolivegreen',
+        'mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1',
+        'darkmagenta', 'coral', 'dodgerblue3', 'eggplant',
+        'mediumblue', 'magenta', 'sandybrown', 'cyan',
+        'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen',
         'goldenrod2'
     ];
 
@@ -188,21 +188,21 @@ 
             $legendOverlay = $legend->getOverlay();
             switch ($legendPosition) {
                 case 'r':
-                    $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center');    //    right
+                    $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); //    right
                     $this->graph->legend->SetColumns(1);
                     break;
                 case 'l':
-                    $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center');    //    left
+                    $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center'); //    left
                     $this->graph->legend->SetColumns(1);
                     break;
                 case 't':
-                    $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top');    //    top
+                    $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); //    top
                     break;
                 case 'b':
-                    $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom');    //    bottom
+                    $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); //    bottom
                     break;
                 default:
-                    $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top');    //    top-right
+                    $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); //    top-right
                     $this->graph->legend->SetColumns(1);
                     break;
             }
@@ -565,7 +565,7 @@ 
 
     private function renderAreaChart($groupCount, $dimensions = '2d')
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea();
 
@@ -577,7 +577,7 @@ 
 
     private function renderLineChart($groupCount, $dimensions = '2d')
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea();
 
@@ -589,7 +589,7 @@ 
 
     private function renderBarChart($groupCount, $dimensions = '2d')
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_bar.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_bar.php');
 
         $this->renderCartesianPlotArea();
 
@@ -601,9 +601,9 @@ 
 
     private function renderScatterChart($groupCount)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_scatter.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_regstat.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_scatter.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_regstat.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea('linlin');
 
@@ -615,7 +615,7 @@ 
 
     private function renderBubbleChart($groupCount)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_scatter.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_scatter.php');
 
         $this->renderCartesianPlotArea('linlin');
 
@@ -627,9 +627,9 @@ 
 
     private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_pie.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_pie.php');
         if ($dimensions == '3d') {
-            require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_pie3d.php');
+            require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_pie3d.php');
         }
 
         $this->renderPiePlotArea($doughnut);
@@ -675,7 +675,7 @@ 
                 }
 
                 if ($multiplePlots) {
-                    $seriesPlot->SetSize(($jLimit-$j) / ($jLimit * 4));
+                    $seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4));
                 }
 
                 if ($doughnut) {
@@ -704,7 +704,7 @@ 
 
     private function renderRadarChart($groupCount)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_radar.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_radar.php');
 
         $this->renderRadarPlotArea();
 
@@ -716,7 +716,7 @@ 
 
     private function renderStockChart($groupCount)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_stock.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_stock.php');
 
         $this->renderCartesianPlotArea('intint');
 
@@ -728,7 +728,7 @@ 
 
     private function renderContourChart($groupCount, $dimensions)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_contour.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_contour.php');
 
         $this->renderCartesianPlotArea('intint');
 
@@ -740,11 +740,11 @@ 
 
     private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
     {
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_bar.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_scatter.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_regstat.php');
-        require_once(\PHPExcel\Settings::getChartRendererPath().'jpgraph_line.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_line.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_bar.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_scatter.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_regstat.php');
+        require_once(\PHPExcel\Settings::getChartRendererPath() . 'jpgraph_line.php');
 
         $this->renderCartesianPlotArea();
 
@@ -864,7 +864,7 @@ 
                 $this->renderStockChart($groupCount, $dimensions);
                 break;
             default:
-                echo $chartType.' is not yet implemented<br />';
+                echo $chartType . ' is not yet implemented<br />';
                 return false;
         }
         $this->renderLegend();