Skip to content

Commit

Permalink
Merge pull request koel#208 from phanan/analysis-8PxBgR
Browse files Browse the repository at this point in the history
Applied fixes from StyleCI
  • Loading branch information
phanan committed Jan 31, 2016
2 parents 4864759 + 9dc423f commit 2428ed0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/Http/Controllers/API/SongController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
namespace App\Http\Controllers\API;

use App\Http\Streamers\PHPStreamer;
use App\Http\Streamers\TranscodingStreamer;
use App\Http\Streamers\XAccelRedirectStreamer;
use App\Http\Streamers\XSendFileStreamer;
use App\Http\Streamers\TranscodingStreamer;
use App\Models\Song;

class SongController extends Controller
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Streamers/TranscodingStreamer.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function stream()
// Since we can't really know the content length of a file while it's still being transcoded,
// "calculating" it (like below) will be much likely to result in net::ERR_CONTENT_LENGTH_MISMATCH errors.
// Better comment these for now.
//
//
// header('Accept-Ranges: bytes');
// $bytes = round(($this->song->length * $bitRate * 1024) / 8);
// header("Content-Length: $bytes");
Expand Down
4 changes: 2 additions & 2 deletions tests/ApplicationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function testRev()
{
putenv('CDN_URL');

$manifestFile = dirname(__FILE__) . '/blobs/rev-manifest.json';
$manifestFile = dirname(__FILE__).'/blobs/rev-manifest.json';
$this->assertEquals(App::rev('foo.css', $manifestFile), '/public/build/foo00.css');

putenv('CDN_URL=http://cdn.bar');
Expand All @@ -37,7 +37,7 @@ public function testRev()
public function testGetLatestVersion()
{
$mock = new MockHandler([
new Response(200, [], file_get_contents(dirname(__FILE__) . '/blobs/github-tags.json')),
new Response(200, [], file_get_contents(dirname(__FILE__).'/blobs/github-tags.json')),
]);

$client = new Client(['handler' => HandlerStack::create($mock)]);
Expand Down

0 comments on commit 2428ed0

Please sign in to comment.