Skip to content

Commit 43e55d3

Browse files
mikeemoomikeemoo
authored
Merge pull request #12 from petrhanak/master
fix incorrect namespaces
2 parents 4fca12b + e39ad8d commit 43e55d3

File tree

10 files changed

+102
-103
lines changed

10 files changed

+102
-103
lines changed

‎src/MischiefCollective/ColorJizz/ColorJizz.php‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use MischiefCollective\ColorJizz\Formats\HSV;
1313
use MischiefCollective\ColorJizz\Formats\CIELCh;
1414
use MischiefCollective\ColorJizz\Formats\RGB;
15-
use MischiefCollective\ColorJizz\Formats\Hex;
1615

1716
/**
1817
* ColorJizz is the base class that all color objects extend
@@ -28,70 +27,70 @@ abstract class ColorJizz
2827
/**
2928
* Convert the color to Hex format
3029
*
31-
* @return MischiefCollective\ColorJizz\Formats\Hex the color in Hex format
30+
* @return \MischiefCollective\ColorJizz\Formats\Hex the color in Hex format
3231
*/
3332
abstract public function toHex();
3433

3534
/**
3635
* Convert the color to RGB format
3736
*
38-
* @return MischiefCollective\ColorJizz\Formats\RGB the color in RGB format
37+
* @return \MischiefCollective\ColorJizz\Formats\RGB the color in RGB format
3938
*/
4039
abstract public function toRGB();
4140

4241
/**
4342
* Convert the color to XYZ format
4443
*
45-
* @return MischiefCollective\ColorJizz\Formats\XYZ the color in XYZ format
44+
* @return \MischiefCollective\ColorJizz\Formats\XYZ the color in XYZ format
4645
*/
4746
abstract public function toXYZ();
4847

4948
/**
5049
* Convert the color to Yxy format
5150
*
52-
* @return MischiefCollective\ColorJizz\Formats\Yxy the color in Yxy format
51+
* @return \MischiefCollective\ColorJizz\Formats\Yxy the color in Yxy format
5352
*/
5453
abstract public function toYxy();
5554

5655
/**
5756
* Convert the color to CIELab format
5857
*
59-
* @return MischiefCollective\ColorJizz\Formats\CIELab the color in CIELab format
58+
* @return \MischiefCollective\ColorJizz\Formats\CIELab the color in CIELab format
6059
*/
6160
abstract public function toCIELab();
6261

6362
/**
6463
* Convert the color to CIELCh format
6564
*
66-
* @return MischiefCollective\ColorJizz\Formats\CIELCh the color in CIELCh format
65+
* @return \MischiefCollective\ColorJizz\Formats\CIELCh the color in CIELCh format
6766
*/
6867
abstract public function toCIELCh();
6968

7069
/**
7170
* Convert the color to CMY format
7271
*
73-
* @return MischiefCollective\ColorJizz\Formats\CMY the color in CMY format
72+
* @return \MischiefCollective\ColorJizz\Formats\CMY the color in CMY format
7473
*/
7574
abstract public function toCMY();
7675

7776
/**
7877
* Convert the color to CMYK format
7978
*
80-
* @return MischiefCollective\ColorJizz\Formats\CMYK the color in CMYK format
79+
* @return \MischiefCollective\ColorJizz\Formats\CMYK the color in CMYK format
8180
*/
8281
abstract public function toCMYK();
8382

8483
/**
8584
* Convert the color to HSV format
8685
*
87-
* @return MischiefCollective\ColorJizz\Formats\HSV the color in HSV format
86+
* @return \MischiefCollective\ColorJizz\Formats\HSV the color in HSV format
8887
*/
8988
abstract public function toHSV();
9089

9190
/**
9291
* Find the distance to the destination color
9392
*
94-
* @param MischiefCollective\ColorJizz\ColorJizz $destinationColor The destination color
93+
* @param \MischiefCollective\ColorJizz\ColorJizz $destinationColor The destination color
9594
*
9695
* @return int distance to destination color
9796
*/
@@ -110,7 +109,7 @@ public function distance(ColorJizz $destinationColor)
110109
/**
111110
* Find the closest websafe color
112111
*
113-
* @return MischiefCollective\ColorJizz\ColorJizz The closest color
112+
* @return \MischiefCollective\ColorJizz\ColorJizz The closest color
114113
*/
115114
public function websafe()
116115
{
@@ -130,7 +129,7 @@ public function websafe()
130129
*
131130
* @param array $palette An array of ColorJizz objects to match against
132131
*
133-
* @return MischiefCollective\ColorJizz\ColorJizz The closest color
132+
* @return \MischiefCollective\ColorJizz\ColorJizz The closest color
134133
*/
135134
public function match(array $palette)
136135
{
@@ -178,7 +177,7 @@ public function split($includeSelf = false)
178177
/**
179178
* Return the opposite, complimentary color
180179
*
181-
* @return MischiefCollective\ColorJizz\ColorJizz The greyscale color
180+
* @return \MischiefCollective\ColorJizz\ColorJizz The greyscale color
182181
*/
183182
public function complement()
184183
{
@@ -218,7 +217,7 @@ public function getMatchingTextColor()
218217
*
219218
* @param int $includeSelf Include the current color in the return array
220219
*
221-
* @return MischiefCollective\ColorJizz\ColorJizz[] Array of complimentary colors
220+
* @return \MischiefCollective\ColorJizz\ColorJizz[] Array of complimentary colors
222221
*/
223222
public function sweetspot($includeSelf = false)
224223
{
@@ -275,7 +274,7 @@ public function rectangle($sideLength, $includeSelf = false)
275274
return $rtn;
276275
}
277276

278-
public function range($destinationColor, $steps, $includeSelf = false)
277+
public function range(ColorJizz $destinationColor, $steps, $includeSelf = false)
279278
{
280279
$a = $this->toRGB();
281280
$b = $destinationColor->toRGB();
@@ -298,7 +297,7 @@ public function range($destinationColor, $steps, $includeSelf = false)
298297
/**
299298
* Return a greyscale version of the current color
300299
*
301-
* @return MischiefCollective\ColorJizz\ColorJizz The greyscale color
300+
* @return \MischiefCollective\ColorJizz\ColorJizz The greyscale color
302301
*/
303302
public function greyscale()
304303
{
@@ -314,7 +313,7 @@ public function greyscale()
314313
* @param int $degreeModifier Degrees to modify by
315314
* @param bool $absolute If TRUE set absolute value
316315
*
317-
* @return MischiefCollective\ColorJizz\ColorJizz The modified color
316+
* @return \MischiefCollective\ColorJizz\ColorJizz The modified color
318317
*/
319318
public function hue($degreeModifier, $absolute = FALSE)
320319
{
@@ -330,7 +329,7 @@ public function hue($degreeModifier, $absolute = FALSE)
330329
* @param int $satModifier Value to modify by
331330
* @param bool $absolute If TRUE set absolute value
332331
*
333-
* @return MischiefCollective\ColorJizz\ColorJizz The modified color
332+
* @return \MischiefCollective\ColorJizz\ColorJizz The modified color
334333
*/
335334
public function saturation($satModifier, $absolute = FALSE)
336335
{
@@ -346,7 +345,7 @@ public function saturation($satModifier, $absolute = FALSE)
346345
* @param int $brightnessModifier Value to modify by
347346
* @param bool $absolute If TRUE set absolute value
348347
*
349-
* @return MischiefCollective\ColorJizz\ColorJizz The modified color
348+
* @return \MischiefCollective\ColorJizz\ColorJizz The modified color
350349
*/
351350
public function brightness($brightnessModifier, $absolute = FALSE)
352351
{

‎src/MischiefCollective/ColorJizz/Formats/CIELCh.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function __construct($lightness, $chroma, $hue)
6060
/**
6161
* Convert the color to Hex format
6262
*
63-
* @return MischiefCollective\ColorJizz\Formats\Hex the color in Hex format
63+
* @return \MischiefCollective\ColorJizz\Formats\Hex the color in Hex format
6464
*/
6565
public function toHex()
6666
{
@@ -70,7 +70,7 @@ public function toHex()
7070
/**
7171
* Convert the color to RGB format
7272
*
73-
* @return MischiefCollective\ColorJizz\Formats\RGB the color in RGB format
73+
* @return \MischiefCollective\ColorJizz\Formats\RGB the color in RGB format
7474
*/
7575
public function toRGB()
7676
{
@@ -80,7 +80,7 @@ public function toRGB()
8080
/**
8181
* Convert the color to XYZ format
8282
*
83-
* @return MischiefCollective\ColorJizz\Formats\XYZ the color in XYZ format
83+
* @return \MischiefCollective\ColorJizz\Formats\XYZ the color in XYZ format
8484
*/
8585
public function toXYZ()
8686
{
@@ -90,7 +90,7 @@ public function toXYZ()
9090
/**
9191
* Convert the color to Yxy format
9292
*
93-
* @return MischiefCollective\ColorJizz\Formats\Yxy the color in Yxy format
93+
* @return \MischiefCollective\ColorJizz\Formats\Yxy the color in Yxy format
9494
*/
9595
public function toYxy()
9696
{
@@ -100,7 +100,7 @@ public function toYxy()
100100
/**
101101
* Convert the color to HSV format
102102
*
103-
* @return MischiefCollective\ColorJizz\Formats\HSV the color in HSV format
103+
* @return \MischiefCollective\ColorJizz\Formats\HSV the color in HSV format
104104
*/
105105
public function toHSV()
106106
{
@@ -110,7 +110,7 @@ public function toHSV()
110110
/**
111111
* Convert the color to CMY format
112112
*
113-
* @return MischiefCollective\ColorJizz\Formats\CMY the color in CMY format
113+
* @return \MischiefCollective\ColorJizz\Formats\CMY the color in CMY format
114114
*/
115115
public function toCMY()
116116
{
@@ -120,7 +120,7 @@ public function toCMY()
120120
/**
121121
* Convert the color to CMYK format
122122
*
123-
* @return MischiefCollective\ColorJizz\Formats\CMYK the color in CMYK format
123+
* @return \MischiefCollective\ColorJizz\Formats\CMYK the color in CMYK format
124124
*/
125125
public function toCMYK()
126126
{
@@ -130,7 +130,7 @@ public function toCMYK()
130130
/**
131131
* Convert the color to CIELab format
132132
*
133-
* @return MischiefCollective\ColorJizz\Formats\CIELab the color in CIELab format
133+
* @return \MischiefCollective\ColorJizz\Formats\CIELab the color in CIELab format
134134
*/
135135
public function toCIELab()
136136
{
@@ -143,7 +143,7 @@ public function toCIELab()
143143
/**
144144
* Convert the color to CIELCh format
145145
*
146-
* @return MischiefCollective\ColorJizz\Formats\CIELCh the color in CIELCh format
146+
* @return \MischiefCollective\ColorJizz\Formats\CIELCh the color in CIELCh format
147147
*/
148148
public function toCIELCh()
149149
{

‎src/MischiefCollective/ColorJizz/Formats/CIELab.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static function create($lightness, $a_dimension, $b_dimension)
6262
/**
6363
* Convert the color to Hex format
6464
*
65-
* @return MischiefCollective\ColorJizz\Formats\Hex the color in Hex format
65+
* @return \MischiefCollective\ColorJizz\Formats\Hex the color in Hex format
6666
*/
6767
public function toHex()
6868
{
@@ -72,7 +72,7 @@ public function toHex()
7272
/**
7373
* Convert the color to RGB format
7474
*
75-
* @return MischiefCollective\ColorJizz\Formats\RGB the color in RGB format
75+
* @return \MischiefCollective\ColorJizz\Formats\RGB the color in RGB format
7676
*/
7777
public function toRGB()
7878
{
@@ -82,7 +82,7 @@ public function toRGB()
8282
/**
8383
* Convert the color to XYZ format
8484
*
85-
* @return MischiefCollective\ColorJizz\Formats\XYZ the color in XYZ format
85+
* @return \MischiefCollective\ColorJizz\Formats\XYZ the color in XYZ format
8686
*/
8787
public function toXYZ()
8888
{
@@ -118,7 +118,7 @@ public function toXYZ()
118118
/**
119119
* Convert the color to Yxy format
120120
*
121-
* @return MischiefCollective\ColorJizz\Formats\Yxy the color in Yxy format
121+
* @return \MischiefCollective\ColorJizz\Formats\Yxy the color in Yxy format
122122
*/
123123
public function toYxy()
124124
{
@@ -128,7 +128,7 @@ public function toYxy()
128128
/**
129129
* Convert the color to HSV format
130130
*
131-
* @return MischiefCollective\ColorJizz\Formats\HSV the color in HSV format
131+
* @return \MischiefCollective\ColorJizz\Formats\HSV the color in HSV format
132132
*/
133133
public function toHSV()
134134
{
@@ -138,7 +138,7 @@ public function toHSV()
138138
/**
139139
* Convert the color to CMY format
140140
*
141-
* @return MischiefCollective\ColorJizz\Formats\CMY the color in CMY format
141+
* @return \MischiefCollective\ColorJizz\Formats\CMY the color in CMY format
142142
*/
143143
public function toCMY()
144144
{
@@ -148,7 +148,7 @@ public function toCMY()
148148
/**
149149
* Convert the color to CMYK format
150150
*
151-
* @return MischiefCollective\ColorJizz\Formats\CMYK the color in CMYK format
151+
* @return \MischiefCollective\ColorJizz\Formats\CMYK the color in CMYK format
152152
*/
153153
public function toCMYK()
154154
{
@@ -158,7 +158,7 @@ public function toCMYK()
158158
/**
159159
* Convert the color to CIELab format
160160
*
161-
* @return MischiefCollective\ColorJizz\Formats\CIELab the color in CIELab format
161+
* @return \MischiefCollective\ColorJizz\Formats\CIELab the color in CIELab format
162162
*/
163163
public function toCIELab()
164164
{
@@ -168,7 +168,7 @@ public function toCIELab()
168168
/**
169169
* Convert the color to CIELCh format
170170
*
171-
* @return MischiefCollective\ColorJizz\Formats\CIELCh the color in CIELCh format
171+
* @return \MischiefCollective\ColorJizz\Formats\CIELCh the color in CIELCh format
172172
*/
173173
public function toCIELCh()
174174
{

0 commit comments

Comments
 (0)