From 22921f86bee67b8fa7ca10929363b6ca7845e0ee Mon Sep 17 00:00:00 2001 From: Oleg Koltsov Date: Thu, 3 Oct 2019 13:32:49 +0500 Subject: [PATCH] feat(lib): add php-cs-fixer, pretty code --- .php_cs.dist | 22 +++++ README.md | 4 + composer.json | 3 + src/Delivery.php | 24 ++--- src/Message/Request/AbstractRequest.php | 3 +- src/Message/Request/CalculationLapRequest.php | 23 ++--- src/Message/Request/DeleteParcelsRequest.php | 3 +- .../Request/ListAttachmentTypesRequest.php | 3 +- src/Message/Request/ListCitiesRequest.php | 7 +- src/Message/Request/ListPackagesRequest.php | 3 +- src/Message/Request/ListPointsRequest.php | 11 ++- src/Message/Request/ListServicesRequest.php | 3 +- src/Message/Request/ListStatusesRequest.php | 3 +- src/Message/Request/ListZipsRequest.php | 3 +- src/Message/Request/NewOrderRequest.php | 99 ++++++++++--------- src/Message/Response/AbstractResponse.php | 1 - .../Response/CalculationLapResponse.php | 5 +- .../Response/DeleteParcelsResponse.php | 6 +- .../Response/ListAttachmentTypesResponse.php | 4 +- src/Message/Response/ListCitiesResponse.php | 4 +- src/Message/Response/ListPackagesResponse.php | 4 +- src/Message/Response/ListPointsResponse.php | 4 +- src/Message/Response/ListServicesResponse.php | 4 +- src/Message/Response/ListStatusesResponse.php | 4 +- src/Message/Response/ListZipsResponse.php | 6 +- src/Message/Response/NewOrderResponse.php | 5 +- src/Model/AttachmentType.php | 3 +- src/Model/CalculationLap.php | 11 +-- src/Model/City.php | 6 +- src/Model/Good_.php | 1 - src/Model/ListStatuses.php | 3 +- src/Model/Package.php | 3 +- src/Model/Point.php | 3 +- src/Model/Receiver.php | 4 +- src/Model/SafeDeal_.php | 1 - src/Model/Sender.php | 14 +-- src/Model/Service.php | 3 +- src/Model/Status.php | 2 - src/Model/Zip.php | 1 - 39 files changed, 172 insertions(+), 144 deletions(-) create mode 100644 .php_cs.dist create mode 100644 README.md diff --git a/.php_cs.dist b/.php_cs.dist new file mode 100644 index 0000000..d97aa1f --- /dev/null +++ b/.php_cs.dist @@ -0,0 +1,22 @@ +exclude([ + 'runtime', + ]) + ->in(__DIR__ . '/src'); + +$rules = [ + '@Symfony' => true, + 'phpdoc_inline_tag' => false, + 'single_import_per_statement' => false, + 'concat_space' => ['spacing' => 'one'], + 'array_syntax' => ['syntax' => 'short'], + 'phpdoc_no_package' => false, +]; + +if (class_exists('\\PhpCsFixer\\Fixer\\ControlStructure\\YodaStyleFixer')) { + $rules['yoda_style'] = false; +} + +return PhpCsFixer\Config::create()->setRules($rules)->setFinder($finder); diff --git a/README.md b/README.md new file mode 100644 index 0000000..fec6bd6 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +Boxberry API C2C +=== + +Клиент для общения с API Boxberry diff --git a/composer.json b/composer.json index ad0c4ad..0faaac8 100644 --- a/composer.json +++ b/composer.json @@ -34,5 +34,8 @@ "psr-4": { "Boxberry\\C2C\\": "src" } + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.15" } } diff --git a/src/Delivery.php b/src/Delivery.php index cf541e2..feebb03 100644 --- a/src/Delivery.php +++ b/src/Delivery.php @@ -1,6 +1,5 @@ null, - 'token' => null, + 'token' => null, ]; } @@ -60,7 +59,7 @@ public function calculate(array $options) { $request = $this->createRequest(CalculationLapRequest::class, $options); - /** @var CalculationLapRequest $request */ + /* @var CalculationLapRequest $request */ return $request; } @@ -79,7 +78,7 @@ public function deleteParcels(array $options) { $request = $this->createRequest(DeleteParcelsRequest::class, $options); - /** @var DeleteParcelsRequest $request */ + /* @var DeleteParcelsRequest $request */ return $request; } @@ -97,7 +96,7 @@ public function getAttachmentTypes(array $options = []) { $request = $this->createRequest(ListAttachmentTypesRequest::class, $options); - /** @var ListAttachmentTypesRequest $request */ + /* @var ListAttachmentTypesRequest $request */ return $request; } @@ -118,7 +117,7 @@ public function getCities(array $options = []) { $request = $this->createRequest(ListCitiesRequest::class, $options); - /** @var ListCitiesRequest $request */ + /* @var ListCitiesRequest $request */ return $request; } @@ -136,7 +135,7 @@ public function getPackages(array $options = []) { $request = $this->createRequest(ListPackagesRequest::class, $options); - /** @var ListPackagesRequest $request */ + /* @var ListPackagesRequest $request */ return $request; } @@ -156,7 +155,7 @@ public function getPoints(array $options = []) { $request = $this->createRequest(ListPointsRequest::class, $options); - /** @var ListPointsRequest $request */ + /* @var ListPointsRequest $request */ return $request; } @@ -174,7 +173,7 @@ public function getServices(array $options = []) { $request = $this->createRequest(ListServicesRequest::class, $options); - /** @var ListServicesRequest $request */ + /* @var ListServicesRequest $request */ return $request; } @@ -193,7 +192,7 @@ public function getStatuses(array $options) { $request = $this->createRequest(ListStatusesRequest::class, $options); - /** @var ListStatusesRequest $request */ + /* @var ListStatusesRequest $request */ return $request; } @@ -202,6 +201,7 @@ public function getStatuses(array $options) * * $options = [ * ] + * * @param array $options Входные параметры (см. выше) * * @return ListZipsRequest @@ -210,7 +210,7 @@ public function getZips(array $options = []) { $request = $this->createRequest(ListZipsRequest::class, $options); - /** @var ListZipsRequest $request */ + /* @var ListZipsRequest $request */ return $request; } @@ -244,7 +244,7 @@ public function createOrder(array $options) { $request = $this->createRequest(NewOrderRequest::class, $options); - /** @var NewOrderRequest $request */ + /* @var NewOrderRequest $request */ return $request; } } diff --git a/src/Message/Request/AbstractRequest.php b/src/Message/Request/AbstractRequest.php index 08c4ecf..2f56ead 100644 --- a/src/Message/Request/AbstractRequest.php +++ b/src/Message/Request/AbstractRequest.php @@ -1,6 +1,5 @@ setParameter('package', (array)$package); + return $this->setParameter('package', (array) $package); } /** @@ -81,7 +82,7 @@ public function setPackage($package) */ public function setListServices($listServices) { - return $this->setParameter('list_services', (array)$listServices); + return $this->setParameter('list_services', (array) $listServices); } /** @@ -92,7 +93,7 @@ public function getValidationRules() $baseRules = parent::getValidationRules(); $rules = [ - 'sender_city' => new Assert\Required([ + 'sender_city' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), @@ -100,15 +101,15 @@ public function getValidationRules() new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'public_price' => new Assert\Required([ + 'public_price' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), - 'promo_code' => new Assert\Optional([ + 'promo_code' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'package' => new Assert\Required([ + 'package' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'array']), new Assert\Collection([ @@ -116,19 +117,19 @@ public function getValidationRules() new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), - 'package_code' => new Assert\Optional([ + 'package_code' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'depth' => new Assert\Optional([ + 'depth' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), - 'width' => new Assert\Optional([ + 'width' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), - 'height' => new Assert\Optional([ + 'height' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), diff --git a/src/Message/Request/DeleteParcelsRequest.php b/src/Message/Request/DeleteParcelsRequest.php index 92a1221..5291160 100644 --- a/src/Message/Request/DeleteParcelsRequest.php +++ b/src/Message/Request/DeleteParcelsRequest.php @@ -1,6 +1,5 @@ new Assert\Optional([ + 'lap_receive' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'bool']), ]), - 'lap_take' => new Assert\Optional([ + 'lap_take' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'bool']), ]), diff --git a/src/Message/Request/ListPackagesRequest.php b/src/Message/Request/ListPackagesRequest.php index 4a7c719..ba56f37 100644 --- a/src/Message/Request/ListPackagesRequest.php +++ b/src/Message/Request/ListPackagesRequest.php @@ -1,6 +1,5 @@ 'bool']), ]), - 'city' => new Assert\Optional([ + 'city' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), diff --git a/src/Message/Request/ListServicesRequest.php b/src/Message/Request/ListServicesRequest.php index fc055a1..cfaf88f 100644 --- a/src/Message/Request/ListServicesRequest.php +++ b/src/Message/Request/ListServicesRequest.php @@ -1,6 +1,5 @@ setParameter('sender', (array)$sender); + return $this->setParameter('sender', (array) $sender); } /** @@ -96,10 +97,10 @@ public function setSender($sender) public function setReceiver($receiver) { if (is_object($receiver)) { - $receiver = Helper::filterEmpty((array)$receiver); + $receiver = Helper::filterEmpty((array) $receiver); } - return $this->setParameter('receiver', (array)$receiver); + return $this->setParameter('receiver', (array) $receiver); } /** @@ -109,7 +110,7 @@ public function setReceiver($receiver) */ public function setPackage($package) { - return $this->setParameter('package', (array)$package); + return $this->setParameter('package', (array) $package); } /** @@ -155,28 +156,28 @@ public function getValidationRules() new Assert\Type(['type' => 'int']), new Assert\Choice(['choices' => [1, 2, 3, 4]]), ]), - 'public_price' => new Assert\Required([ + 'public_price' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), - 'payer_type' => new Assert\Required([ + 'payer_type' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'int']), new Assert\Choice(['choices' => [1, 2]]), ]), - 'prepayd_sum' => new Assert\Optional([ + 'prepayd_sum' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), - 'sender' => new Assert\Required([ + 'sender' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'array']), new Assert\Collection([ - 'city' => new Assert\Required([ + 'city' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'point_code' => new Assert\Optional([ + 'point_code' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), @@ -184,45 +185,45 @@ public function getValidationRules() new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'document' => new Assert\Optional([ + 'document' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), - 'doc_series' => new Assert\Optional([ + 'doc_series' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'doc_num' => new Assert\Optional([ + 'doc_num' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'phone' => new Assert\Required([ + 'phone' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'email' => new Assert\Optional([ + 'email' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'zip' => new Assert\Optional([ + 'zip' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'address' => new Assert\Optional([ + 'address' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), ]), ]), - 'receiver' => new Assert\Required([ + 'receiver' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'array']), new Assert\Collection([ - 'city' => new Assert\Required([ + 'city' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'point_code' => new Assert\Optional([ + 'point_code' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), @@ -230,25 +231,25 @@ public function getValidationRules() new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'phone' => new Assert\Required([ + 'phone' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'email' => new Assert\Optional([ + 'email' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'zip' => new Assert\Optional([ + 'zip' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'address' => new Assert\Optional([ + 'address' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), ]), ]), - 'package' => new Assert\Required([ + 'package' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'array']), new Assert\Collection([ @@ -256,29 +257,29 @@ public function getValidationRules() new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), - 'package_code' => new Assert\Optional([ + 'package_code' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), - 'depth' => new Assert\Optional([ + 'depth' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), - 'width' => new Assert\Optional([ + 'width' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), - 'height' => new Assert\Optional([ + 'height' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'int']), ]), - 'attachment_id' => new Assert\Required([ + 'attachment_id' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), ]), ]), - 'promo_code' => new Assert\Optional([ + 'promo_code' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), @@ -286,11 +287,11 @@ public function getValidationRules() new Assert\NotBlank(), new Assert\Type(['type' => 'array']), ]), - 'safe_deal' => new Assert\Optional([ + 'safe_deal' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'array']), new Assert\Collection([ - 'title' => new Assert\Required([ + 'title' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), @@ -298,15 +299,15 @@ public function getValidationRules() new Assert\NotBlank(), new Assert\Choice(['choices' => ['consumer', 'supplier']]), ]), - 'payer_target' => new Assert\Optional([ + 'payer_target' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Choice(['choices' => ['account', 'card']]), ]), - 'goods' => new Assert\Optional([ + 'goods' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Type(['type' => 'array']), new Assert\Collection([ - 'title' => new Assert\Required([ + 'title' => new Assert\Required([ new Assert\NotBlank(), new Assert\Type(['type' => 'string']), ]), @@ -314,13 +315,13 @@ public function getValidationRules() new Assert\NotBlank(), new Assert\Choice(['choices' => ['consumer', 'supplier']]), ]), - 'payer_target' => new Assert\Optional([ + 'payer_target' => new Assert\Optional([ new Assert\NotBlank(), new Assert\Choice(['choices' => ['account', 'card']]), ]), - 'goods' => new Assert\Optional([ + 'goods' => new Assert\Optional([ new Assert\NotBlank(), - new Assert\Type(['type' => 'array']), // + new Assert\Type(['type' => 'array']), ]), ]), ]), diff --git a/src/Message/Response/AbstractResponse.php b/src/Message/Response/AbstractResponse.php index 27b1ba7..ac49b33 100644 --- a/src/Message/Response/AbstractResponse.php +++ b/src/Message/Response/AbstractResponse.php @@ -1,6 +1,5 @@ data; - /** @var array $data */ //TODO + /* @var array $data */ //TODO return $data; } diff --git a/src/Message/Response/NewOrderResponse.php b/src/Message/Response/NewOrderResponse.php index 07c60b8..4bf373a 100644 --- a/src/Message/Response/NewOrderResponse.php +++ b/src/Message/Response/NewOrderResponse.php @@ -1,14 +1,14 @@