mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-09-03 10:53:01 +02:00
Code Issues Releases Wiki Activity

Move method from trait to AbstractDecoder

Browse Source
This commit is contained in:
Oliver Vogel
2023-11-03 15:46:05 +01:00
parent 8041ae6329
commit ce7b640ab9
4 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Drivers/Abstract/Decoders/AbstractDecoder.php
View File

@@ -60,4 +60,13 @@ abstract class AbstractDecoder implements DecoderInterface
return is_array($data) ? $data : []; return is_array($data) ? $data : [];
} }
protected function isValidBase64($input): bool
{
if (!is_string($input)) {
return false;
}
return base64_encode(base64_decode($input)) === str_replace(["\n", "\r"], '', $input);
}
} }

3
src/Drivers/Gd/Decoders/Base64ImageDecoder.php
View File

@@ -6,12 +6,9 @@ use Intervention\Image\Exceptions\DecoderException;
use Intervention\Image\Interfaces\ColorInterface; use Intervention\Image\Interfaces\ColorInterface;
use Intervention\Image\Interfaces\DecoderInterface; use Intervention\Image\Interfaces\DecoderInterface;
use Intervention\Image\Interfaces\ImageInterface; use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Traits\CanValidateBase64;
class Base64ImageDecoder extends BinaryImageDecoder implements DecoderInterface class Base64ImageDecoder extends BinaryImageDecoder implements DecoderInterface
{ {
use CanValidateBase64;
public function decode($input): ImageInterface|ColorInterface public function decode($input): ImageInterface|ColorInterface
{ {
if (! $this->isValidBase64($input)) { if (! $this->isValidBase64($input)) {

3
src/Drivers/Imagick/Decoders/Base64ImageDecoder.php
View File

@@ -6,12 +6,9 @@ use Intervention\Image\Exceptions\DecoderException;
use Intervention\Image\Interfaces\ColorInterface; use Intervention\Image\Interfaces\ColorInterface;
use Intervention\Image\Interfaces\DecoderInterface; use Intervention\Image\Interfaces\DecoderInterface;
use Intervention\Image\Interfaces\ImageInterface; use Intervention\Image\Interfaces\ImageInterface;
use Intervention\Image\Traits\CanValidateBase64;
class Base64ImageDecoder extends BinaryImageDecoder implements DecoderInterface class Base64ImageDecoder extends BinaryImageDecoder implements DecoderInterface
{ {
use CanValidateBase64;
public function decode($input): ImageInterface|ColorInterface public function decode($input): ImageInterface|ColorInterface
{ {
if (! $this->isValidBase64($input)) { if (! $this->isValidBase64($input)) {

15
src/Traits/CanValidateBase64.php
View File

@@ -1,15 +0,0 @@
<?php
namespace Intervention\Image\Traits;
trait CanValidateBase64
{
protected function isValidBase64($input): bool
{
if (! is_string($input)) {
return false;
}
return base64_encode(base64_decode($input)) === str_replace(["\n", "\r"], '', $input);
}
}