Merge branch 'psr2' into develop

westery · May 23, 2015 · beec8f1 · beec8f1
2 parents 217ef42 + 003c259
commit beec8f1
Show file tree

Hide file tree

Showing 8 changed files with 292 additions and 292 deletions.
diff --git a/Classes/PHPExcel/Reader/Excel5.php b/Classes/PHPExcel/Reader/Excel5.php
diff --git a/Classes/PHPExcel/Reader/Excel5/MD5.php b/Classes/PHPExcel/Reader/Excel5/MD5.php
@@ -85,10 +85,10 @@ public function add($data)
         $C = $this->c;
         $D = $this->d;
 
-        $F = array('PHPExcel_Reader_Excel5_MD5','F');
-        $G = array('PHPExcel_Reader_Excel5_MD5','G');
-        $H = array('PHPExcel_Reader_Excel5_MD5','H');
-        $I = array('PHPExcel_Reader_Excel5_MD5','I');
+        $F = array('PHPExcel_Reader_Excel5_MD5','f');
+        $G = array('PHPExcel_Reader_Excel5_MD5','g');
+        $H = array('PHPExcel_Reader_Excel5_MD5','h');
+        $I = array('PHPExcel_Reader_Excel5_MD5','i');
 
         /* ROUND 1 */
         self::step($F, $A, $B, $C, $D, $words[0], 7, 0xd76aa478);
@@ -168,22 +168,22 @@ public function add($data)
         $this->d = ($this->d + $D) & 0xffffffff;
     }
 
-    private static function F($X, $Y, $Z)
+    private static function f($X, $Y, $Z)
     {
         return (($X & $Y) | ((~ $X) & $Z)); // X AND Y OR NOT X AND Z
     }
 
-    private static function G($X, $Y, $Z)
+    private static function g($X, $Y, $Z)
     {
         return (($X & $Z) | ($Y & (~ $Z))); // X AND Z OR Y AND NOT Z
     }
 
-    private static function H($X, $Y, $Z)
+    private static function h($X, $Y, $Z)
     {
         return ($X ^ $Y ^ $Z); // X XOR Y XOR Z
     }
 
-    private static function I($X, $Y, $Z)
+    private static function i($X, $Y, $Z)
     {
         return ($Y ^ ($X | (~ $Z))) ; // Y XOR (X OR NOT Z)
     }

diff --git a/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php b/Classes/PHPExcel/Shared/JAMA/CholeskyDecomposition.php
@@ -73,7 +73,7 @@ public function __construct($A = null)
                 }
             }
         } else {
-            throw new PHPExcel_Calculation_Exception(JAMAError(ArgumentTypeException));
+            throw new PHPExcel_Calculation_Exception(JAMAError(ARGUMENT_TYPE_EXCEPTION));
         }
     }    //    function __construct()
 
@@ -139,10 +139,10 @@ public function solve($B = null)
                     throw new PHPExcel_Calculation_Exception(JAMAError(MatrixSPDException));
                 }
             } else {
-                throw new PHPExcel_Calculation_Exception(JAMAError(MatrixDimensionException));
+                throw new PHPExcel_Calculation_Exception(JAMAError(MATRIX_DIMENSION_EXCEPTION));
             }
         } else {
-            throw new PHPExcel_Calculation_Exception(JAMAError(ArgumentTypeException));
+            throw new PHPExcel_Calculation_Exception(JAMAError(ARGUMENT_TYPE_EXCEPTION));
         }
     }    //    function solve()
 }
diff --git a/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php b/Classes/PHPExcel/Shared/JAMA/LUDecomposition.php
@@ -20,8 +20,8 @@
  */
 class PHPExcel_Shared_JAMA_LUDecomposition
 {
-    const MatrixSingularException    = "Can only perform operation on singular matrix.";
-    const MatrixSquareException        = "Mismatched Row dimension";
+    const MATRIX_SINGULAR_EXCEPTION    = "Can only perform operation on singular matrix.";
+    const MATRIX_SQUARE_EXCEPTION      = "Mismatched Row dimension";
 
     /**
      *    Decomposition storage
@@ -115,7 +115,7 @@ public function __construct($A)
                 }
             }
         } else {
-            throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ArgumentTypeException);
+            throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::ARGUMENT_TYPE_EXCEPTION);
         }
     }    //    function __construct()
 
@@ -208,7 +208,7 @@ public function det()
             }
             return $d;
         } else {
-            throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MatrixDimensionException);
+            throw new PHPExcel_Calculation_Exception(PHPExcel_Shared_JAMA_Matrix::MATRIX_DIMENSION_EXCEPTION);
         }
     }    //    function det()
 
@@ -248,10 +248,10 @@ public function solve($B)
                 }
                 return $X;
             } else {
-                throw new PHPExcel_Calculation_Exception(self::MatrixSingularException);
+                throw new PHPExcel_Calculation_Exception(self::MATRIX_SINGULAR_EXCEPTION);
             }
         } else {
-            throw new PHPExcel_Calculation_Exception(self::MatrixSquareException);
+            throw new PHPExcel_Calculation_Exception(self::MATRIX_SQUARE_EXCEPTION);
         }
-    }    //    function solve()
+    }
 }