Skip to content

Commit

Permalink
Reformat code
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomas-novotny
tomas-novotny committed Sep 7, 2019
1 parent 2faec9e commit 820f4a7
Show file tree
Hide file tree
Showing 15 changed files with 77 additions and 61 deletions.
8 changes: 4 additions & 4 deletions tests/Unit/Balikobot/GetAdrUnitsTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ public function testResponseData()
'units' => [
[
'code' => 1,
'name' => "KM",
'name' => 'KM',
'attr' => 4,
],
[
'code' => 876,
'name' => "M",
'name' => 'M',
],
],
]);
Expand All @@ -51,8 +51,8 @@ public function testResponseData()

$this->assertEquals(
[
1 => "KM",
876 => "M",
1 => 'KM',
876 => 'M',
],
$units
);
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Balikobot/GetBranchesForLocationTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ public function testResponseData()
'branches' => [
[
'id' => 1,
'zip' => "11000",
'zip' => '11000',
],
[
'id' => 876,
'zip' => "12000",
'zip' => '12000',
],
],
]);
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Balikobot/GetBranchesTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@ public function testResponseData()
'branches' => [
[
'id' => 1,
'zip' => "11000",
'zip' => '11000',
],
[
'id' => 876,
'zip' => "12000",
'zip' => '12000',
],
],
]);
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Balikobot/GetLabelsTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public function testMakeRequest()
{
$requester = $this->newRequesterWithMockedRequestMethod(200, [
'status' => 200,
'labels_url' => "http://pdf.balikobot.cz/dpd/eNorMdY1NFwwXDAELgE2",
'labels_url' => 'http://pdf.balikobot.cz/dpd/eNorMdY1NFwwXDAELgE2',
]);

$service = new Balikobot($requester);
Expand Down
8 changes: 4 additions & 4 deletions tests/Unit/Balikobot/GetManipulationUnitsTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ public function testResponseData()
'units' => [
[
'code' => 1,
'name' => "KM",
'name' => 'KM',
'attr' => 4,
],
[
'code' => 876,
'name' => "M",
'name' => 'M',
],
],
]);
Expand All @@ -51,8 +51,8 @@ public function testResponseData()

$this->assertEquals(
[
1 => "KM",
876 => "M",
1 => 'KM',
876 => 'M',
],
$units
);
Expand Down
16 changes: 8 additions & 8 deletions tests/Unit/Balikobot/OrderB2AShipmentTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public function testMakeRequest()
0 => [
'carrier_id' => 'NP1504102246M',
'package_id' => 21,
'track_url' => 'https://www.geis-group.cz/cs/sledovani-zasilky/?p=NP1504102246M"',
'status_message' => 'OK, přeprava byla objednána."',
'track_url' => 'https://www.geis-group.cz/cs/sledovani-zasilky/?p=NP1504102246M',
'status_message' => 'OK, přeprava byla objednána.',
'status' => '200',
],
]);
Expand Down Expand Up @@ -61,15 +61,15 @@ public function testResponseData()
0 => [
'carrier_id' => 'NP1504102246M',
'package_id' => 21,
'track_url' => 'https://www.geis-group.cz/cs/sledovani-zasilky/?p=NP1504102246M"',
'status_message' => 'OK, přeprava byla objednána."',
'track_url' => 'https://www.geis-group.cz/cs/sledovani-zasilky/?p=NP1504102246M',
'status_message' => 'OK, přeprava byla objednána.',
'status' => '200',
],
1 => [
'carrier_id' => 'NP1504102247M',
'package_id' => 22,
'track_url' => 'https://www.geis-group.cz/cs/sledovani-zasilky/?p=NP1504102247M"',
'status_message' => 'OK, přeprava byla objednána."',
'track_url' => 'https://www.geis-group.cz/cs/sledovani-zasilky/?p=NP1504102247M',
'status_message' => 'OK, přeprava byla objednána.',
'status' => '200',
],
]);
Expand All @@ -92,12 +92,12 @@ public function testResponseDataWithoutCarrierId()
'status' => 200,
0 => [
'package_id' => 21,
'status_message' => 'OK, přeprava byla objednána."',
'status_message' => 'OK, přeprava byla objednána.',
'status' => '200',
],
1 => [
'package_id' => 22,
'status_message' => 'OK, přeprava byla objednána."',
'status_message' => 'OK, přeprava byla objednána.',
'status' => '200',
],
]);
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/BranchTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ public function testStaticConstructor()
{
$branch = Branch::newInstanceFromData('cp', 'NP', [
'id' => '1234',
'type' => "type",
'name' => "name",
'city' => "city",
'type' => 'type',
'name' => 'name',
'city' => 'city',
'street' => 'street',
'zip' => 'zip',
'country' => 'country',
Expand Down
8 changes: 4 additions & 4 deletions tests/Unit/Client/Requests/AdrUnitsRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ public function testOnlyUnitsDataAreReturned()
'units' => [
[
'code' => 1,
'name' => "KM",
'name' => 'KM',
'attr' => 4,
],
[
'code' => 876,
'name' => "M",
'name' => 'M',
],
],
]);
Expand All @@ -101,8 +101,8 @@ public function testOnlyUnitsDataAreReturned()

$this->assertEquals(
[
1 => "KM",
876 => "M",
1 => 'KM',
876 => 'M',
],
$units
);
Expand Down
8 changes: 4 additions & 4 deletions tests/Unit/Client/Requests/BranchLocatorRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ public function testOnlyBranchesDataAreReturned()
'branches' => [
[
'code' => 1,
'name' => "AAA",
'name' => 'AAA',
],
[
'code' => 876,
'name' => "BBB",
'name' => 'BBB',
],
],
]);
Expand All @@ -111,11 +111,11 @@ public function testOnlyBranchesDataAreReturned()
[
[
'code' => 1,
'name' => "AAA",
'name' => 'AAA',
],
[
'code' => 876,
'name' => "BBB",
'name' => 'BBB',
],
],
$branches
Expand Down
8 changes: 4 additions & 4 deletions tests/Unit/Client/Requests/BranchesRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ public function testOnlyBranchesDataAreReturned()
'branches' => [
[
'code' => 1,
'name' => "AAA",
'name' => 'AAA',
],
[
'code' => 876,
'name' => "BBB",
'name' => 'BBB',
],
],
]);
Expand All @@ -140,11 +140,11 @@ public function testOnlyBranchesDataAreReturned()
[
[
'code' => 1,
'name' => "AAA",
'name' => 'AAA',
],
[
'code' => 876,
'name' => "BBB",
'name' => 'BBB',
],
],
$branches
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Client/Requests/LabelsRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function testMakeRequest()
{
$requester = $this->newRequesterWithMockedRequestMethod(200, [
'status' => 200,
'labels_url' => "http://pdf.balikobot.cz/dpd/eNorMdY1NFwwXDAELgE2",
'labels_url' => 'http://pdf.balikobot.cz/dpd/eNorMdY1NFwwXDAELgE2',
]);

$client = new Client($requester);
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Client/Requests/ManipulationUnitsRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ public function testOnlyUnitsDataAreReturned()
'units' => [
[
'code' => 1,
'name' => "KM",
'name' => 'KM',
'attr' => 4,
],
[
'code' => 876,
'name' => "M",
'name' => 'M',
],
],
]);
Expand All @@ -99,6 +99,6 @@ public function testOnlyUnitsDataAreReturned()

$units = $client->getManipulationUnits('cp');

$this->assertEquals([1 => "KM", 876 => "M"], $units);
$this->assertEquals([1 => 'KM', 876 => 'M'], $units);
}
}
2 changes: 1 addition & 1 deletion tests/Unit/Client/Requests/TrackRequestTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function testRequestShouldHaveStatus()
[
'date' => '2018-07-02 00:00:00',
'status_id' => 1,
'name' => '"Doručování zásilky. 10003 Depo Praha 701',
'name' => 'Doručování zásilky. 10003 Depo Praha 701',
],
],
]);
Expand Down
36 changes: 26 additions & 10 deletions tests/Unit/OrderedPackageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ public function testStaticConstructor()
{
$orderedPackage = OrderedPackage::newInstanceFromData('cp', '0001', [
'package_id' => 1234,
'carrier_id' => "02IID",
'track_url' => "/track",
'label_url' => "/labels",
'carrier_id' => '02IID',
'track_url' => '/track',
'label_url' => '/labels',
'carrier_id_swap' => 23,
'pieces' => [1, 2],
]);

$this->assertEquals('cp', $orderedPackage->getShipper());
$this->assertEquals('0001', $orderedPackage->getBatchId());
$this->assertEquals(1234, $orderedPackage->getPackageId());
$this->assertEquals("02IID", $orderedPackage->getCarrierId());
$this->assertEquals("/track", $orderedPackage->getTrackUrl());
$this->assertEquals("/labels", $orderedPackage->getLabelUrl());
$this->assertEquals('02IID', $orderedPackage->getCarrierId());
$this->assertEquals('/track', $orderedPackage->getTrackUrl());
$this->assertEquals('/labels', $orderedPackage->getLabelUrl());
$this->assertEquals(23, $orderedPackage->getCarrierIdSwap());
$this->assertEquals([1, 2], $orderedPackage->getPieces());
}
Expand All @@ -32,16 +32,32 @@ public function testStaticConstructorWithMissingData()
{
$orderedPackage = OrderedPackage::newInstanceFromData('cp', '0001', [
'package_id' => 1234,
'carrier_id' => "02IID",
'label_url' => "/labels",
'carrier_id' => '02IID',
'label_url' => '/labels',
]);

$this->assertEquals('cp', $orderedPackage->getShipper());
$this->assertEquals('0001', $orderedPackage->getBatchId());
$this->assertEquals(1234, $orderedPackage->getPackageId());
$this->assertEquals("02IID", $orderedPackage->getCarrierId());
$this->assertEquals('02IID', $orderedPackage->getCarrierId());
$this->assertEquals(null, $orderedPackage->getTrackUrl());
$this->assertEquals("/labels", $orderedPackage->getLabelUrl());
$this->assertEquals('/labels', $orderedPackage->getLabelUrl());
$this->assertEquals(null, $orderedPackage->getCarrierIdSwap());
$this->assertEquals([], $orderedPackage->getPieces());
}

public function testStaticConstructorWithMissingCarrierId()
{
$orderedPackage = OrderedPackage::newInstanceFromData('cp', '0001', [
'package_id' => 1234,
]);

$this->assertEquals('cp', $orderedPackage->getShipper());
$this->assertEquals('0001', $orderedPackage->getBatchId());
$this->assertEquals(1234, $orderedPackage->getPackageId());
$this->assertEquals('', $orderedPackage->getCarrierId());
$this->assertEquals(null, $orderedPackage->getTrackUrl());
$this->assertEquals(null, $orderedPackage->getLabelUrl());
$this->assertEquals(null, $orderedPackage->getCarrierIdSwap());
$this->assertEquals([], $orderedPackage->getPieces());
}
Expand Down
20 changes: 10 additions & 10 deletions tests/Unit/OrderedShipmentTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ public function testStaticConstructor()
[1, 67],
[
'order_id' => 1234,
'handover_url' => "/handover",
'labels_url' => "/labels",
'file_url' => "/file",
'handover_url' => '/handover',
'labels_url' => '/labels',
'file_url' => '/file',
],
new DateTime('2018-10-10 14:00:00')
);

$this->assertEquals('cp', $orderedShipment->getShipper());
$this->assertEquals(1234, $orderedShipment->getOrderId());
$this->assertEquals("/handover", $orderedShipment->getHandoverUrl());
$this->assertEquals("/labels", $orderedShipment->getLabelsUrl());
$this->assertEquals("/file", $orderedShipment->getFileUrl());
$this->assertEquals('/handover', $orderedShipment->getHandoverUrl());
$this->assertEquals('/labels', $orderedShipment->getLabelsUrl());
$this->assertEquals('/file', $orderedShipment->getFileUrl());
$this->assertEquals([1, 67], $orderedShipment->getPackageIds());
$this->assertEquals(new \DateTime('2018-10-10 14:00:00'), $orderedShipment->getDate());
}
Expand All @@ -38,15 +38,15 @@ public function testStaticConstructorWithMissingData()
[1, 67],
[
'order_id' => 1234,
'handover_url' => "/handover",
'labels_url' => "/labels",
'handover_url' => '/handover',
'labels_url' => '/labels',
]
);

$this->assertEquals('cp', $orderedShipment->getShipper());
$this->assertEquals(1234, $orderedShipment->getOrderId());
$this->assertEquals("/handover", $orderedShipment->getHandoverUrl());
$this->assertEquals("/labels", $orderedShipment->getLabelsUrl());
$this->assertEquals('/handover', $orderedShipment->getHandoverUrl());
$this->assertEquals('/labels', $orderedShipment->getLabelsUrl());
$this->assertEquals(null, $orderedShipment->getFileUrl());
$this->assertEquals([1, 67], $orderedShipment->getPackageIds());
$this->assertEquals(null, $orderedShipment->getDate());
Expand Down

0 comments on commit 820f4a7

Please sign in to comment.