PrivateCoffee/alltube
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Lint

Browse source
This commit is contained in:
Pierre Rudloff 2017-10-29 23:21:13 +01:00
parent f30582a7c3
commit 0a2971399b
7 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
classes/PlaylistArchiveStream.php
View file

@ -94,10 +94,10 @@ class PlaylistArchiveStream extends TarArchive
$this->buffer = fopen('php://temp', 'r+'); $this->buffer = fopen('php://temp', 'r+');
foreach (explode(';', parse_url($path, PHP_URL_HOST)) as $url) { foreach (explode(';', parse_url($path, PHP_URL_HOST)) as $url) {
$this->files[] = [ $this->files[] = [
'url' => urldecode($url), 'url' => urldecode($url),
'headersSent'=> false, 'headersSent' => false,
'complete' => false, 'complete' => false,
'stream' => null, 'stream' => null,
]; ];
} }
@ -124,7 +124,7 @@ class PlaylistArchiveStream extends TarArchive
{ {
//We need this so Slim won't try to get the size of the stream //We need this so Slim won't try to get the size of the stream
return [ return [
'mode'=> 0010000, 'mode' => 0010000,
]; ];
} }

10
classes/VideoDownload.php
View file

@ -195,12 +195,12 @@ class VideoDownload
private function addOptionsToRtmpProcess(ProcessBuilder $builder, $video) private function addOptionsToRtmpProcess(ProcessBuilder $builder, $video)
{ {
foreach ([ foreach ([
'url' => 'rtmp', 'url' => 'rtmp',
'webpage_url' => 'pageUrl', 'webpage_url' => 'pageUrl',
'player_url' => 'swfVfy', 'player_url' => 'swfVfy',
'flash_version' => 'flashVer', 'flash_version' => 'flashVer',
'play_path' => 'playpath', 'play_path' => 'playpath',
'app' => 'app', 'app' => 'app',
] as $property => $option) { ] as $property => $option) {
if (isset($video->{$property})) { if (isset($video->{$property})) {
$builder->add('--'.$option); $builder->add('--'.$option);

4
controllers/FrontController.php
View file

@ -158,8 +158,8 @@ class FrontController
'title' => 'Supported websites', 'title' => 'Supported websites',
'description' => 'List of all supported websites from which Alltube Download '. 'description' => 'List of all supported websites from which Alltube Download '.
'can extract video or audio files', 'can extract video or audio files',
'canonical' => $this->getCanonicalUrl($request), 'canonical' => $this->getCanonicalUrl($request),
'locale' => $this->localeManager->getLocale(), 'locale' => $this->localeManager->getLocale(),
] ]
); );

66
tests/FrontControllerTest.php
View file

@ -162,7 +162,7 @@ class FrontControllerTest extends TestCase
*/ */
public function testConstructorWithStream() public function testConstructorWithStream()
{ {
$controller = new FrontController($this->container, new Config(['stream'=>true])); $controller = new FrontController($this->container, new Config(['stream' => true]));
$this->assertInstanceOf(FrontController::class, $controller); $this->assertInstanceOf(FrontController::class, $controller);
} }
@ -185,7 +185,7 @@ class FrontControllerTest extends TestCase
{ {
$result = $this->controller->index( $result = $this->controller->index(
Request::createFromEnvironment( Request::createFromEnvironment(
Environment::mock(['REQUEST_URI'=>'/foo', 'QUERY_STRING'=>'foo=bar']) Environment::mock(['REQUEST_URI' => '/foo', 'QUERY_STRING' => 'foo=bar'])
), ),
$this->response $this->response
); );
@ -229,7 +229,7 @@ class FrontControllerTest extends TestCase
*/ */
public function testVideo() public function testVideo()
{ {
$this->assertRequestIsOk('video', ['url'=>'https://www.youtube.com/watch?v=M7IpKCZ47pU']); $this->assertRequestIsOk('video', ['url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU']);
} }
/** /**
@ -240,7 +240,7 @@ class FrontControllerTest extends TestCase
public function testVideoWithoutTitle() public function testVideoWithoutTitle()
{ {
$this->markTestSkipped('This URL triggers a curl SSL error on Travis'); $this->markTestSkipped('This URL triggers a curl SSL error on Travis');
$this->assertRequestIsOk('video', ['url'=>'http://html5demos.com/video']); $this->assertRequestIsOk('video', ['url' => 'http://html5demos.com/video']);
} }
/** /**
@ -250,7 +250,7 @@ class FrontControllerTest extends TestCase
*/ */
public function testVideoWithAudio() public function testVideoWithAudio()
{ {
$this->assertRequestIsOk('video', ['url'=>'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'audio'=>true]); $this->assertRequestIsOk('video', ['url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'audio' => true]);
} }
/** /**
@ -262,7 +262,7 @@ class FrontControllerTest extends TestCase
{ {
$this->assertRequestIsRedirect( $this->assertRequestIsRedirect(
'video', 'video',
['url'=> 'https://2080.bandcamp.com/track/cygnus-x-the-orange-theme-2080-faulty-chip-cover', 'audio'=>true] ['url' => 'https://2080.bandcamp.com/track/cygnus-x-the-orange-theme-2080-faulty-chip-cover', 'audio' => true]
); );
} }
@ -274,8 +274,8 @@ class FrontControllerTest extends TestCase
public function testVideoWithPassword() public function testVideoWithPassword()
{ {
$result = $this->controller->video( $result = $this->controller->video(
$this->request->withQueryParams(['url'=>'http://vimeo.com/68375962']) $this->request->withQueryParams(['url' => 'http://vimeo.com/68375962'])
->withParsedBody(['password'=>'youtube-dl']), ->withParsedBody(['password' => 'youtube-dl']),
$this->response $this->response
); );
$this->assertTrue($result->isOk()); $this->assertTrue($result->isOk());
@ -288,8 +288,8 @@ class FrontControllerTest extends TestCase
*/ */
public function testVideoWithMissingPassword() public function testVideoWithMissingPassword()
{ {
$this->assertRequestIsOk('video', ['url'=>'http://vimeo.com/68375962']); $this->assertRequestIsOk('video', ['url' => 'http://vimeo.com/68375962']);
$this->assertRequestIsOk('video', ['url'=>'http://vimeo.com/68375962', 'audio'=>true]); $this->assertRequestIsOk('video', ['url' => 'http://vimeo.com/68375962', 'audio' => true]);
} }
/** /**
@ -299,11 +299,11 @@ class FrontControllerTest extends TestCase
*/ */
public function testVideoWithStream() public function testVideoWithStream()
{ {
$config = new Config(['stream'=>true]); $config = new Config(['stream' => true]);
$this->assertRequestIsOk('video', ['url'=>'https://www.youtube.com/watch?v=M7IpKCZ47pU'], $config); $this->assertRequestIsOk('video', ['url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU'], $config);
$this->assertRequestIsOk( $this->assertRequestIsOk(
'video', 'video',
['url'=> 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'audio'=>true], ['url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'audio' => true],
$config $config
); );
} }
@ -317,7 +317,7 @@ class FrontControllerTest extends TestCase
{ {
$this->assertRequestIsOk( $this->assertRequestIsOk(
'video', 'video',
['url'=> 'https://www.youtube.com/playlist?list=PLgdySZU6KUXL_8Jq5aUkyNV7wCa-4wZsC'] ['url' => 'https://www.youtube.com/playlist?list=PLgdySZU6KUXL_8Jq5aUkyNV7wCa-4wZsC']
); );
} }
@ -349,7 +349,7 @@ class FrontControllerTest extends TestCase
*/ */
public function testRedirect() public function testRedirect()
{ {
$this->assertRequestIsRedirect('redirect', ['url'=>'https://www.youtube.com/watch?v=M7IpKCZ47pU']); $this->assertRequestIsRedirect('redirect', ['url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU']);
} }
/** /**
@ -361,7 +361,7 @@ class FrontControllerTest extends TestCase
{ {
$this->assertRequestIsRedirect( $this->assertRequestIsRedirect(
'redirect', 'redirect',
['url'=> 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'format'=>'worst'] ['url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'format' => 'worst']
); );
} }
@ -374,8 +374,8 @@ class FrontControllerTest extends TestCase
{ {
$this->assertRequestIsOk( $this->assertRequestIsOk(
'redirect', 'redirect',
['url'=> 'https://www.youtube.com/watch?v=M7IpKCZ47pU'], ['url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU'],
new Config(['stream'=>true]) new Config(['stream' => true])
); );
} }
@ -388,8 +388,8 @@ class FrontControllerTest extends TestCase
{ {
$this->assertRequestIsOk( $this->assertRequestIsOk(
'redirect', 'redirect',
['url'=> 'https://twitter.com/verge/status/813055465324056576/video/1'], ['url' => 'https://twitter.com/verge/status/813055465324056576/video/1'],
new Config(['stream'=>true]) new Config(['stream' => true])
); );
} }
@ -402,8 +402,8 @@ class FrontControllerTest extends TestCase
{ {
$this->assertRequestIsOk( $this->assertRequestIsOk(
'redirect', 'redirect',
['url'=> 'http://www.canalc2.tv/video/12163', 'format'=>'rtmp'], ['url' => 'http://www.canalc2.tv/video/12163', 'format' => 'rtmp'],
new Config(['stream'=>true]) new Config(['stream' => true])
); );
} }
@ -417,10 +417,10 @@ class FrontControllerTest extends TestCase
$this->assertRequestIsOk( $this->assertRequestIsOk(
'redirect', 'redirect',
[ [
'url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU',
'format'=> 'bestvideo+bestaudio', 'format' => 'bestvideo+bestaudio',
], ],
new Config(['remux'=>true]) new Config(['remux' => true])
); );
} }
@ -434,8 +434,8 @@ class FrontControllerTest extends TestCase
$this->assertRequestIsServerError( $this->assertRequestIsServerError(
'redirect', 'redirect',
[ [
'url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU', 'url' => 'https://www.youtube.com/watch?v=M7IpKCZ47pU',
'format'=> 'bestvideo+bestaudio', 'format' => 'bestvideo+bestaudio',
] ]
); );
} }
@ -447,7 +447,7 @@ class FrontControllerTest extends TestCase
*/ */
public function testRedirectWithMissingPassword() public function testRedirectWithMissingPassword()
{ {
$this->assertRequestIsRedirect('redirect', ['url'=>'http://vimeo.com/68375962']); $this->assertRequestIsRedirect('redirect', ['url' => 'http://vimeo.com/68375962']);
} }
/** /**
@ -457,7 +457,7 @@ class FrontControllerTest extends TestCase
*/ */
public function testRedirectWithError() public function testRedirectWithError()
{ {
$this->assertRequestIsServerError('redirect', ['url'=>'http://example.com/foo']); $this->assertRequestIsServerError('redirect', ['url' => 'http://example.com/foo']);
} }
/** /**
@ -470,7 +470,7 @@ class FrontControllerTest extends TestCase
{ {
$this->assertRequestIsServerError( $this->assertRequestIsServerError(
'redirect', 'redirect',
['url'=> 'https://www.youtube.com/playlist?list=PLgdySZU6KUXL_8Jq5aUkyNV7wCa-4wZsC'] ['url' => 'https://www.youtube.com/playlist?list=PLgdySZU6KUXL_8Jq5aUkyNV7wCa-4wZsC']
); );
} }
@ -483,8 +483,8 @@ class FrontControllerTest extends TestCase
{ {
$this->assertRequestIsOk( $this->assertRequestIsOk(
'redirect', 'redirect',
['url'=> 'https://www.youtube.com/playlist?list=PLgdySZU6KUXL_8Jq5aUkyNV7wCa-4wZsC'], ['url' => 'https://www.youtube.com/playlist?list=PLgdySZU6KUXL_8Jq5aUkyNV7wCa-4wZsC'],
new Config(['stream'=>true]) new Config(['stream' => true])
); );
} }
@ -499,7 +499,7 @@ class FrontControllerTest extends TestCase
$this->controller->locale( $this->controller->locale(
$this->request, $this->request,
$this->response, $this->response,
['locale'=> 'fr_FR'] ['locale' => 'fr_FR']
)->isRedirect() )->isRedirect()
); );
} }

8
tests/LocaleMiddlewareTest.php
View file

@ -44,8 +44,8 @@ class LocaleMiddlewareTest extends TestCase
{ {
$this->markTestSkipped('For some reason, this test fails on Travis even if the fr_FR locale is installed.'); $this->markTestSkipped('For some reason, this test fails on Travis even if the fr_FR locale is installed.');
$locale = [ $locale = [
'language'=> 'fr', 'language' => 'fr',
'region' => 'FR', 'region' => 'FR',
]; ];
$this->assertEquals('fr_FR', $this->middleware->testLocale($locale)); $this->assertEquals('fr_FR', $this->middleware->testLocale($locale));
} }
@ -58,8 +58,8 @@ class LocaleMiddlewareTest extends TestCase
public function testLocaleWithWrongLocale() public function testLocaleWithWrongLocale()
{ {
$locale = [ $locale = [
'language'=> 'foo', 'language' => 'foo',
'region' => 'BAR', 'region' => 'BAR',
]; ];
$this->assertNull($this->middleware->testLocale($locale)); $this->assertNull($this->middleware->testLocale($locale));
$this->assertNull($this->middleware->testLocale([])); $this->assertNull($this->middleware->testLocale([]));

2
tests/PlaylistArchiveStreamTest.php
View file

@ -55,7 +55,7 @@ class PlaylistArchiveStreamTest extends TestCase
*/ */
public function testStreamStat() public function testStreamStat()
{ {
$this->assertEquals(['mode'=>4096], $this->stream->stream_stat()); $this->assertEquals(['mode' => 4096], $this->stream->stream_stat());
} }
/** /**

6
tests/VideoDownloadTest.php
View file

@ -364,7 +364,7 @@ class VideoDownloadTest extends TestCase
*/ */
public function testGetAudioStreamAvconvError($url, $format) public function testGetAudioStreamAvconvError($url, $format)
{ {
$download = new VideoDownload(new Config(['avconv'=>'foobar'])); $download = new VideoDownload(new Config(['avconv' => 'foobar']));
$download->getAudioStream($url, $format); $download->getAudioStream($url, $format);
} }
@ -380,7 +380,7 @@ class VideoDownloadTest extends TestCase
*/ */
public function testGetAudioStreamRtmpError($url, $format) public function testGetAudioStreamRtmpError($url, $format)
{ {
$download = new VideoDownload(new Config(['rtmpdump'=>'foobar'])); $download = new VideoDownload(new Config(['rtmpdump' => 'foobar']));
$download->getAudioStream($url, $format); $download->getAudioStream($url, $format);
} }
@ -477,7 +477,7 @@ class VideoDownloadTest extends TestCase
*/ */
public function testGetM3uStreamAvconvError($url, $format) public function testGetM3uStreamAvconvError($url, $format)
{ {
$download = new VideoDownload(new Config(['avconv'=>'foobar'])); $download = new VideoDownload(new Config(['avconv' => 'foobar']));
$video = $download->getJSON($url, $format); $video = $download->getJSON($url, $format);
$download->getM3uStream($video); $download->getM3uStream($video);
} }