Use sprintf() for error messages
This commit is contained in:
parent
7456e56266
commit
a65299546c
|
@ -78,7 +78,12 @@ class StrictList extends SplDoublyLinkedList
|
||||||
public function add(int $index, mixed $item): void
|
public function add(int $index, mixed $item): void
|
||||||
{
|
{
|
||||||
if (!$this->isAllowedType($item)) {
|
if (!$this->isAllowedType($item)) {
|
||||||
throw new InvalidArgumentException('Parameter 2 must be an allowed type, ' . get_debug_type($item) . ' given.');
|
throw new InvalidArgumentException(
|
||||||
|
sprintf(
|
||||||
|
'Parameter 2 must be an allowed type, %s given.',
|
||||||
|
get_debug_type($item)
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
parent::add($index, $item);
|
parent::add($index, $item);
|
||||||
}
|
}
|
||||||
|
@ -96,8 +101,14 @@ class StrictList extends SplDoublyLinkedList
|
||||||
{
|
{
|
||||||
foreach ($items as $count => $item) {
|
foreach ($items as $count => $item) {
|
||||||
if (!$this->isAllowedType($item)) {
|
if (!$this->isAllowedType($item)) {
|
||||||
throw new InvalidArgumentException('Parameter ' . $count + 1 . ' must be an allowed type, ' . get_debug_type($item) . ' given.');
|
throw new InvalidArgumentException(
|
||||||
}
|
sprintf(
|
||||||
|
'Parameter %d must be an allowed type, %s given.',
|
||||||
|
$count + 1,
|
||||||
|
get_debug_type($item)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
foreach ($items as $item) {
|
foreach ($items as $item) {
|
||||||
parent::push($item);
|
parent::push($item);
|
||||||
|
@ -128,10 +139,10 @@ class StrictList extends SplDoublyLinkedList
|
||||||
}
|
}
|
||||||
foreach ($this->allowedTypes as $type) {
|
foreach ($this->allowedTypes as $type) {
|
||||||
$function = 'is_' . $type;
|
$function = 'is_' . $type;
|
||||||
$fqcn = '\\' . ltrim($type, '\\');
|
|
||||||
if (function_exists($function) && $function($item)) {
|
if (function_exists($function) && $function($item)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
$fqcn = '\\' . ltrim($type, '\\');
|
||||||
if (is_object($item) && is_a($item, $fqcn)) {
|
if (is_object($item) && is_a($item, $fqcn)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -164,7 +175,12 @@ class StrictList extends SplDoublyLinkedList
|
||||||
public function offsetSet(mixed $index, mixed $item): void
|
public function offsetSet(mixed $index, mixed $item): void
|
||||||
{
|
{
|
||||||
if (!$this->isAllowedType($item)) {
|
if (!$this->isAllowedType($item)) {
|
||||||
throw new InvalidArgumentException('Parameter 2 must be an allowed type, ' . get_debug_type($item) . ' given.');
|
throw new InvalidArgumentException(
|
||||||
|
sprintf(
|
||||||
|
'Parameter 2 must be an allowed type, %s given.',
|
||||||
|
get_debug_type($item)
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
parent::offsetSet($index, $item);
|
parent::offsetSet($index, $item);
|
||||||
}
|
}
|
||||||
|
@ -182,7 +198,13 @@ class StrictList extends SplDoublyLinkedList
|
||||||
{
|
{
|
||||||
foreach ($items as $count => $item) {
|
foreach ($items as $count => $item) {
|
||||||
if (!$this->isAllowedType($item)) {
|
if (!$this->isAllowedType($item)) {
|
||||||
throw new InvalidArgumentException('Parameter ' . $count + 1 . ' must be an allowed type, ' . get_debug_type($item) . ' given.');
|
throw new InvalidArgumentException(
|
||||||
|
sprintf(
|
||||||
|
'Parameter %d must be an allowed type, %s given.',
|
||||||
|
$count + 1,
|
||||||
|
get_debug_type($item)
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
foreach ($items as $item) {
|
foreach ($items as $item) {
|
||||||
|
@ -203,7 +225,12 @@ class StrictList extends SplDoublyLinkedList
|
||||||
public function push(mixed $item): void
|
public function push(mixed $item): void
|
||||||
{
|
{
|
||||||
if (!$this->isAllowedType($item)) {
|
if (!$this->isAllowedType($item)) {
|
||||||
throw new InvalidArgumentException('Parameter 1 must be an allowed type, ' . get_debug_type($item) . ' given.');
|
throw new InvalidArgumentException(
|
||||||
|
sprintf(
|
||||||
|
'Parameter 1 must be an allowed type, %s given.',
|
||||||
|
get_debug_type($item)
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
parent::push($item);
|
parent::push($item);
|
||||||
}
|
}
|
||||||
|
@ -245,7 +272,12 @@ class StrictList extends SplDoublyLinkedList
|
||||||
public function unshift(mixed $item): void
|
public function unshift(mixed $item): void
|
||||||
{
|
{
|
||||||
if (!$this->isAllowedType($item)) {
|
if (!$this->isAllowedType($item)) {
|
||||||
throw new InvalidArgumentException('Parameter 1 must be an allowed type, ' . get_debug_type($item) . ' given.');
|
throw new InvalidArgumentException(
|
||||||
|
sprintf(
|
||||||
|
'Parameter 1 must be an allowed type, %s given.',
|
||||||
|
get_debug_type($item)
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
parent::unshift($item);
|
parent::unshift($item);
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,12 @@ class StrictQueue extends StrictList
|
||||||
final public function setIteratorMode(int $mode): int
|
final public function setIteratorMode(int $mode): int
|
||||||
{
|
{
|
||||||
if ($mode > 1) {
|
if ($mode > 1) {
|
||||||
throw new RuntimeException('Changing the iterator direction of ' . static::class . ' is prohibited.');
|
throw new RuntimeException(
|
||||||
|
sprintf(
|
||||||
|
'Changing the iterator direction of %s is prohibited.',
|
||||||
|
static::class
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
return parent::setIteratorMode($mode);
|
return parent::setIteratorMode($mode);
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,12 @@ class StrictStack extends StrictList
|
||||||
final public function setIteratorMode(int $mode): int
|
final public function setIteratorMode(int $mode): int
|
||||||
{
|
{
|
||||||
if ($mode < 2) {
|
if ($mode < 2) {
|
||||||
throw new RuntimeException('Changing the iterator direction of ' . static::class . ' is prohibited.');
|
throw new RuntimeException(
|
||||||
|
sprintf(
|
||||||
|
'Changing the iterator direction of %s is prohibited.',
|
||||||
|
static::class
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
return parent::setIteratorMode($mode);
|
return parent::setIteratorMode($mode);
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,13 @@ trait Getter
|
||||||
) {
|
) {
|
||||||
return $this->$method();
|
return $this->$method();
|
||||||
} else {
|
} else {
|
||||||
throw new InvalidArgumentException('Invalid property or missing getter method for property: ' . static::class . '->' . $property . '.');
|
throw new InvalidArgumentException(
|
||||||
|
sprintf(
|
||||||
|
'Invalid property or missing getter method for property: %s->%s.',
|
||||||
|
static::class,
|
||||||
|
$property
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,13 @@ trait Setter
|
||||||
) {
|
) {
|
||||||
$this->$method($value);
|
$this->$method($value);
|
||||||
} else {
|
} else {
|
||||||
throw new InvalidArgumentException('Invalid property or missing setter method for property: ' . static::class . '->' . $property . '.');
|
throw new InvalidArgumentException(
|
||||||
|
sprintf(
|
||||||
|
'Invalid property or missing setter method for property: %s->%s.',
|
||||||
|
static::class,
|
||||||
|
$property
|
||||||
|
)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -66,6 +66,6 @@ trait Singleton
|
||||||
*/
|
*/
|
||||||
final public function __clone(): void
|
final public function __clone(): void
|
||||||
{
|
{
|
||||||
throw new LogicException('Cloning of a Singleton is prohibited.');
|
throw new LogicException('Cloning a singleton is prohibited.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue