From b75551f0eb667b2562a0b2b4d423526c81122184 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 1 Nov 2020 21:11:20 +0100
Subject: [PATCH] Adjustment for border style

---
 src/PhpSpreadsheet/Style/Border.php | 5 +++--
 src/PhpSpreadsheet/Style/Color.php  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/PhpSpreadsheet/Style/Border.php b/src/PhpSpreadsheet/Style/Border.php
index b7b179f2..a09078a4 100644
--- a/src/PhpSpreadsheet/Style/Border.php
+++ b/src/PhpSpreadsheet/Style/Border.php
@@ -162,9 +162,10 @@ class Border extends Supervisor
     {
         if (empty($style)) {
             $style = self::BORDER_NONE;
-        } elseif (is_bool($style) && $style) {
-            $style = self::BORDER_MEDIUM;
+        } elseif (is_bool($style)) {
+            $style = $style ? self::BORDER_MEDIUM : self::BORDER_NONE;
         }
+
         if ($this->isSupervisor) {
             $styleArray = $this->getStyleArray(['borderStyle' => $style]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
diff --git a/src/PhpSpreadsheet/Style/Color.php b/src/PhpSpreadsheet/Style/Color.php
index b8182a25..1cb141a8 100644
--- a/src/PhpSpreadsheet/Style/Color.php
+++ b/src/PhpSpreadsheet/Style/Color.php
@@ -309,9 +309,9 @@ class Color extends Supervisor
      * @param bool $background Flag to indicate whether default background or foreground colour
      *                              should be returned if the indexed colour doesn't exist
      *
-     * @return string
+     * @return Color
      */
-    public static function indexedColor($colorIndex, $background = false)
+    public static function indexedColor($colorIndex, $background = false): self
     {
         // Clean parameter
         $colorIndex = (int) $colorIndex;