From 989c06a38305ec3868e3140b843378f58632860a Mon Sep 17 00:00:00 2001 From: AnthonyAxenov Date: Sun, 7 Jun 2020 19:29:37 +0800 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20Item?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * valid_strlen() * Constraints::MAX_LENGTH_ITEM_NAME * Constraints::MAX_LENGTH_MEASUREMENT_UNIT * Constraints::MAX_LENGTH_USER_DATA --- src/AtolOnline/Entities/Item.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/AtolOnline/Entities/Item.php b/src/AtolOnline/Entities/Item.php index 980659c..fcbc72f 100644 --- a/src/AtolOnline/Entities/Item.php +++ b/src/AtolOnline/Entities/Item.php @@ -9,12 +9,14 @@ namespace AtolOnline\Entities; -use AtolOnline\{Exceptions\AtolNameTooLongException, +use AtolOnline\{Constants\Constraints, + Exceptions\AtolNameTooLongException, Exceptions\AtolPriceTooHighException, Exceptions\AtolTooManyException, Exceptions\AtolUnitTooLongException, Exceptions\AtolUserdataTooLongException, - Traits\RublesKopeksConverter}; + Traits\RublesKopeksConverter +}; /** * Предмет расчёта (товар, услуга) @@ -137,8 +139,8 @@ class Item extends Entity public function setName(string $name) { $name = trim($name); - if ((function_exists('mb_strlen') ? mb_strlen($name) : strlen($name)) > 128) { - throw new AtolNameTooLongException($name, 128); + if (valid_strlen($name) > Constraints::MAX_LENGTH_ITEM_NAME) { + throw new AtolNameTooLongException($name, Constraints::MAX_LENGTH_ITEM_NAME); } $this->name = $name; return $this; @@ -225,8 +227,8 @@ class Item extends Entity public function setMeasurementUnit(string $measurement_unit) { $measurement_unit = trim($measurement_unit); - if ((function_exists('mb_strlen') ? mb_strlen($measurement_unit) : strlen($measurement_unit)) > 16) { - throw new AtolUnitTooLongException($measurement_unit, 16); + if (valid_strlen($measurement_unit) > Constraints::MAX_LENGTH_MEASUREMENT_UNIT) { + throw new AtolUnitTooLongException($measurement_unit, Constraints::MAX_LENGTH_MEASUREMENT_UNIT); } $this->measurement_unit = $measurement_unit; return $this; @@ -328,8 +330,8 @@ class Item extends Entity public function setUserData(string $user_data) { $user_data = trim($user_data); - if ((function_exists('mb_strlen') ? mb_strlen($user_data) : strlen($user_data)) > 64) { - throw new AtolUserdataTooLongException($user_data, 64); + if (valid_strlen($user_data) > Constraints::MAX_LENGTH_USER_DATA) { + throw new AtolUserdataTooLongException($user_data, Constraints::MAX_LENGTH_USER_DATA); } $this->user_data = $user_data; return $this;