Merge branch 'main' of https://github.com/bernskioldmedia/laravel-ppt

src/Branding/Branding.php

@@ -2,13 +2,14 @@
 
 namespace BernskioldMedia\LaravelPpt\Branding;
 
-use function array_merge;
 use BernskioldMedia\LaravelPpt\Concerns\Makeable;
-use function collect;
 use Illuminate\Support\Str;
 use PhpOffice\PhpPresentation\Style\Color;
 use ReflectionClass;
 
+use function array_merge;
+use function collect;
+
 class Branding
 {
     use Makeable;

src/Branding/ParagraphStyle.php

@@ -6,6 +6,7 @@
 use BernskioldMedia\LaravelPpt\Concerns\Makeable;
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithFontSettings;
 use Illuminate\Contracts\Support\Arrayable;
+
 use function method_exists;
 
 /**

src/Branding/SlideTheme.php

@@ -19,8 +19,8 @@ class SlideTheme
         WithBackgroundColor,
         WithBackgroundImage,
         WithChartBackground,
-        WithTextColor,
-        WithLogo;
+        WithLogo,
+        WithTextColor;
 
     /**
      * The class name of the custom master slide to use.

src/Commands/CreateNewSlideCommand.php

@@ -2,9 +2,10 @@
 
 namespace BernskioldMedia\LaravelPpt\Commands;
 
+use Illuminate\Console\Command;
+
 use function config;
 use function file_put_contents;
-use Illuminate\Console\Command;
 use function is_dir;
 use function mkdir;
 

src/Commands/CreateNewSlideDeckCommand.php

@@ -2,13 +2,14 @@
 
 namespace BernskioldMedia\LaravelPpt\Commands;
 
+use Illuminate\Console\Command;
+
 use function array_keys;
 use function array_map;
 use function array_values;
 use function config;
 use function file_get_contents;
 use function file_put_contents;
-use Illuminate\Console\Command;
 use function is_dir;
 use function mkdir;
 use function str;

src/Components/ChartShape.php

@@ -19,8 +19,8 @@
  */
 class ChartShape extends Component
 {
-    use WithShape,
-        WithBackgroundColor;
+    use WithBackgroundColor,
+        WithShape;
 
     public function __construct(
         protected ChartComponent $chartComponent,

src/Components/Charts/Bar.php

@@ -9,9 +9,9 @@
 
 class Bar extends ChartComponent
 {
-    use WithYAxis,
+    use WithLegend,
         WithXAxis,
-        WithLegend;
+        WithYAxis;
 
     protected bool $stacked = false;
 

src/Components/Charts/Line.php

@@ -12,9 +12,9 @@
 
 class Line extends ChartComponent
 {
-    use WithYAxis,
+    use WithLegend,
         WithXAxis,
-        WithLegend;
+        WithYAxis;
 
     public bool $smooth = false;
 

src/Components/Charts/Radar.php

@@ -11,9 +11,9 @@
 
 class Radar extends ChartComponent
 {
-    use WithXAxis,
-        WithYAxis,
-        WithLegend;
+    use WithLegend,
+        WithXAxis,
+        WithYAxis;
 
     protected function initializeChart(): void
     {

src/Components/Charts/Scatter.php

@@ -12,9 +12,9 @@
 
 class Scatter extends ChartComponent
 {
-    use WithYAxis,
+    use WithLegend,
         WithXAxis,
-        WithLegend;
+        WithYAxis;
 
     protected function initializeChart(): void
     {

src/Components/MultiTextBox.php

@@ -19,12 +19,12 @@
  */
 class MultiTextBox extends Component
 {
-    use WithUrl,
+    use WithAlignment,
+        WithBackgroundColor,
         WithFontSettings,
-        WithAlignment,
         WithRotation,
-        WithBackgroundColor,
-        WithShape;
+        WithShape,
+        WithUrl;
 
     public function __construct(
         protected ?array $texts = []

src/Components/Shape.php

@@ -19,11 +19,11 @@
  */
 class Shape extends Component
 {
-    use WithUrl,
+    use WithBackgroundColor,
+        WithBorder,
         WithRotation,
-        WithBackgroundColor,
         WithShape,
-        WithBorder;
+        WithUrl;
 
     protected string $type = AutoShape::TYPE_RECTANGLE;
 

src/Components/Table/Table.php

@@ -13,8 +13,8 @@
  */
 class Table extends Component
 {
-    use WithShape,
-        WithFontSettings;
+    use WithFontSettings,
+        WithShape;
 
     public function __construct(
         protected int $columns = 1,

src/Components/TextBox.php

@@ -19,13 +19,13 @@
  */
 class TextBox extends Component
 {
-    use WithUrl,
+    use WithAlignment,
+        WithBackgroundColor,
         WithFontSettings,
-        WithAlignment,
+        WithParagraphStyle,
         WithRotation,
-        WithBackgroundColor,
         WithShape,
-        WithParagraphStyle;
+        WithUrl;
 
     public ?Run $textRun = null;
 

src/Presentation/BaseSlide.php

@@ -15,25 +15,26 @@
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithTextColor;
 use BernskioldMedia\LaravelPpt\Contracts\Slide as SlideContract;
 use Closure;
-use function config;
 use Illuminate\Support\Traits\Conditionable;
 use PhpOffice\PhpPresentation\Slide;
 use PhpOffice\PhpPresentation\Slide\Background\Color;
+
+use function config;
 use function tap;
 
 abstract class BaseSlide implements SlideContract
 {
-    use Makeable,
-        WithPadding,
+    use Conditionable,
+        Makeable,
         WithBackgroundColor,
         WithBackgroundImage,
         WithChartBackground,
         WithDataSource,
-        WithTextColor,
         WithEdgeImages,
         WithLogo,
+        WithPadding,
         WithSize,
-        Conditionable;
+        WithTextColor;
 
     public const EDGE_IMAGE_POSITION_TOP_LEFT = 'topLeft';
 
@@ -147,7 +148,7 @@ protected function applyBackgroundImage(): void
 
     protected function applyLogo(): void
     {
-        if (true === $this->withoutLogo) {
+        if ($this->withoutLogo === true) {
             return;
         }
 

src/Presentation/Presentation.php

@@ -7,15 +7,16 @@
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithPadding;
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithSize;
 use BernskioldMedia\LaravelPpt\Contracts\CustomizesPowerpointBranding;
-use function config;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Facades\Storage;
-use function method_exists;
 use PhpOffice\PhpPresentation\DocumentLayout;
 use PhpOffice\PhpPresentation\Exception\OutOfBoundsException;
 use PhpOffice\PhpPresentation\IOFactory;
 use PhpOffice\PhpPresentation\PhpPresentation;
 
+use function config;
+use function method_exists;
+
 /**
  * @method static static make(string $title, ?int $width = null, ?int $height = null, ?string $branding = null)
  */

src/SlideMasters/BlankWithTitleSubtitle.php

@@ -6,6 +6,7 @@
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithCustomContents;
 use BernskioldMedia\LaravelPpt\Concerns\Slides\WithSlideTitle;
 use BernskioldMedia\LaravelPpt\Presentation\BaseSlide;
+
 use function config;
 
 /**