genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/stream

Browse source 
Conflicts:
	composer.lock
This commit is contained in:
Pierre Rudloff 2016-10-13 17:07:00 +02:00
commit 6e73398369
11 changed files with 163 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

9
controllers/FrontController.php
View file

@ -6,6 +6,7 @@ namespace Alltube\Controller;
use Alltube\Config;
use Alltube\VideoDownload;
use Interop\Container\ContainerInterface;
use Slim\Container;
use Slim\Http\Request;
use Slim\Http\Response;
@ -33,7 +34,7 @@ class FrontController
/**
* Slim dependency container.
*
* @var Container
* @var ContainerInterface
*/
private $container;
@ -42,11 +43,13 @@ class FrontController
*
* @param Container $container Slim dependency container
*/
public function __construct(Container $container)
public function __construct(ContainerInterface $container)
{
$this->config = Config::getInstance();
$this->download = new VideoDownload();
$this->container = $container;
if ($container instanceof Container) {
$this->container = $container;
}
}
/**