Clean up FQCN

src/PhpSpreadsheet/Calculation/Calculation.php

@@ -75,7 +75,7 @@ class Calculation
     /**
      * Instance of the spreadsheet this Calculation Engine is using.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Spreadsheet $spreadsheet;
+    private ?Spreadsheet $spreadsheet;
 
     /**
      * Calculation cache.
@@ -91,7 +91,7 @@ class Calculation
      */
     private $calculationCacheEnabled = true;
 
-    private \PhpOffice\PhpSpreadsheet\Calculation\Engine\BranchPruner $branchPruner;
+    private BranchPruner $branchPruner;
 
     /**
      * @var bool
@@ -123,7 +123,7 @@ class Calculation
     /**
      * The debug log generated by the calculation engine.
      */
-    private \PhpOffice\PhpSpreadsheet\Calculation\Engine\Logger $debugLog;
+    private Logger $debugLog;
 
     /**
      * Flag to determine how formula errors should be handled
@@ -149,12 +149,12 @@ class Calculation
     /**
      * Reference Helper.
      */
-    private static \PhpOffice\PhpSpreadsheet\ReferenceHelper $referenceHelper;
+    private static ReferenceHelper $referenceHelper;
 
     /**
      * An array of the nested cell references accessed by the calculation engine, used for the debug log.
      */
-    private \PhpOffice\PhpSpreadsheet\Calculation\Engine\CyclicReferenceStack $cyclicReferenceStack;
+    private CyclicReferenceStack $cyclicReferenceStack;
 
     /** @var array */
     private $cellStack = [];

src/PhpSpreadsheet/Calculation/Engine/Logger.php

@@ -33,7 +33,7 @@ class Logger
     /**
      * The calculation engine cell reference stack.
      */
-    private \PhpOffice\PhpSpreadsheet\Calculation\Engine\CyclicReferenceStack $cellStack;
+    private CyclicReferenceStack $cellStack;
 
     /**
      * Instantiate a Calculation engine logger.

src/PhpSpreadsheet/Calculation/Token/Stack.php

@@ -7,7 +7,7 @@
 
 class Stack
 {
-    private \PhpOffice\PhpSpreadsheet\Calculation\Engine\BranchPruner $branchPruner;
+    private BranchPruner $branchPruner;
 
     /**
      * The parser stack for formulae.

src/PhpSpreadsheet/Cell/CellAddress.php

@@ -7,7 +7,7 @@
 
 class CellAddress
 {
-    protected ?\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet;
+    protected ?Worksheet $worksheet;
 
     protected string $cellAddress;
 

src/PhpSpreadsheet/Cell/ColumnRange.php

@@ -6,7 +6,7 @@
 
 class ColumnRange implements AddressRange
 {
-    protected ?\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet;
+    protected ?Worksheet $worksheet;
 
     protected int $from;
 

src/PhpSpreadsheet/Cell/RowRange.php

@@ -6,7 +6,7 @@
 
 class RowRange implements AddressRange
 {
-    protected ?\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet;
+    protected ?Worksheet $worksheet;
 
     protected int $from;
 

src/PhpSpreadsheet/Chart/Axis.php

@@ -27,12 +27,12 @@ public function __construct()
     /**
      * Chart Major Gridlines as.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Chart\GridLines $majorGridlines = null;
+    private ?GridLines $majorGridlines = null;
 
     /**
      * Chart Minor Gridlines as.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Chart\GridLines $minorGridlines = null;
+    private ?GridLines $minorGridlines = null;
 
     /**
      * Axis Number.
@@ -47,7 +47,7 @@ public function __construct()
 
     private string $axisType = '';
 
-    private ?\PhpOffice\PhpSpreadsheet\Chart\AxisText $axisText = null;
+    private ?AxisText $axisText = null;
 
     /**
      * Axis Options.
@@ -75,7 +75,7 @@ public function __construct()
     /**
      * Fill Properties.
      */
-    private \PhpOffice\PhpSpreadsheet\Chart\ChartColor $fillColor;
+    private ChartColor $fillColor;
 
     private const NUMERIC_FORMAT = [
         Properties::FORMAT_CODE_NUMBER,

src/PhpSpreadsheet/Chart/AxisText.php

@@ -8,7 +8,7 @@ class AxisText extends Properties
 {
     private ?int $rotation = null;
 
-    private \PhpOffice\PhpSpreadsheet\Style\Font $font;
+    private Font $font;
 
     public function __construct()
     {

src/PhpSpreadsheet/Chart/Chart.php

@@ -17,32 +17,32 @@ class Chart
     /**
      * Worksheet.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet = null;
+    private ?Worksheet $worksheet = null;
 
     /**
      * Chart Title.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Chart\Title $title;
+    private ?Title $title;
 
     /**
      * Chart Legend.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Chart\Legend $legend;
+    private ?Legend $legend;
 
     /**
      * X-Axis Label.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Chart\Title $xAxisLabel;
+    private ?Title $xAxisLabel;
 
     /**
      * Y-Axis Label.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Chart\Title $yAxisLabel;
+    private ?Title $yAxisLabel;
 
     /**
      * Chart Plot Area.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Chart\PlotArea $plotArea;
+    private ?PlotArea $plotArea;
 
     /**
      * Plot Visible Only.
@@ -61,12 +61,12 @@ class Chart
     /**
      * Chart Asix Y as.
      */
-    private \PhpOffice\PhpSpreadsheet\Chart\Axis $yAxis;
+    private Axis $yAxis;
 
     /**
      * Chart Asix X as.
      */
-    private \PhpOffice\PhpSpreadsheet\Chart\Axis $xAxis;
+    private Axis $xAxis;
 
     /**
      * Top-Left Cell Position.
@@ -128,9 +128,9 @@ class Chart
     /** @var bool */
     private $roundedCorners = false;
 
-    private \PhpOffice\PhpSpreadsheet\Chart\GridLines $borderLines;
+    private GridLines $borderLines;
 
-    private \PhpOffice\PhpSpreadsheet\Chart\ChartColor $fillColor;
+    private ChartColor $fillColor;
 
     /**
      * Create a new Chart.

src/PhpSpreadsheet/Chart/DataSeriesValues.php

@@ -45,9 +45,9 @@ class DataSeriesValues extends Properties
      */
     private $pointMarker;
 
-    private \PhpOffice\PhpSpreadsheet\Chart\ChartColor $markerFillColor;
+    private ChartColor $markerFillColor;
 
-    private \PhpOffice\PhpSpreadsheet\Chart\ChartColor $markerBorderColor;
+    private ChartColor $markerBorderColor;
 
     /**
      * Series Point Size.
@@ -83,7 +83,7 @@ class DataSeriesValues extends Properties
     /** @var bool */
     private $bubble3D = false;
 
-    private ?\PhpOffice\PhpSpreadsheet\Chart\Layout $labelLayout = null;
+    private ?Layout $labelLayout = null;
 
     /** @var TrendLine[] */
     private $trendLines = [];

src/PhpSpreadsheet/Chart/Legend.php

@@ -44,13 +44,13 @@ class Legend
     /**
      * Legend Layout.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Chart\Layout $layout;
+    private ?Layout $layout;
 
-    private \PhpOffice\PhpSpreadsheet\Chart\GridLines $borderLines;
+    private GridLines $borderLines;
 
-    private \PhpOffice\PhpSpreadsheet\Chart\ChartColor $fillColor;
+    private ChartColor $fillColor;
 
-    private ?\PhpOffice\PhpSpreadsheet\Chart\AxisText $legendText = null;
+    private ?AxisText $legendText = null;
 
     /**
      * Create a new Legend.

src/PhpSpreadsheet/Chart/PlotArea.php

@@ -31,7 +31,7 @@ class PlotArea
     /**
      * PlotArea Layout.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Chart\Layout $layout;
+    private ?Layout $layout;
 
     /**
      * Plot Series.

src/PhpSpreadsheet/Chart/Properties.php

@@ -125,7 +125,7 @@ abstract class Properties
     /** @var ?float */
     protected $glowSize;
 
-    protected \PhpOffice\PhpSpreadsheet\Chart\ChartColor $glowColor;
+    protected ChartColor $glowColor;
 
     /** @var array */
     protected $softEdges = [
@@ -135,7 +135,7 @@ abstract class Properties
     /** @var array */
     protected $shadowProperties = self::PRESETS_OPTIONS[0];
 
-    protected \PhpOffice\PhpSpreadsheet\Chart\ChartColor $shadowColor;
+    protected ChartColor $shadowColor;
 
     public function __construct()
     {
@@ -730,7 +730,7 @@ public function getShadowArray(): array
         return $array;
     }
 
-    protected \PhpOffice\PhpSpreadsheet\Chart\ChartColor $lineColor;
+    protected ChartColor $lineColor;
 
     /** @var array */
     protected $lineStyleProperties = [

src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php

@@ -40,7 +40,7 @@ abstract class JpGraphRendererBase implements IRenderer
 
     private static array $markSet;
 
-    private \PhpOffice\PhpSpreadsheet\Chart\Chart $chart;
+    private Chart $chart;
 
     private $graph;
 

src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php

@@ -2,6 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
 
+use mitoteam\jpgraph\MtJpGraph;
+
 /**
  * Jpgraph is not officially maintained by Composer at packagist.org.
  *
@@ -19,7 +21,7 @@ protected static function init(): void
             return;
         }
 
-        \mitoteam\jpgraph\MtJpGraph::load([
+        MtJpGraph::load([
             'bar',
             'contour',
             'line',

src/PhpSpreadsheet/Chart/Title.php

@@ -23,7 +23,7 @@ class Title
     /**
      * Title Layout.
      */
-    private ?\PhpOffice\PhpSpreadsheet\Chart\Layout $layout;
+    private ?Layout $layout;
 
     /**
      * Create a new Title.

src/PhpSpreadsheet/Collection/Cells.php

@@ -14,7 +14,7 @@ class Cells
 {
     protected const MAX_COLUMN_ID = 16384;
 
-    private \Psr\SimpleCache\CacheInterface $cache;
+    private CacheInterface $cache;
 
     /**
      * Parent worksheet.

src/PhpSpreadsheet/Comment.php

@@ -20,7 +20,7 @@ class Comment implements IComparable
     /**
      * Rich text comment.
      */
-    private \PhpOffice\PhpSpreadsheet\RichText\RichText $text;
+    private RichText $text;
 
     /**
      * Comment width (CSS style, i.e. XXpx or YYpt).
@@ -52,7 +52,7 @@ class Comment implements IComparable
     /**
      * Comment fill color.
      */
-    private \PhpOffice\PhpSpreadsheet\Style\Color $fillColor;
+    private Color $fillColor;
 
     /**
      * Alignment.
@@ -62,7 +62,7 @@ class Comment implements IComparable
     /**
      * Background image in comment.
      */
-    private \PhpOffice\PhpSpreadsheet\Worksheet\Drawing $backgroundImage;
+    private Drawing $backgroundImage;
 
     /**
      * Create a new Comment.

src/PhpSpreadsheet/DefinedName.php

@@ -16,7 +16,7 @@ abstract class DefinedName
     /**
      * Worksheet on which the defined name can be resolved.
      */
-    protected ?\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet;
+    protected ?Worksheet $worksheet;
 
     /**
      * Value of the named object.
@@ -31,7 +31,7 @@ abstract class DefinedName
     /**
      * Scope.
      */
-    protected ?\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $scope;
+    protected ?Worksheet $scope;
 
     /**
      * Whether this is a named range or a named formula.

src/PhpSpreadsheet/Helper/Sample.php

@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Helper;
 
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -195,7 +196,7 @@ public function renderChart(Chart $chart, string $fileName): void
             return;
         }
 
-        Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
+        Settings::setChartRenderer(MtJpGraphRenderer::class);
 
         $fileName = $this->getFilename($fileName, 'png');
 

src/PhpSpreadsheet/Reader/BaseReader.php

@@ -54,7 +54,7 @@ abstract class BaseReader implements IReader
     /** @var resource */
     protected $fileHandle;
 
-    protected ?\PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner $securityScanner = null;
+    protected ?XmlScanner $securityScanner = null;
 
     public function __construct()
     {

src/PhpSpreadsheet/Reader/Gnumeric.php

@@ -48,7 +48,7 @@ class Gnumeric extends BaseReader
      */
     private $spreadsheet;
 
-    private \PhpOffice\PhpSpreadsheet\ReferenceHelper $referenceHelper;
+    private ReferenceHelper $referenceHelper;
 
     /** @var array */
     public static $mappings = [