formatting

mikeemoo · mikeemoo · commit 690811252cfe · 2012-10-09T08:17:51.000+01:00
diff --git a/src/MischiefCollective/ColorJizz/ColorJizz.php b/src/MischiefCollective/ColorJizz/ColorJizz.php
@@ -100,7 +100,11 @@ public function distance(ColorJizz $destinationColor)
         $a = $this->toCIELab();
         $b = $destinationColor->toCIELab();
 
-        return sqrt(pow(($a->lightness - $b->lightness), 2) + pow(($a->a_dimension - $b->a_dimension), 2) + pow(($a->b_dimension - $b->b_dimension), 2));
+        $lightness_pow = pow(($a->lightness - $b->lightness), 2);
+        $a_dimension_pow = pow(($a->a_dimension - $b->a_dimension), 2);
+        $b_dimension_pow = pow(($a->b_dimension - $b->b_dimension), 2);
+
+        return sqrt($lightness_pow + $a_dimension_pow + $b_dimension_pow);
     }
 
     /**
diff --git a/src/MischiefCollective/ColorJizz/Formats/CIELCh.php b/src/MischiefCollective/ColorJizz/Formats/CIELCh.php
@@ -133,11 +133,10 @@ public function toCMYK()
      */
     public function toCIELab()
     {
-        $l = $this->lightness;
         $hradi = $this->hue * (pi() / 180);
-        $a = cos($hradi) * $this->chroma;
-        $b = sin($hradi) * $this->chroma;
-        return new CIELab($l, $a, $b);
+        $a_dimension = cos($hradi) * $this->chroma;
+        $b_dimension = sin($hradi) * $this->chroma;
+        return new CIELab($this->lightness, $a_dimension, $b_dimension);
     }
 
     /**
diff --git a/src/MischiefCollective/ColorJizz/Formats/Hex.php b/src/MischiefCollective/ColorJizz/Formats/Hex.php
@@ -299,10 +299,10 @@ public function toHex()
      */
     public function toRGB()
     {
-        $r = (($this->hex & 0xFF0000) >> 16);
-        $g = (($this->hex & 0x00FF00) >> 8);
-        $b = (($this->hex & 0x0000FF));
-        return new RGB($r, $g, $b);
+        $red = (($this->hex & 0xFF0000) >> 16);
+        $green = (($this->hex & 0x00FF00) >> 8);
+        $blue = (($this->hex & 0x0000FF));
+        return new RGB($red, $green, $blue);
     }
 
     /**
diff --git a/tests/unit/complementTest.php b/tests/unit/complementTest.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace MischiefCollective\ColorJizz\Tests;
+
+use MischiefCollective\ColorJizz\Formats\Hex;
+
+class complementTest extends \PHPUnit_Framework_TestCase
+{
+    public function testWebsafe()
+    {
+        $this->assertEquals(Hex::fromString('FFFFFF')->complement()->__toString(), 'FFFFFF');
+        $this->assertEquals(Hex::fromString('FF0000')->complement()->__toString(), '00A1F3');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -133,11 +133,10 @@ public function toCMYK()`
`133`	`133`	`*/`
`134`	`134`	`public function toCIELab()`
`135`	`135`	`{`
`136`		`- $l = $this->lightness;`
`137`	`136`	`$hradi = $this->hue * (pi() / 180);`
`138`		`- $a = cos($hradi) * $this->chroma;`
`139`		`- $b = sin($hradi) * $this->chroma;`
`140`		`- return new CIELab($l, $a, $b);`
	`137`	`+ $a_dimension = cos($hradi) * $this->chroma;`
	`138`	`+ $b_dimension = sin($hradi) * $this->chroma;`
	`139`	`+ return new CIELab($this->lightness, $a_dimension, $b_dimension);`
`141`	`140`	`}`
`142`	`141`
`143`	`142`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -299,10 +299,10 @@ public function toHex()`
`299`	`299`	`*/`
`300`	`300`	`public function toRGB()`
`301`	`301`	`{`
`302`		`- $r = (($this->hex & 0xFF0000) >> 16);`
`303`		`- $g = (($this->hex & 0x00FF00) >> 8);`
`304`		`- $b = (($this->hex & 0x0000FF));`
`305`		`- return new RGB($r, $g, $b);`
	`302`	`+ $red = (($this->hex & 0xFF0000) >> 16);`
	`303`	`+ $green = (($this->hex & 0x00FF00) >> 8);`
	`304`	`+ $blue = (($this->hex & 0x0000FF));`
	`305`	`+ return new RGB($red, $green, $blue);`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`/**`