Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

$finder = PhpCsFixer\Finder::create()
->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);
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Boxberry API C2C
===

Клиент для общения с API Boxberry
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,8 @@
"psr-4": {
"Boxberry\\C2C\\": "src"
}
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.15"
}
}
24 changes: 12 additions & 12 deletions src/Delivery.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php


namespace Boxberry\C2C;

use Boxberry\C2C\Message\Request\CalculationLapRequest;
Expand All @@ -26,7 +25,7 @@ public function getDefaultParameters()
{
return [
'endPoint' => null,
'token' => null,
'token' => null,
];
}

Expand Down Expand Up @@ -60,7 +59,7 @@ public function calculate(array $options)
{
$request = $this->createRequest(CalculationLapRequest::class, $options);

/** @var CalculationLapRequest $request */
/* @var CalculationLapRequest $request */
return $request;
}

Expand All @@ -79,7 +78,7 @@ public function deleteParcels(array $options)
{
$request = $this->createRequest(DeleteParcelsRequest::class, $options);

/** @var DeleteParcelsRequest $request */
/* @var DeleteParcelsRequest $request */
return $request;
}

Expand All @@ -97,7 +96,7 @@ public function getAttachmentTypes(array $options = [])
{
$request = $this->createRequest(ListAttachmentTypesRequest::class, $options);

/** @var ListAttachmentTypesRequest $request */
/* @var ListAttachmentTypesRequest $request */
return $request;
}

Expand All @@ -118,7 +117,7 @@ public function getCities(array $options = [])
{
$request = $this->createRequest(ListCitiesRequest::class, $options);

/** @var ListCitiesRequest $request */
/* @var ListCitiesRequest $request */
return $request;
}

Expand All @@ -136,7 +135,7 @@ public function getPackages(array $options = [])
{
$request = $this->createRequest(ListPackagesRequest::class, $options);

/** @var ListPackagesRequest $request */
/* @var ListPackagesRequest $request */
return $request;
}

Expand All @@ -156,7 +155,7 @@ public function getPoints(array $options = [])
{
$request = $this->createRequest(ListPointsRequest::class, $options);

/** @var ListPointsRequest $request */
/* @var ListPointsRequest $request */
return $request;
}

Expand All @@ -174,7 +173,7 @@ public function getServices(array $options = [])
{
$request = $this->createRequest(ListServicesRequest::class, $options);

/** @var ListServicesRequest $request */
/* @var ListServicesRequest $request */
return $request;
}

Expand All @@ -193,7 +192,7 @@ public function getStatuses(array $options)
{
$request = $this->createRequest(ListStatusesRequest::class, $options);

/** @var ListStatusesRequest $request */
/* @var ListStatusesRequest $request */
return $request;
}

Expand All @@ -202,6 +201,7 @@ public function getStatuses(array $options)
*
* $options = [
* ]
*
* @param array $options Входные параметры (см. выше)
*
* @return ListZipsRequest
Expand All @@ -210,7 +210,7 @@ public function getZips(array $options = [])
{
$request = $this->createRequest(ListZipsRequest::class, $options);

/** @var ListZipsRequest $request */
/* @var ListZipsRequest $request */
return $request;
}

Expand Down Expand Up @@ -244,7 +244,7 @@ public function createOrder(array $options)
{
$request = $this->createRequest(NewOrderRequest::class, $options);

/** @var NewOrderRequest $request */
/* @var NewOrderRequest $request */
return $request;
}
}
3 changes: 1 addition & 2 deletions src/Message/Request/AbstractRequest.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?php


namespace Boxberry\C2C\Message\Request;

use Boxberry\Common\Message\Request\AbstractRequest as BaseAbstractRequest;

abstract class AbstractRequest extends BaseAbstractRequest
{
/**
* Возвращает содержимое запроса
* Возвращает содержимое запроса.
*
* @return array|mixed
*/
Expand Down
23 changes: 12 additions & 11 deletions src/Message/Request/CalculationLapRequest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php


namespace Boxberry\C2C\Message\Request;

use Boxberry\C2C\Message\Response\CalculationLapResponse;
Expand All @@ -11,7 +10,9 @@
* Метод позволяет рассчитать стоимость доставки ПиП.
*
* @method CalculationLapResponse send()
*
* @see CalculationLapResponse
*
* @package Boxberry\C2C\Message\Request
*/
class CalculationLapRequest extends AbstractRequest
Expand Down Expand Up @@ -71,7 +72,7 @@ public function setPromoCode($promocode)
*/
public function setPackage($package)
{
return $this->setParameter('package', (array)$package);
return $this->setParameter('package', (array) $package);
}

/**
Expand All @@ -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);
}

/**
Expand All @@ -92,43 +93,43 @@ 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']),
]),
'receiver_city' => new Assert\Required([
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([
'boxberry_package' => new Assert\Required([
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']),
]),
Expand Down
3 changes: 2 additions & 1 deletion src/Message/Request/DeleteParcelsRequest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php


namespace Boxberry\C2C\Message\Request;

use Boxberry\C2C\Message\Response\DeleteParcelsResponse;
Expand All @@ -10,7 +9,9 @@
* Метод позволяет удалить посылки с указанными номерами накладных.
*
* @method DeleteParcelsResponse send()
*
* @see DeleteParcelsResponse
*
* @package Boxberry\C2C\Message\Request
*/
class DeleteParcelsRequest extends AbstractRequest
Expand Down
3 changes: 2 additions & 1 deletion src/Message/Request/ListAttachmentTypesRequest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php


namespace Boxberry\C2C\Message\Request;

use Boxberry\C2C\Message\Response\ListAttachmentTypesResponse;
Expand All @@ -9,7 +8,9 @@
* Метод, возвращает список возможных типов вложений.
*
* @method ListAttachmentTypesResponse send()
*
* @see ListAttachmentTypesResponse
*
* @package Boxberry\C2C\Message\Request
*/
class ListAttachmentTypesRequest extends AbstractRequest
Expand Down
7 changes: 4 additions & 3 deletions src/Message/Request/ListCitiesRequest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php


namespace Boxberry\C2C\Message\Request;

use Boxberry\C2C\Message\Response\ListCitiesResponse;
Expand All @@ -10,7 +9,9 @@
* Метод позволяет получить список городов, в которых есть пункты выдачи заказов Boxberry.
*
* @method ListCitiesResponse send()
*
* @see ListCitiesResponse
*
* @package Boxberry\C2C\Message\Request
*/
class ListCitiesRequest extends AbstractRequest
Expand Down Expand Up @@ -61,11 +62,11 @@ public function getValidationRules()
$baseRules = parent::getValidationRules();

$rules = [
'lap_receive' => 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']),
]),
Expand Down
3 changes: 2 additions & 1 deletion src/Message/Request/ListPackagesRequest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php


namespace Boxberry\C2C\Message\Request;

use Boxberry\C2C\Message\Response\ListPackagesResponse;
Expand All @@ -9,7 +8,9 @@
* Метод для получения списка доступных упаковок.
*
* @method ListPackagesResponse send()
*
* @see ListPackagesResponse
*
* @package Boxberry\C2C\Message\Request
*/
class ListPackagesRequest extends AbstractRequest
Expand Down
11 changes: 6 additions & 5 deletions src/Message/Request/ListPointsRequest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php


namespace Boxberry\C2C\Message\Request;

use Boxberry\C2C\Message\Response\ListPointsResponse;
Expand All @@ -10,7 +9,9 @@
* Метод, позволяющий получить список ПВЗ.
*
* @method ListPointsResponse send()
*
* @see ListPointsResponse
*
* @package Boxberry\C2C\Message\Request
*/
class ListPointsRequest extends AbstractRequest
Expand All @@ -34,9 +35,9 @@ public function setPayment($payment)
}

/**
* @param string $city Код города в ИС Boxberry
* Указывается если есть необходимость наложить фильтр по
* городу, иначе возвращаются отделения во всех городах.
* @param string $city �од города в ИС Boxberry
* Указывается если есть необходимость наложить фильтр по
* городу, иначе возвращаются отделения во всех городах
*
* @return $this
*/
Expand All @@ -57,7 +58,7 @@ public function getValidationRules()
new Assert\NotBlank(),
new Assert\Type(['type' => 'bool']),
]),
'city' => new Assert\Optional([
'city' => new Assert\Optional([
new Assert\NotBlank(),
new Assert\Type(['type' => 'string']),
]),
Expand Down
3 changes: 2 additions & 1 deletion src/Message/Request/ListServicesRequest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php


namespace Boxberry\C2C\Message\Request;

use Boxberry\C2C\Message\Response\ListServicesResponse;
Expand All @@ -9,7 +8,9 @@
* Метод для получения списка дополнительных услуг.
*
* @method ListServicesResponse send()
*
* @see ListServicesResponse
*
* @package Boxberry\C2C\Message\Request
*/
class ListServicesRequest extends AbstractRequest
Expand Down
Loading