Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Felix committed Jan 1, 2017
2 parents 5dddfd4 + ebe2a01 commit ffba9d6
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 19 deletions.
5 changes: 1 addition & 4 deletions src/Api/StatBilling.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

class StatBilling extends BaseStat
{

public function bill($year, $month)
{
$response = $this->performQuery('billing/bill', ['year' => $year, 'month' => $month]);
Expand Down Expand Up @@ -105,7 +104,6 @@ public function siteBreakdown($year, $month, $charged_only = false)
}

return $statBill;

}

/**
Expand All @@ -131,7 +129,7 @@ private function extractOptionalServices($optionalServices)
{
$services = new Collection();

if(is_null($optionalServices['OptionalService'])){
if (is_null($optionalServices['OptionalService'])) {
return $services;
}

Expand All @@ -146,5 +144,4 @@ private function extractOptionalServices($optionalServices)

return $services;
}

}
2 changes: 1 addition & 1 deletion src/Api/StatBulk.php
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ private function transformBulkJobStatus($job)
$bulkJob->job_type = $job['JobType'];
$bulkJob->format = $job['Format'];

if(array_has($job, ['Project', 'Folder', 'SiteTitle', 'SiteUrl'])){
if (array_has($job, ['Project', 'Folder', 'SiteTitle', 'SiteUrl'])) {
$bulkJob->project = $job['Project'];
$bulkJob->folder = $job['Folder'];
$bulkJob->site_title = $job['SiteTitle'];
Expand Down
2 changes: 0 additions & 2 deletions src/Api/StatSites.php
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ public function sov($siteID, Carbon $fromDate, Carbon $toDate) : Collection


$sovSites->transform(function ($sov) {

$shareOfVoice = new StatShareOfVoice([
'date' => $sov['date'],
'sites' => collect($sov['Site'])->transform(function ($site) {
Expand Down Expand Up @@ -251,5 +250,4 @@ public function mostFrequentDomains($siteID, $engine = 'google')

return $domains;
}

}
1 change: 0 additions & 1 deletion src/Api/StatTags.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ public function sov($siteID, Carbon $fromDate, Carbon $toDate) : Collection


$sovSites->transform(function ($sov) {

$shareOfVoice = new StatShareOfVoice([
'date' => $sov['date'],
'sites' => collect($sov['Site'])->transform(function ($site) {
Expand Down
1 change: 0 additions & 1 deletion src/Objects/StatBillKeywordType.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@

class StatBillKeywordType extends DataTransferObject
{

}
1 change: 0 additions & 1 deletion src/Objects/StatBillKeywordTypes.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@

class StatBillKeywordTypes extends DataTransferObject
{

}
1 change: 0 additions & 1 deletion src/Objects/StatBillServices.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@

class StatBillServices extends DataTransferObject
{

}
1 change: 0 additions & 1 deletion src/Objects/StatShareOfVoice.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ class StatShareOfVoice extends DataTransferObject
protected $casts = [
'date' => 'date',
];

}
1 change: 0 additions & 1 deletion src/Objects/StatShareOfVoiceSite.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ class StatShareOfVoiceSite extends DataTransferObject
'share' => 'float',
'pinned' => 'boolean'
];

}
3 changes: 0 additions & 3 deletions tests/Unit/SitesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,6 @@ public function it_can_get_the_sov_for_a_site()
$this->assertInstanceOf(Carbon::class, $response->first()->date);
$this->assertEquals('2016-10-01', $response->first()->date->toDateString());
$this->assertEquals('www.example.de', $response->first()->sites->first()->domain);

}

/** @test */
Expand Down Expand Up @@ -582,7 +581,6 @@ public function it_can_get_the_most_frequent_domains_for_google_from_a_site()
$this->assertEquals('2016-12-25', $response->first()->analyzed_on->toDateString());
$this->assertEquals('xxx.com', $response->first()->domain);
$this->assertEquals(800, $response->first()->top_ten_results);

}

/** @test */
Expand Down Expand Up @@ -624,6 +622,5 @@ public function it_can_get_the_most_frequent_domains_for_yahoo_from_a_site()
$this->assertEquals('2016-12-25', $response->first()->analyzed_on->toDateString());
$this->assertEquals('xxx.com', $response->first()->domain);
$this->assertEquals(800, $response->first()->top_ten_results);

}
}
3 changes: 0 additions & 3 deletions tests/Unit/TagsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,6 @@ public function it_can_get_the_sov_for_a_tag()
$this->assertInstanceOf(Carbon::class, $response->first()->date);
$this->assertEquals('2016-10-01', $response->first()->date->toDateString());
$this->assertEquals('www.example.de', $response->first()->sites->first()->domain);

}

/** @test */
Expand Down Expand Up @@ -421,7 +420,6 @@ public function it_can_get_the_most_frequent_domains_for_google_from_a_tag()
$this->assertEquals('2016-12-25', $response->first()->analyzed_on->toDateString());
$this->assertEquals('xxx.com', $response->first()->domain);
$this->assertEquals(800, $response->first()->top_ten_results);

}

/** @test */
Expand Down Expand Up @@ -463,6 +461,5 @@ public function it_can_get_the_most_frequent_domains_for_yahoo_from_a_tag()
$this->assertEquals('2016-12-25', $response->first()->analyzed_on->toDateString());
$this->assertEquals('xxx.com', $response->first()->domain);
$this->assertEquals(800, $response->first()->top_ten_results);

}
}

0 comments on commit ffba9d6

Please sign in to comment.