Skip to content

Apply fixes from StyleCI #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryzr wants to merge 1 commit into
base: release/0.4
Choose a base branch
from
Open

Apply fixes from StyleCI #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions src/Foundation/AbstractReporter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Soda\Reports\Foundation;

use Illuminate\Database\Query\Builder;
use Illuminate\Http\Request;
use Soda\Reports\Models\Report;
use Illuminate\Support\Facades\DB;
Expand Down Expand Up @@ -42,7 +41,8 @@ public function export(Request $request)
]);
}

public function buildCsv($query) {
public function buildCsv($query)
{
// Open output stream
$handle = fopen('php://output', 'w');

Expand All @@ -66,18 +66,24 @@ public function buildCsv($query) {
fclose($handle);
}

public function insertCsvRow($row) {
public function insertCsvRow($row)
{
$row = method_exists($row, 'toArray') ? $row->toArray() : (array) $row;

if(method_exists($this, 'formatCsvRow')) $row = $this->formatCsvRow($row);
if (method_exists($this, 'formatCsvRow')) {
$row = $this->formatCsvRow($row);
}

return $row;
}

public function insertCsvHeader($row) {
public function insertCsvHeader($row)
{
$row = method_exists($row, 'toArray') ? $row->toArray() : (array) $row;

if(method_exists($this, 'formatCsvRow')) $row = $this->formatCsvRow($row);
if (method_exists($this, 'formatCsvRow')) {
$row = $this->formatCsvRow($row);
}

return array_keys($row);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Models/Report.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Soda\Reports\Models;

use Soda\Cms\Database\Models\Field;
use Illuminate\Support\Facades\Auth;
use Illuminate\Database\Eloquent\Model;
use Soda\Cms\Database\Models\Field;
use Soda\Cms\Database\Models\Traits\OptionallyBoundToApplication;

class Report extends Model
Expand Down