Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Argument.php #911

Merged
merged 2 commits into from May 31, 2019
+24 −26
Merged

Update Argument.php #911

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cf7f90
Update Argument.php
iliyaZelenko Nov 10, 2018
c4d92f2
Update Argument.php
iliyaZelenko Nov 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 24 additions & 26 deletions src/Intervention/Image/Commands/Argument.php
View file
Open in desktop
Expand Up @@ -81,59 +81,57 @@ public function required()
*/
public function type($type)
{
$fail = false;

$valid = true;
$value = $this->value();

if (is_null($value)) {
if ($value === null) {
return $this;
}

switch (strtolower($type)) {

case 'bool':
case 'boolean':
$fail = ! is_bool($value);
$message = sprintf('%s accepts only boolean values as argument %d.', $this->getCommandName(), $this->key + 1);
$valid = \is_bool($value);
$message = '%s accepts only boolean values as argument %d.';
break;

case 'int':
case 'integer':
$fail = ! is_integer($value);
$message = sprintf('%s accepts only integer values as argument %d.', $this->getCommandName(), $this->key + 1);
$valid = \is_int($value);
$message = '%s accepts only integer values as argument %d.';
break;

case 'num':
case 'numeric':
$fail = ! is_numeric($value);
$message = sprintf('%s accepts only numeric values as argument %d.', $this->getCommandName(), $this->key + 1);
$valid = is_numeric($value);
$message = '%s accepts only numeric values as argument %d.';
break;

case 'str':
case 'string':
$fail = ! is_string($value);
$message = sprintf('%s accepts only string values as argument %d.', $this->getCommandName(), $this->key + 1);
$valid = \is_string($value);
$message = '%s accepts only string values as argument %d.';
break;

case 'array':
$fail = ! is_array($value);
$message = sprintf('%s accepts only array as argument %d.', $this->getCommandName(), $this->key + 1);
$valid = \is_array($value);
$message = '%s accepts only array as argument %d.';
break;

case 'closure':
$fail = ! is_a($value, '\Closure');
$message = sprintf('%s accepts only Closure as argument %d.', $this->getCommandName(), $this->key + 1);
$valid = is_a($value, '\Closure');
$message = '%s accepts only Closure as argument %d.';
break;

case 'digit':
$fail = ! $this->isDigit($value);
$message = sprintf('%s accepts only integer values as argument %d.', $this->getCommandName(), $this->key + 1);
$valid = $this->isDigit($value);
$message = '%s accepts only integer values as argument %d.';
break;
}

if ($fail) {
if (! $valid) {
$commandName = $this->getCommandName();
$argument = $this->key + 1;

$message = isset($message) ? $message : sprintf("Missing argument for %d.", $this->key);
if (isset($message)) {
$message = sprintf($message, $commandName, $argument);
} else {
$message = sprintf('Missing argument for %d.', $argument);
}

throw new \Intervention\Image\Exception\InvalidArgumentException(
$message
Expand Down