Skip to content

Commit 49c99f6

Browse files
committed
Code clean and some extra hinting.
1 parent de6267d commit 49c99f6

File tree

5 files changed

+93
-6
lines changed

5 files changed

+93
-6
lines changed

src/Imager.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ function (GetAssetUrlEvent $event) {
187187
}
188188

189189
// Transform is a named asset transform
190-
if (is_string($event->transform)) {
190+
if (is_string($transform)) {
191191
$assetTransform = Craft::$app->getAssetTransforms()->getTransformByHandle($transform);
192192

193193
if ($assetTransform) {
@@ -198,10 +198,12 @@ function (GetAssetUrlEvent $event) {
198198
}
199199
}
200200

201-
$transformedImage = self::$plugin->imager->transformImage($event->asset, $transform);
202-
203-
if ($transformedImage !== null) {
204-
$event->url = $transformedImage->getUrl();
201+
if (is_array($transform)) {
202+
$transformedImage = self::$plugin->imager->transformImage($event->asset, $transform);
203+
204+
if ($transformedImage !== null) {
205+
$event->url = $transformedImage->getUrl();
206+
}
205207
}
206208
} catch (ImagerException $e) {
207209
return null;

src/helpers/ImgixHelpers.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static function getImgixFilePath($image, $config): string
3030
}
3131

3232
if ($config->sourceIsWebProxy === true) {
33-
return $image->url;
33+
return $image->url ?? '';
3434
}
3535

3636
try {

src/models/CraftTransformedImageModel.php

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,49 @@
1515

1616
class CraftTransformedImageModel implements TransformedImageInterface
1717
{
18+
/**
19+
* @var string
20+
*/
1821
public $path;
22+
23+
/**
24+
* @var string
25+
*/
1926
public $filename;
27+
28+
/**
29+
* @var string
30+
*/
2031
public $url;
32+
33+
/**
34+
* @var string
35+
*/
2136
public $extension;
37+
38+
/**
39+
* @var string
40+
*/
2241
public $mimeType;
42+
43+
/**
44+
* @var int
45+
*/
2346
public $width;
47+
48+
/**
49+
* @var int
50+
*/
2451
public $height;
52+
53+
/**
54+
* @var int|float
55+
*/
2556
public $size;
57+
58+
/**
59+
* @var bool
60+
*/
2661
public $isNew;
2762

2863
/**

src/models/ImgixTransformedImageModel.php

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,49 @@
1313

1414
class ImgixTransformedImageModel implements TransformedImageInterface
1515
{
16+
/**
17+
* @var string
18+
*/
1619
public $path;
20+
21+
/**
22+
* @var string
23+
*/
1724
public $filename;
25+
26+
/**
27+
* @var string
28+
*/
1829
public $url;
30+
31+
/**
32+
* @var string
33+
*/
1934
public $extension;
35+
36+
/**
37+
* @var string
38+
*/
2039
public $mimeType;
40+
41+
/**
42+
* @var int
43+
*/
2144
public $width;
45+
46+
/**
47+
* @var int
48+
*/
2249
public $height;
50+
51+
/**
52+
* @var int|float
53+
*/
2354
public $size;
2455

56+
/**
57+
* @var ImgixSettings|null
58+
*/
2559
private $profileConfig;
2660

2761
/**

src/models/NoopImageModel.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,25 @@ class NoopImageModel implements TransformedImageInterface
2020
public $url;
2121
public $extension;
2222
public $mimeType;
23+
24+
/**
25+
* @var int
26+
*/
2327
public $width;
28+
29+
/**
30+
* @var int
31+
*/
2432
public $height;
33+
34+
/**
35+
* @var int|float
36+
*/
2537
public $size;
38+
39+
/**
40+
* @var bool
41+
*/
2642
public $isNew;
2743

2844
/**

0 commit comments

Comments
 (0)