ValueAs are static method calls

packaged · Feb 12, 2014 · 56357e5 · 56357e5
1 parent a1aa777
commit 56357e5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/Packaged/Helpers/ValueAs.php b/src/Packaged/Helpers/ValueAs.php
@@ -15,7 +15,7 @@ class ValueAs
    *
    * @return bool
    */
-  public function bool($value, $default = false)
+  public static function bool($value, $default = false)
   {
     if($value === null)
     {
@@ -43,7 +43,7 @@ public function bool($value, $default = false)
    *
    * @return int
    */
-  public function int($value, $default = 0)
+  public static function int($value, $default = 0)
   {
     if($value === null)
     {
@@ -61,7 +61,7 @@ public function int($value, $default = 0)
    *
    * @return float
    */
-  public function float($value, $default = 0.0)
+  public static function float($value, $default = 0.0)
   {
     if($value === null)
     {
@@ -79,7 +79,7 @@ public function float($value, $default = 0.0)
    *
    * @return string
    */
-  public function string($value, $default = "")
+  public static function string($value, $default = "")
   {
     if($value === null)
     {
@@ -99,7 +99,7 @@ public function string($value, $default = "")
    *
    * @return mixed|string
    */
-  public function normalisedString($value, $default = "")
+  public static function normalisedString($value, $default = "")
   {
     if($value === null)
     {
@@ -124,7 +124,7 @@ public function normalisedString($value, $default = "")
    *
    * @return array
    */
-  public function arr($value, $default = [])
+  public static function arr($value, $default = [])
   {
     if($value === null)
     {
@@ -167,7 +167,7 @@ public function arr($value, $default = [])
    *
    * @return null|object
    */
-  public function obj($value, $default = null)
+  public static function obj($value, $default = null)
   {
     if($value === null)
     {

diff --git a/tests/ValueAsTest.php b/tests/ValueAsTest.php
@@ -7,17 +7,21 @@ class ValueAsTest extends PHPUnit_Framework_TestCase
    */
   public function testExactConversions($method, $value, $default, $expect)
   {
-    $subject = new \Packaged\Helpers\ValueAs();
-    $this->assertSame($expect, $subject->$method($value, $default));
+    $this->assertSame(
+      $expect,
+      \Packaged\Helpers\ValueAs::$method($value, $default)
+    );
   }
 
   /**
    * @dataProvider matchProvider
    */
   public function testEqualConversions($method, $value, $default, $expect)
   {
-    $subject = new \Packaged\Helpers\ValueAs();
-    $this->assertEquals($expect, $subject->$method($value, $default));
+    $this->assertEquals(
+      $expect,
+      \Packaged\Helpers\ValueAs::$method($value, $default)
+    );
   }
 
   public function exactProvider()