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

style(phpcs): Switch to PSR-12

Browse source 
https://www.php-fig.org/psr/psr-12/
This commit is contained in:
Pierre Rudloff 2019-10-03 21:24:12 +02:00
parent f063f2ead4
commit 44bf858c35
35 changed files with 101 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gruntfile.js
View file

@ -23,7 +23,7 @@ module.exports = function (grunt) {
},
phpcs: {
options: {
standard: 'PSR2',
standard: 'PSR12',
bin: 'vendor/bin/phpcs'
},
php: {

9
classes/Config.php
View file

@ -1,4 +1,5 @@
<?php
/**
* Config class.
*/
@ -160,7 +161,7 @@ class Config
}
} elseif (!$this->stream) {
// Force HTTP if stream is not enabled.
$this->replaceGenericFormat($format, $format.'[protocol=https]/'.$format.'[protocol=http]');
$this->replaceGenericFormat($format, $format . '[protocol=https]/' . $format . '[protocol=http]');
}
}
}
@ -197,9 +198,9 @@ class Config
so they will go to the logs.
*/
if (!is_file($this->youtubedl)) {
throw new Exception("Can't find youtube-dl at ".$this->youtubedl);
throw new Exception("Can't find youtube-dl at " . $this->youtubedl);
} elseif (!Video::checkCommand([$this->python, '--version'])) {
throw new Exception("Can't find Python at ".$this->python);
throw new Exception("Can't find Python at " . $this->python);
}
}
@ -262,7 +263,7 @@ class Config
self::$instance = new self($options);
self::$instance->validateOptions();
} else {
throw new Exception("Can't find config file at ".$file);
throw new Exception("Can't find config file at " . $file);
}
}

5
classes/Locale.php
View file

@ -1,4 +1,5 @@
<?php
/**
* Locale class.
*/
@ -67,7 +68,7 @@ class Locale
*/
public function getIso15897()
{
return $this->language.'_'.$this->region;
return $this->language . '_' . $this->region;
}
/**
@ -77,7 +78,7 @@ class Locale
*/
public function getBcp47()
{
return $this->language.'-'.$this->region;
return $this->language . '-' . $this->region;
}
/**

12
classes/LocaleManager.php
View file

@ -1,4 +1,5 @@
<?php
/**
* LocaleManager class.
*/
@ -45,7 +46,7 @@ class LocaleManager
if (isset($cookieLocale)) {
$this->setLocale(new Locale($cookieLocale));
}
bindtextdomain('Alltube', __DIR__.'/../i18n/');
bindtextdomain('Alltube', __DIR__ . '/../i18n/');
textdomain('Alltube');
}
@ -61,8 +62,9 @@ class LocaleManager
$process->run();
$installedLocales = explode(PHP_EOL, trim($process->getOutput()));
foreach ($this->supportedLocales as $supportedLocale) {
if (in_array($supportedLocale, $installedLocales)
|| in_array($supportedLocale.'.utf8', $installedLocales)
if (
in_array($supportedLocale, $installedLocales)
|| in_array($supportedLocale . '.utf8', $installedLocales)
) {
$return[] = new Locale($supportedLocale);
}
@ -88,8 +90,8 @@ class LocaleManager
*/
public function setLocale(Locale $locale)
{
putenv('LANG='.$locale);
setlocale(LC_ALL, [$locale.'.utf8', $locale]);
putenv('LANG=' . $locale);
setlocale(LC_ALL, [$locale . '.utf8', $locale]);
$this->curLocale = $locale;
$this->sessionSegment->set('locale', $locale);
}

6
classes/LocaleMiddleware.php
View file

@ -1,4 +1,5 @@
<?php
/**
* LocaleMiddleware class.
*/
@ -43,11 +44,12 @@ class LocaleMiddleware
{
foreach ($this->localeManager->getSupportedLocales() as $locale) {
$parsedLocale = AcceptLanguage::parse($locale);
if (isset($proposedLocale['language'])
if (
isset($proposedLocale['language'])
&& $parsedLocale[1]['language'] == $proposedLocale['language']
&& $parsedLocale[1]['region'] == $proposedLocale['region']
) {
return new Locale($proposedLocale['language'].'_'.$proposedLocale['region']);
return new Locale($proposedLocale['language'] . '_' . $proposedLocale['region']);
}
}
}

1
classes/SessionManager.php
View file

@ -1,4 +1,5 @@
<?php
/**
* SessionManager class.
*/

3
classes/UglyRouter.php
View file

@ -1,4 +1,5 @@
<?php
/**
* UglyRouter class.
*/
@ -55,7 +56,7 @@ class UglyRouter extends Router
$url = str_replace('/', '/?page=', $this->relativePathFor($name, $data, $queryParams));
if ($this->basePath) {
$url = $this->basePath.$url;
$url = $this->basePath . $url;
}
return $url;

23
classes/Video.php
View file

@ -1,4 +1,5 @@
<?php
/**
* VideoDownload class.
*/
@ -135,7 +136,7 @@ class Video
$process = self::getProcess($arguments);
//This is needed by the openload extractor because it runs PhantomJS
$process->setEnv(['PATH'=>$config->phantomjsDir]);
$process->setEnv(['PATH' => $config->phantomjsDir]);
$process->inheritEnvironmentVariables();
$process->run();
if (!$process->isSuccessful()) {
@ -162,7 +163,7 @@ class Video
*/
private function getProp($prop = 'dump-json')
{
$arguments = ['--'.$prop];
$arguments = ['--' . $prop];
if (isset($this->webpageUrl)) {
$arguments[] = $this->webpageUrl;
@ -265,7 +266,7 @@ class Video
pathinfo(
$this->getFilename(),
PATHINFO_FILENAME
).'.'.$extension,
) . '.' . $extension,
ENT_COMPAT,
'ISO-8859-1'
);
@ -281,14 +282,16 @@ class Video
$arguments = [];
if ($this->protocol == 'rtmp') {
foreach ([
foreach (
[
'url' => '-rtmp_tcurl',
'webpage_url' => '-rtmp_pageurl',
'player_url' => '-rtmp_swfverify',
'flash_version' => '-rtmp_flashver',
'play_path' => '-rtmp_playpath',
'app' => '-rtmp_app',
] as $property => $option) {
] as $property => $option
) {
if (isset($this->{$property})) {
$arguments[] = $option;
$arguments[] = $this->{$property};
@ -342,7 +345,7 @@ class Video
$to = null
) {
if (!$this->checkCommand([$this->config->avconv, '-version'])) {
throw new Exception(_('Can\'t find avconv or ffmpeg at ').$this->config->avconv.'.');
throw new Exception(_('Can\'t find avconv or ffmpeg at ') . $this->config->avconv . '.');
}
$durationRegex = '/(\d+:)?(\d+:)?(\d+)/';
@ -355,14 +358,14 @@ class Video
if (!empty($from)) {
if (!preg_match($durationRegex, $from)) {
throw new Exception(_('Invalid start time: ').$from.'.');
throw new Exception(_('Invalid start time: ') . $from . '.');
}
$afterArguments[] = '-ss';
$afterArguments[] = $from;
}
if (!empty($to)) {
if (!preg_match($durationRegex, $to)) {
throw new Exception(_('Invalid end time: ').$to.'.');
throw new Exception(_('Invalid end time: ') . $to . '.');
}
$afterArguments[] = '-to';
$afterArguments[] = $to;
@ -379,7 +382,7 @@ class Video
[
'-i', $urls[0],
'-f', $filetype,
'-b:a', $audioBitrate.'k',
'-b:a', $audioBitrate . 'k',
],
$afterArguments,
[
@ -441,7 +444,7 @@ class Video
public function getM3uStream()
{
if (!$this->checkCommand([$this->config->avconv, '-version'])) {
throw new Exception(_('Can\'t find avconv or ffmpeg at ').$this->config->avconv.'.');
throw new Exception(_('Can\'t find avconv or ffmpeg at ') . $this->config->avconv . '.');
}
$urls = $this->getUrl();

3
classes/ViewFactory.php
View file

@ -1,4 +1,5 @@
<?php
/**
* ViewFactory class.
*/
@ -29,7 +30,7 @@ class ViewFactory
$request = $container['request'];
}
$view = new Smarty(__DIR__.'/../templates/');
$view = new Smarty(__DIR__ . '/../templates/');
if (in_array('https', $request->getHeader('X-Forwarded-Proto'))) {
$request = $request->withUri($request->getUri()->withScheme('https')->withPort(443));
}

2
composer.json
View file

@ -20,7 +20,7 @@
},
"require-dev": {
"symfony/var-dumper": "~3.4.1",
"squizlabs/php_codesniffer": "~3.4.0",
"squizlabs/php_codesniffer": "^3.5",
"phpunit/phpunit": "~6.5.2",
"ffmpeg/ffmpeg": "^4.1",
"rg3/youtube-dl": "^2019.09",

12
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "33493e464172695368aaecf1f8e4e563",
"content-hash": "07b922cb69b4f4dbd5e537656d559c8d",
"packages": [
{
"name": "aura/session",
@ -3831,16 +3831,16 @@
},
{
"name": "squizlabs/php_codesniffer",
"version": "3.4.2",
"version": "3.5.0",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8"
"reference": "0afebf16a2e7f1e434920fa976253576151effe9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
"reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/0afebf16a2e7f1e434920fa976253576151effe9",
"reference": "0afebf16a2e7f1e434920fa976253576151effe9",
"shasum": ""
},
"require": {
@ -3878,7 +3878,7 @@
"phpcs",
"standards"
],
"time": "2019-04-10T23:49:02+00:00"
"time": "2019-09-26T23:12:26+00:00"
},
{
"name": "symfony/console",

1
controllers/BaseController.php
View file

@ -1,4 +1,5 @@
<?php
/**
* BaseController class.
*/

26
controllers/DownloadController.php
View file

@ -1,4 +1,5 @@
<?php
/**
* DownloadController class.
*/
@ -49,7 +50,8 @@ class DownloadController extends BaseController
return $this->getDownloadResponse($request, $response);
} catch (PasswordException $e) {
return $response->withRedirect(
$this->container->get('router')->pathFor('info').'?'.http_build_query($request->getQueryParams())
$this->container->get('router')->pathFor('info') .
'?' . http_build_query($request->getQueryParams())
);
} catch (Exception $e) {
$response->getBody()->write($e->getMessage());
@ -76,8 +78,8 @@ class DownloadController extends BaseController
$response = $response->withHeader(
'Content-Disposition',
'attachment; filename="'.
$this->video->getFileNameWithExtension('mp3').'"'
'attachment; filename="' .
$this->video->getFileNameWithExtension('mp3') . '"'
);
$response = $response->withHeader('Content-Type', 'audio/mpeg');
@ -153,15 +155,15 @@ class DownloadController extends BaseController
$response = $response->withHeader('Content-Type', 'application/zip');
$response = $response->withHeader(
'Content-Disposition',
'attachment; filename="'.$this->video->title.'.zip"'
'attachment; filename="' . $this->video->title . '.zip"'
);
return $response->withBody($stream);
} elseif ($this->video->protocol == 'rtmp') {
$response = $response->withHeader('Content-Type', 'video/'.$this->video->ext);
$response = $response->withHeader('Content-Type', 'video/' . $this->video->ext);
$body = new Stream($this->video->getRtmpStream());
} elseif ($this->video->protocol == 'm3u8' || $this->video->protocol == 'm3u8_native') {
$response = $response->withHeader('Content-Type', 'video/'.$this->video->ext);
$response = $response->withHeader('Content-Type', 'video/' . $this->video->ext);
$body = new Stream($this->video->getM3uStream());
} else {
$headers = (array) $this->video->http_headers;
@ -192,8 +194,8 @@ class DownloadController extends BaseController
}
$response = $response->withHeader(
'Content-Disposition',
'attachment; filename="'.
$this->video->getFilename().'"'
'attachment; filename="' .
$this->video->getFilename() . '"'
);
return $response;
@ -220,7 +222,7 @@ class DownloadController extends BaseController
return $response->withHeader(
'Content-Disposition',
'attachment; filename="'.$this->video->getFileNameWithExtension('mkv')
'attachment; filename="' . $this->video->getFileNameWithExtension('mkv')
);
}
@ -269,10 +271,10 @@ class DownloadController extends BaseController
{
$response = $response->withHeader(
'Content-Disposition',
'attachment; filename="'.
$this->video->getFileNameWithExtension($request->getQueryParam('customFormat')).'"'
'attachment; filename="' .
$this->video->getFileNameWithExtension($request->getQueryParam('customFormat')) . '"'
);
$response = $response->withHeader('Content-Type', 'video/'.$request->getQueryParam('customFormat'));
$response = $response->withHeader('Content-Type', 'video/' . $request->getQueryParam('customFormat'));
if ($request->isGet() || $request->isPost()) {
$process = $this->video->getConvertedStream(

16
controllers/FrontController.php
View file

@ -1,4 +1,5 @@
<?php
/**
* FrontController class.
*/
@ -66,7 +67,7 @@ class FrontController extends BaseController
'config' => $this->config,
'class' => 'index',
'description' => _('Easily download videos from Youtube, Dailymotion, Vimeo and other websites.'),
'domain' => $uri->getScheme().'://'.$uri->getAuthority(),
'domain' => $uri->getScheme() . '://' . $uri->getAuthority(),
'canonical' => $this->getCanonicalUrl($request),
'supportedLocales' => $this->localeManager->getSupportedLocales(),
'locale' => $this->localeManager->getLocale(),
@ -110,7 +111,7 @@ class FrontController extends BaseController
'extractors' => Video::getExtractors(),
'class' => 'extractors',
'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'),
'canonical' => $this->getCanonicalUrl($request),
'locale' => $this->localeManager->getLocale(),
@ -168,10 +169,11 @@ class FrontController extends BaseController
$template = 'info.tpl';
}
$title = _('Video download');
$description = _('Download video from ').$this->video->extractor_key;
$description = _('Download video from ') . $this->video->extractor_key;
if (isset($this->video->title)) {
$title = $this->video->title;
$description = _('Download').' "'.$this->video->title.'" '._('from').' '.$this->video->extractor_key;
$description = _('Download') . ' "' . $this->video->title . '" ' .
_('from') . ' ' . $this->video->extractor_key;
}
$this->view->render(
$response,
@ -209,8 +211,8 @@ class FrontController extends BaseController
if ($this->config->convert && $request->getQueryParam('audio')) {
// We skip the info page and get directly to the download.
return $response->withRedirect(
$this->container->get('router')->pathFor('download').
'?'.http_build_query($request->getQueryParams())
$this->container->get('router')->pathFor('download') .
'?' . http_build_query($request->getQueryParams())
);
} else {
return $this->getInfoResponse($request, $response);
@ -266,7 +268,7 @@ class FrontController extends BaseController
$query = $uri->getQuery();
if (!empty($query)) {
$return .= '?'.$query;
$return .= '?' . $query;
}
return $return;

1
controllers/JsonController.php
View file

@ -1,4 +1,5 @@
<?php
/**
* JsonController class.
*/

10
index.php
View file

@ -1,6 +1,6 @@
<?php
require_once __DIR__.'/vendor/autoload.php';
require_once __DIR__ . '/vendor/autoload.php';
use Alltube\Config;
use Alltube\Controller\DownloadController;
use Alltube\Controller\FrontController;
@ -12,12 +12,12 @@ use Alltube\ViewFactory;
use Slim\App;
if (isset($_SERVER['REQUEST_URI']) && strpos($_SERVER['REQUEST_URI'], '/index.php') !== false) {
header('Location: '.str_ireplace('/index.php', '/', $_SERVER['REQUEST_URI']));
header('Location: ' . str_ireplace('/index.php', '/', $_SERVER['REQUEST_URI']));
die;
}
if (is_file(__DIR__.'/config/config.yml')) {
Config::setFile(__DIR__.'/config/config.yml');
if (is_file(__DIR__ . '/config/config.yml')) {
Config::setFile(__DIR__ . '/config/config.yml');
}
$app = new App();
@ -82,5 +82,5 @@ $app->get(
try {
$app->run();
} catch (SmartyException $e) {
die('Smarty could not compile the template file: '.$e->getMessage());
die('Smarty could not compile the template file: ' . $e->getMessage());
}

3
tests/BaseTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* PlaylistArchiveStreamTest class.
*/
@ -26,7 +27,7 @@ abstract class BaseTest extends TestCase
$configFile = 'config_test.yml';
}
return __DIR__.'/../config/'.$configFile;
return __DIR__ . '/../config/' . $configFile;
}
/**

1
tests/ConfigTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* ConfigTest class.
*/

1
tests/ControllerTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* ControllerTest class.
*/

1
tests/ConvertedPlaylistArchiveStreamTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* ConvertedPlaylistArchiveStreamTest class.
*/

1
tests/DownloadControllerTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* DownloadControllerTest class.
*/

1
tests/FrontControllerTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* FrontControllerTest class.
*/

1
tests/JsonControllerTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* JsonControllerTest class.
*/

1
tests/LocaleManagerTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* LocaleManagerTest class.
*/

1
tests/LocaleMiddlewareTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* LocaleMiddlewareTest class.
*/

1
tests/LocaleTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* LocaleTest class.
*/

1
tests/PlaylistArchiveStreamTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* PlaylistArchiveStreamTest class.
*/

1
tests/StreamTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* StreamTest class.
*/

1
tests/UglyRouterTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* UglyRouterTest class.
*/

1
tests/VideoStubsTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* VideoStubsTest class.
*/

5
tests/VideoTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* VideoTest class.
*/
@ -130,7 +131,7 @@ class VideoTest extends BaseTest
],
[
'https://www.youtube.com/watch?v=RJJ6FCAXvKg', 18,
'Heart_Attack_-_Demi_Lovato_'.
'Heart_Attack_-_Demi_Lovato_' .
'Sam_Tsui_Against_The_Current-RJJ6FCAXvKg',
'mp4',
'googlevideo.com',
@ -289,7 +290,7 @@ class VideoTest extends BaseTest
public function testGetFilename($url, $format, $filename, $extension)
{
$video = new Video($url, $format);
$this->assertEquals($video->getFilename(), $filename.'.'.$extension);
$this->assertEquals($video->getFilename(), $filename . '.' . $extension);
}
/**

1
tests/ViewFactoryTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* ViewFactoryTest class.
*/

1
tests/YoutubeChunkStreamTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* YoutubeChunkStreamTest class.
*/

1
tests/YoutubeStreamTest.php
View file

@ -1,4 +1,5 @@
<?php
/**
* YoutubeStreamTest class.
*/

12
tests/bootstrap.php
View file

@ -1,20 +1,18 @@
<?php
/**
* File used to bootstrap tests.
*/
use phpmock\mockery\PHPMockery;
/**
* Composer autoload.
*/
require_once __DIR__.'/../vendor/autoload.php';
// Composer autoload.
require_once __DIR__ . '/../vendor/autoload.php';
ini_set('session.use_cookies', 0);
session_cache_limiter('');
session_start();
/*
* @see https://bugs.php.net/bug.php?id=68541
*/
// See https://bugs.php.net/bug.php?id=68541
PHPMockery::define('Alltube', 'popen');
PHPMockery::define('Alltube', 'fopen');