Adapt for Composer v2.0

faytekin · faytekin · commit 42aa25fe2df1 · 2020-03-20T18:22:30.000+03:00
diff --git a/Classes/PHPExcel/Shared/Trend/BestFit.php b/Classes/PHPExcel/Shared/Trend/BestFit.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPExcelBestFit
+ * BestFit
  *
  * Copyright (c) 2006 - 2015 PHPExcel
  *
@@ -25,7 +25,7 @@
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-class PHPExcelBestFit
+class BestFit
 {
     /**
      * Indicator flag for a calculation error
diff --git a/Classes/PHPExcel/Shared/Trend/ExponentialBestFit.php b/Classes/PHPExcel/Shared/Trend/ExponentialBestFit.php
@@ -1,9 +1,6 @@
 <?php
-
-require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/BestFitClass.php');
-
 /**
- * PHPExcelExponentialBestFit
+ * ExponentialBestFit
  *
  * Copyright (c) 2006 - 2015 PHPExcel
  *
@@ -27,7 +24,7 @@
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-class PHPExcelExponentialBestFit extends PHPExcelBestFit
+class ExponentialBestFit extends BestFit
 {
     /**
      * Algorithm type to use for best-fit
diff --git a/Classes/PHPExcel/Shared/Trend/LinearBestFit.php b/Classes/PHPExcel/Shared/Trend/LinearBestFit.php
@@ -1,9 +1,6 @@
 <?php
-
-require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/BestFitClass.php');
-
 /**
- * PHPExcelLinearBestFit
+ * LinearBestFit
  *
  * Copyright (c) 2006 - 2015 PHPExcel
  *
@@ -27,7 +24,7 @@
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-class PHPExcelLinearBestFit extends PHPExcelBestFit
+class LinearBestFit extends BestFit
 {
     /**
      * Algorithm type to use for best-fit
diff --git a/Classes/PHPExcel/Shared/Trend/LogarithmicBestFit.php b/Classes/PHPExcel/Shared/Trend/LogarithmicBestFit.php
@@ -1,9 +1,6 @@
 <?php
-
-require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/BestFitClass.php');
-
 /**
- * PHPExcelLogarithmicBestFit
+ * LogarithmicBestFit
  *
  * Copyright (c) 2006 - 2015 PHPExcel
  *
@@ -27,7 +24,7 @@
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-class PHPExcelLogarithmicBestFit extends PHPExcelBestFit
+class LogarithmicBestFit extends BestFit
 {
     /**
      * Algorithm type to use for best-fit
diff --git a/Classes/PHPExcel/Shared/Trend/PolynomialBestFit.php b/Classes/PHPExcel/Shared/Trend/PolynomialBestFit.php
@@ -1,10 +1,9 @@
 <?php
 
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/BestFitClass.php';
 require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/JAMA/Matrix.php';
 
 /**
- * PHPExcelPolynomialBestFit
+ * PolynomialBestFit
  *
  * Copyright (c) 2006 - 2015 PHPExcel
  *
@@ -28,7 +27,7 @@
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-class PHPExcelPolynomialBestFit extends PHPExcelBestFit
+class PolynomialBestFit extends BestFit
 {
     /**
      * Algorithm type to use for best-fit
diff --git a/Classes/PHPExcel/Shared/Trend/PowerBestFit.php b/Classes/PHPExcel/Shared/Trend/PowerBestFit.php
@@ -1,9 +1,7 @@
 <?php
 
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/BestFitClass.php';
-
 /**
- * PHPExcelPowerBestFit
+ * PowerBestFit
  *
  * Copyright (c) 2006 - 2015 PHPExcel
  *
@@ -27,7 +25,7 @@
  * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-class PHPExcelPowerBestFit extends PHPExcelBestFit
+class PowerBestFit extends BestFit
 {
     /**
      * Algorithm type to use for best-fit
diff --git a/Classes/PHPExcel/Shared/Trend/TrendClass.php b/Classes/PHPExcel/Shared/Trend/TrendClass.php
@@ -1,11 +1,5 @@
 <?php
 
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/LinearBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/LogarithmicBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/ExponentialBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/PowerBestFitClass.php';
-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/PolynomialBestFitClass.php';
-
 /**
  * PHPExcel_TrendClass
  *
@@ -73,7 +67,7 @@ class TrendClass
     /**
      * Cached results for each method when trying to identify which provides the best fit
      *
-     * @var PHPExcelBestFit[]
+     * @var BestFit[]
      **/
     private static $trendCache = array();
 
@@ -113,7 +107,7 @@ public static function calculate($trendType = self::TREND_BEST_FIT, $yValues, $x
             case self::TREND_POLYNOMIAL_6:
                 if (!isset(self::$trendCache[$key])) {
                     $order = substr($trendType, -1);
-                    self::$trendCache[$key] = new PHPExcelPolynomialBestFit($order, $yValues, $xValues, $const);
+                    self::$trendCache[$key] = new PolynomialBestFit($order, $yValues, $xValues, $const);
                 }
                 return self::$trendCache[$key];
             case self::TREND_BEST_FIT:
@@ -128,7 +122,7 @@ public static function calculate($trendType = self::TREND_BEST_FIT, $yValues, $x
                 if ($trendType != self::TREND_BEST_FIT_NO_POLY) {
                     foreach (self::$trendTypePolynomialOrders as $trendMethod) {
                         $order = substr($trendMethod, -1);
-                        $bestFit[$trendMethod] = new PHPExcelPolynomialBestFit($order, $yValues, $xValues, $const);
+                        $bestFit[$trendMethod] = new PolynomialBestFit($order, $yValues, $xValues, $const);
                         if ($bestFit[$trendMethod]->getError()) {
                             unset($bestFit[$trendMethod]);
                         } else {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`/**`
`4`		`- * PHPExcelBestFit`
	`4`	`+ * BestFit`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 2006 - 2015 PHPExcel`
`7`	`7`	`*`
`@@ -25,7 +25,7 @@`
`25`	`25`	`* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL`
`26`	`26`	`* @version ##VERSION##, ##DATE##`
`27`	`27`	`*/`
`28`		`-class PHPExcelBestFit`
	`28`	`+class BestFit`
`29`	`29`	`{`
`30`	`30`	`/**`
`31`	`31`	`* Indicator flag for a calculation error`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`	`1`	`<?php`
`2`		`-`
`3`		`-require_once(PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/BestFitClass.php');`
`4`		`-`
`5`	`2`	`/**`
`6`		`- * PHPExcelExponentialBestFit`
	`3`	`+ * ExponentialBestFit`
`7`	`4`	`*`
`8`	`5`	`* Copyright (c) 2006 - 2015 PHPExcel`
`9`	`6`	`*`
`@@ -27,7 +24,7 @@`
`27`	`24`	`* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL`
`28`	`25`	`* @version ##VERSION##, ##DATE##`
`29`	`26`	`*/`
`30`		`-class PHPExcelExponentialBestFit extends PHPExcelBestFit`
	`27`	`+class ExponentialBestFit extends BestFit`
`31`	`28`	`{`
`32`	`29`	`/**`
`33`	`30`	`* Algorithm type to use for best-fit`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/BestFitClass.php';`
`4`	`3`	`require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/JAMA/Matrix.php';`
`5`	`4`
`6`	`5`	`/**`
`7`		`- * PHPExcelPolynomialBestFit`
	`6`	`+ * PolynomialBestFit`
`8`	`7`	`*`
`9`	`8`	`* Copyright (c) 2006 - 2015 PHPExcel`
`10`	`9`	`*`
`@@ -28,7 +27,7 @@`
`28`	`27`	`* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL`
`29`	`28`	`* @version ##VERSION##, ##DATE##`
`30`	`29`	`*/`
`31`		`-class PHPExcelPolynomialBestFit extends PHPExcelBestFit`
	`30`	`+class PolynomialBestFit extends BestFit`
`32`	`31`	`{`
`33`	`32`	`/**`
`34`	`33`	`* Algorithm type to use for best-fit`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-require_once PHPEXCEL_ROOT . 'PHPExcel/Shared/Trend/BestFitClass.php';`
`4`		`-`
`5`	`3`	`/**`
`6`		`- * PHPExcelPowerBestFit`
	`4`	`+ * PowerBestFit`
`7`	`5`	`*`
`8`	`6`	`* Copyright (c) 2006 - 2015 PHPExcel`
`9`	`7`	`*`
`@@ -27,7 +25,7 @@`
`27`	`25`	`* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL`
`28`	`26`	`* @version ##VERSION##, ##DATE##`
`29`	`27`	`*/`
`30`		`-class PHPExcelPowerBestFit extends PHPExcelBestFit`
	`28`	`+class PowerBestFit extends BestFit`
`31`	`29`	`{`
`32`	`30`	`/**`
`33`	`31`	`* Algorithm type to use for best-fit`