style(phpcs): Switch to PSR-12

https://www.php-fig.org/psr/psr-12/

Gruntfile.js

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

classes/Config.php

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

classes/Locale.php

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

classes/LocaleManager.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * LocaleManager class.
  */
@@ -61,7 +62,8 @@ class LocaleManager
         $process->run();
         $installedLocales = explode(PHP_EOL, trim($process->getOutput()));
         foreach ($this->supportedLocales as $supportedLocale) {
-            if (in_array($supportedLocale, $installedLocales)
+            if (
+                in_array($supportedLocale, $installedLocales)
                 || in_array($supportedLocale . '.utf8', $installedLocales)
             ) {
                 $return[] = new Locale($supportedLocale);

classes/LocaleMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * LocaleMiddleware class.
  */
@@ -43,7 +44,8 @@ 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']
             ) {

classes/SessionManager.php

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

classes/UglyRouter.php

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

classes/Video.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * VideoDownload class.
  */
@@ -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};

classes/ViewFactory.php

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

composer.json

@@ -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",

composer.lock

@@ -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",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/0afebf16a2e7f1e434920fa976253576151effe9",
-                "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
+                "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",

controllers/BaseController.php

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

controllers/DownloadController.php

@@ -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());

controllers/FrontController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * FrontController class.
  */
@@ -171,7 +172,8 @@ class FrontController extends BaseController
         $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,

controllers/JsonController.php

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

tests/BaseTest.php

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

tests/ConfigTest.php

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

tests/ControllerTest.php

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

tests/ConvertedPlaylistArchiveStreamTest.php

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

tests/DownloadControllerTest.php

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

tests/FrontControllerTest.php

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

tests/JsonControllerTest.php

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

tests/LocaleManagerTest.php

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

tests/LocaleMiddlewareTest.php

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

tests/LocaleTest.php

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

tests/PlaylistArchiveStreamTest.php

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

tests/StreamTest.php

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

tests/UglyRouterTest.php

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

tests/VideoStubsTest.php

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

tests/VideoTest.php

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

tests/ViewFactoryTest.php

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

tests/YoutubeChunkStreamTest.php

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

tests/YoutubeStreamTest.php

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

tests/bootstrap.php

@@ -1,20 +1,18 @@
 <?php
+
 /**
  * File used to bootstrap tests.
  */
+
 use phpmock\mockery\PHPMockery;
 
-/**
+// Composer autoload.
- * 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');