Refactor Font methods

Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>

1 files changed, 46 insertions, 33 deletions

diff --git a/test/classes/FontTest.php b/test/classes/FontTest.php
index b62e199268..68837fec71 100644
--- a/test/classes/FontTest.php
+++ b/test/classes/FontTest.php
@@ -17,6 +17,19 @@ use PhpMyAdmin\Tests\PmaTestCase;
 class FontTest extends PmaTestCase
 {
     /**
+     * @var Font
+     */
+    private $font;
+
+    /**
+     * Sets up the fixture
+     */
+    protected function setUp()
+    {
+        $this->font = new Font();
+    }
+
+    /**
      * Test getStringWidth with different characters.
      *
      * @return void
@@ -26,115 +39,115 @@ class FontTest extends PmaTestCase
         // empty string
         $this->assertEquals(
             0,
-            Font::getStringWidth("", "arial", "10")
+            $this->font->getStringWidth("", "arial", "10")
         );
 
         // empty string
         $this->assertEquals(
             3,
-            Font::getStringWidth(" ", "arial", "10")
+            $this->font->getStringWidth(" ", "arial", "10")
         );
 
         // string "a"
         $this->assertEquals(
             6,
-            Font::getStringWidth("a", "arial", "10")
+            $this->font->getStringWidth("a", "arial", "10")
         );
 
         // string "aa"
         $this->assertEquals(
             12,
-            Font::getStringWidth("aa", "arial", "10")
+            $this->font->getStringWidth("aa", "arial", "10")
         );
 
         // string "i"
         $this->assertEquals(
             3,
-            Font::getStringWidth("i", "arial", "10")
+            $this->font->getStringWidth("i", "arial", "10")
         );
 
         // string "f"
         $this->assertEquals(
             3,
-            Font::getStringWidth("f", "arial", "10")
+            $this->font->getStringWidth("f", "arial", "10")
         );
 
         // string "t"
         $this->assertEquals(
             3,
-            Font::getStringWidth("t", "arial", "10")
+            $this->font->getStringWidth("t", "arial", "10")
         );
 
         // string "if"
         $this->assertEquals(
             5,
-            Font::getStringWidth("if", "arial", "10")
+            $this->font->getStringWidth("if", "arial", "10")
         );
 
         // string "it"
         $this->assertEquals(
             6,
-            Font::getStringWidth("it", "arial", "10")
+            $this->font->getStringWidth("it", "arial", "10")
         );
 
         // string "r"
         $this->assertEquals(
             4,
-            Font::getStringWidth("r", "arial", "10")
+            $this->font->getStringWidth("r", "arial", "10")
         );
 
         // string "1"
         $this->assertEquals(
             5,
-            Font::getStringWidth("1", "arial", "10")
+            $this->font->getStringWidth("1", "arial", "10")
         );
 
         // string "c"
         $this->assertEquals(
             5,
-            Font::getStringWidth("c", "arial", "10")
+            $this->font->getStringWidth("c", "arial", "10")
         );
 
         // string "F"
         $this->assertEquals(
             7,
-            Font::getStringWidth("F", "arial", "10")
+            $this->font->getStringWidth("F", "arial", "10")
         );
 
         // string "A"
         $this->assertEquals(
             7,
-            Font::getStringWidth("A", "arial", "10")
+            $this->font->getStringWidth("A", "arial", "10")
         );
 
         // string "w"
         $this->assertEquals(
             8,
-            Font::getStringWidth("w", "arial", "10")
+            $this->font->getStringWidth("w", "arial", "10")
         );
 
         // string "G"
         $this->assertEquals(
             8,
-            Font::getStringWidth("G", "arial", "10")
+            $this->font->getStringWidth("G", "arial", "10")
         );
 
         // string "m"
         $this->assertEquals(
             9,
-            Font::getStringWidth("m", "arial", "10")
+            $this->font->getStringWidth("m", "arial", "10")
         );
 
         // string "W"
         $this->assertEquals(
             10,
-            Font::getStringWidth("W", "arial", "10")
+            $this->font->getStringWidth("W", "arial", "10")
         );
 
         // string "$"
         $this->assertEquals(
             3,
-            Font::getStringWidth("$", "arial", "10")
+            $this->font->getStringWidth("$", "arial", "10")
         );
     }
 
@@ -148,25 +161,25 @@ class FontTest extends PmaTestCase
         // string "phpMyAdmin", with Arial 10
         $this->assertEquals(
             59,
-            Font::getStringWidth("phpMyAdmin", "arial", "10")
+            $this->font->getStringWidth("phpMyAdmin", "arial", "10")
         );
 
         // string "phpMyAdmin", with No font
         $this->assertEquals(
             59,
-            Font::getStringWidth("phpMyAdmin", "", "10")
+            $this->font->getStringWidth("phpMyAdmin", "", "10")
         );
 
         // string "phpMyAdmin", with Times 10
         $this->assertEquals(
             55,
-            Font::getStringWidth("phpMyAdmin", "times", "10")
+            $this->font->getStringWidth("phpMyAdmin", "times", "10")
         );
 
         // string "phpMyAdmin", with Broadway 10
         $this->assertEquals(
             73,
-            Font::getStringWidth("phpMyAdmin", "broadway", "10")
+            $this->font->getStringWidth("phpMyAdmin", "broadway", "10")
         );
 
     }
@@ -181,25 +194,25 @@ class FontTest extends PmaTestCase
         // string "phpMyAdmin", with font size 0
         $this->assertEquals(
             0,
-            Font::getStringWidth("phpMyAdmin", "arial", "0")
+            $this->font->getStringWidth("phpMyAdmin", "arial", "0")
         );
 
         // string "phpMyAdmin", with Arial 10
         $this->assertEquals(
             59,
-            Font::getStringWidth("phpMyAdmin", "arial", "10")
+            $this->font->getStringWidth("phpMyAdmin", "arial", "10")
         );
 
         // string "phpMyAdmin", with Arial 11
         $this->assertEquals(
             65,
-            Font::getStringWidth("phpMyAdmin", "arial", "11")
+            $this->font->getStringWidth("phpMyAdmin", "arial", "11")
         );
 
         // string "phpMyAdmin", with Arial 20
         $this->assertEquals(
             118,
-            Font::getStringWidth("phpMyAdmin", "arial", "20")
+            $this->font->getStringWidth("phpMyAdmin", "arial", "20")
         );
     }
 
@@ -213,20 +226,20 @@ class FontTest extends PmaTestCase
         // string "a", with invalid charlist (= string)
         $this->assertEquals(
             6,
-            Font::getStringWidth("a", "arial", "10", "list")
+            $this->font->getStringWidth("a", "arial", "10", "list")
         );
 
         // string "a", with invalid charlist (= array without proper structure)
         $this->assertEquals(
             6,
-            Font::getStringWidth("a", "arial", "10", array("list"))
+            $this->font->getStringWidth("a", "arial", "10", array("list"))
         );
 
         // string "a", with invalid charlist (= array without proper structure :
         // modifier is missing
         $this->assertEquals(
             6,
-            Font::getStringWidth(
+            $this->font->getStringWidth(
                 "a", "arial", "10",
                 array(array("chars" => "a"))
             )
@@ -236,7 +249,7 @@ class FontTest extends PmaTestCase
         // chars is missing
         $this->assertEquals(
             6,
-            Font::getStringWidth(
+            $this->font->getStringWidth(
                 "a", "arial", "10",
                 array(array("modifier" => 0.61))
             )
@@ -246,7 +259,7 @@ class FontTest extends PmaTestCase
         // chars is not an array
         $this->assertEquals(
             6,
-            Font::getStringWidth(
+            $this->font->getStringWidth(
                 "a", "arial", "10",
                 array(array("chars" => "a", "modifier" => 0.61))
             )
@@ -255,7 +268,7 @@ class FontTest extends PmaTestCase
         // string "a", with valid charlist
         $this->assertEquals(
             7,
-            Font::getStringWidth(
+            $this->font->getStringWidth(
                 "a", "arial", "10",
                 array(array("chars" => array("a"), "modifier" => 0.61))
             )