hook everything up into a working system

src/Controllers/AuthController.php

@@ -3,6 +3,7 @@
 use Ehesp\SteamLogin\SteamLogin;
 use Demostf\API\Providers\AuthProvider;
 use Demostf\API\Providers\UserProvider;
+use flight\Engine;
 
 class AuthController extends BaseController {
 	/**
@@ -18,17 +19,13 @@ class AuthController extends BaseController {
 	/** @var string */
 	private $host;
 
-	/**
-	 * AuthController constructor.
-	 *
-	 * @param UserProvider $userProvider
-	 * @param AuthProvider $authProvider
-	 * @param string $host
-	 */
-	public function __construct(UserProvider $userProvider, AuthProvider $authProvider, string $host) {
+	private $apiRoot;
+
+	public function __construct(UserProvider $userProvider, AuthProvider $authProvider, string $host, string $apiRoot) {
 		$this->userProvider = $userProvider;
 		$this->authProvider = $authProvider;
 		$this->host = $host;
+		$this->apiRoot = $apiRoot;
 	}
 
 	public function token() {
@@ -48,7 +45,7 @@ class AuthController extends BaseController {
 	public function login($token) {
 		$_SESSION['return'] = $this->query('return', 'https://' . $this->host);
 		$steam = new SteamLogin();
-		$url = $steam->url($_ENV['APP_ROOT'] . '/auth/handle/' . urlencode($token));
+		$url = $steam->url($this->apiRoot . '/auth/handle/' . urlencode($token));
 		\Flight::redirect(str_replace('&', '&', $url)); // headers make no sense
 	}
 
@@ -63,7 +60,7 @@ class AuthController extends BaseController {
 	}
 
 	public function handle($token) {
-		$return = isset($_SESSION['return']) ? $_SESSION['return'] : 'http://demos.tf';
+		$return = isset($_SESSION['return']) ? $_SESSION['return'] : 'https://' . $this->host;
 		unset($_SESSION['return']);
 		$steam = new SteamLogin();
 		$steamId = $steam->validate();

src/Controllers/BaseController.php

@@ -1,6 +1,8 @@
 <?php namespace Demostf\API\Controllers;
 
+
 class BaseController {
+
 	protected function query($name, $default) {
 		$request = \Flight::request();
 		return isset($request->query[$name]) ? $request->query[$name] : $default;

src/Controllers/DemoController.php

@@ -1,7 +1,9 @@
 <?php namespace Demostf\API\Controllers;
 
 use Demostf\API\Providers\ChatProvider;
+use Demostf\API\Providers\DemoListProvider;
 use Demostf\API\Providers\DemoProvider;
+use flight\Engine;
 
 class DemoController extends BaseController {
 	/** @var DemoProvider */
@@ -10,9 +12,12 @@ class DemoController extends BaseController {
 	/** @var ChatProvider */
 	private $chatProvider;
 
-	public function __construct(DemoProvider $demoProvider, ChatProvider $chatProvider) {
+	private $demoListProvider;
+
+	public function __construct(DemoProvider $demoProvider, ChatProvider $chatProvider, DemoListProvider $demoListProvider) {
 		$this->demoProvider = $demoProvider;
 		$this->chatProvider = $chatProvider;
+		$this->demoListProvider = $demoListProvider;
 	}
 
 	/**
@@ -53,19 +58,19 @@ class DemoController extends BaseController {
 
 	public function listDemos() {
 		$page = $this->query('page', 1);
-		\Flight::json($this->demoProvider->listDemos($page, $this->getFilter()));
+		\Flight::json($this->demoListProvider->listDemos($page, $this->getFilter()));
 	}
 
 	public function listProfile($steamid) {
 		$page = $this->query('page', 1);
 		$where = $this->getFilter();
 		$where['players'][] = $steamid;
-		\Flight::json($this->demoProvider->listProfile($page, $where));
+		\Flight::json($this->demoListProvider->listProfile($page, $where));
 	}
 
 	public function listUploads($steamid) {
 		$page = $this->query('page', 1);
-		\Flight::json($this->demoProvider->listUploads($steamid, $page, $this->getFilter()));
+		\Flight::json($this->demoListProvider->listUploads($steamid, $page, $this->getFilter()));
 	}
 
 	public function chat($demoId) {

src/Controllers/InfoController.php

@@ -1,16 +1,12 @@
 <?php namespace Demostf\API\Controllers;
 
 use Demostf\API\Providers\InfoProvider;
+use flight\Engine;
 
 class InfoController extends BaseController {
 	/** @var InfoProvider */
 	private $infoProvider;
 
-	/**
-	 * InfoController constructor.
-	 *
-	 * @param InfoProvider $infoProvider
-	 */
 	public function __construct(InfoProvider $infoProvider) {
 		$this->infoProvider = $infoProvider;
 	}

src/Controllers/UploadController.php

@@ -1,6 +1,7 @@
 <?php namespace Demostf\API\Controllers;
 
 use Demostf\API\Providers\UploadProvider;
+use flight\Engine;
 
 class UploadController extends BaseController {
 	private $uploadProvider;
@@ -17,6 +18,6 @@ class UploadController extends BaseController {
 		$demo = $this->file('demo');
 		$demoFile = $demo['tmp_name'];
 
-		return $this->uploadProvider->upload($key, $red, $blu, $name, $demoFile);
+		echo $this->uploadProvider->upload($key, $red, $blu, $name, $demoFile);
 	}
 }

src/Controllers/UserController.php

@@ -3,6 +3,7 @@
 use Ehesp\SteamLogin\SteamLogin;
 use Demostf\API\Providers\AuthProvider;
 use Demostf\API\Providers\UserProvider;
+use flight\Engine;
 
 class UserController extends BaseController {
 	/**
@@ -10,11 +11,6 @@ class UserController extends BaseController {
 	 */
 	private $userProvider;
 
-	/**
-	 * UserController constructor.
-	 *
-	 * @param UserProvider $userProvider
-	 */
 	public function __construct(UserProvider $userProvider) {
 		$this->userProvider = $userProvider;
 	}

src/Demo/RawParser.php

@@ -22,6 +22,6 @@ class RawParser {
 		$response = $client->post($this->parserUrl, [
 			'body' => fopen($path, 'r')
 		]);
-		return json_decode($response->getBody(), true);
+		return json_decode($response->getBody()->getContents(), true);
 	}
 }

src/Providers/Container.php

@@ -0,0 +1,110 @@
+<?php declare(strict_types=1);
+
+namespace Demostf\API\Providers;
+
+use Demostf\API\Demo\DemoSaver;
+use Demostf\API\Demo\DemoStore;
+use Demostf\API\Demo\HeaderParser;
+use Demostf\API\Demo\Parser;
+use Demostf\API\Demo\RawParser;
+use Doctrine\DBAL\Connection;
+use RandomLib\Generator;
+
+class Container {
+	private $connection;
+	private $generator;
+	private $baseUrl;
+	private $parserUrl;
+	private $storeRoot;
+	private $storeUrl;
+	private $apiRoot;
+
+	public function __construct(
+		Connection $connection,
+		Generator $generator,
+		string $baseUrl,
+		string $parserUrl,
+		string $storeRoot,
+		string $storeUrl,
+		string $apiRoot
+	) {
+		$this->connection = $connection;
+		$this->generator = $generator;
+		$this->baseUrl = $baseUrl;
+		$this->parserUrl = $parserUrl;
+		$this->storeRoot = $storeRoot;
+		$this->storeUrl = $storeUrl;
+		$this->apiRoot = $apiRoot;
+	}
+
+	public function getAuthProvider(): AuthProvider {
+		return new AuthProvider($this->connection, $this->generator);
+	}
+
+	public function getChatProvider(): ChatProvider {
+		return new ChatProvider($this->connection);
+	}
+
+	public function getDemoListProvider(): DemoListProvider {
+		return new DemoListProvider($this->connection);
+	}
+
+	public function getDemoProvider(): DemoProvider {
+		return new DemoProvider($this->connection);
+	}
+
+	public function getInfoProvider(): InfoProvider {
+		return new InfoProvider($this->connection);
+	}
+
+	public function getKillProvider(): KillProvider {
+		return new KillProvider($this->connection);
+	}
+
+	public function getPlayerProvider(): PlayerProvider {
+		return new PlayerProvider($this->connection);
+	}
+
+	public function getUploadProvider(): UploadProvider {
+		return new UploadProvider(
+			$this->connection,
+			$this->baseUrl,
+			new HeaderParser(),
+			new Parser(new RawParser($this->parserUrl)),
+			new DemoStore($this->storeRoot, $this->storeUrl),
+			$this->getUserProvider(),
+			$this->getDemoProvider(),
+			new DemoSaver(
+				$this->getKillProvider(),
+				$this->getPlayerProvider(),
+				$this->getChatProvider(),
+				$this->getUserProvider(),
+				$this->getDemoProvider()
+			)
+		);
+	}
+
+	public function getUserProvider(): UserProvider {
+		return new UserProvider($this->connection, $this->generator);
+	}
+
+	public function getBaseUrl(): string {
+		return $this->baseUrl;
+	}
+
+	public function getParserUrl(): string {
+		return $this->parserUrl;
+	}
+
+	public function getStoreRoot(): string {
+		return $this->storeRoot;
+	}
+
+	public function getStoreUrl(): string {
+		return $this->storeUrl;
+	}
+
+	public function getApiRoot(): string {
+		return $this->apiRoot;
+	}
+}

src/Providers/UserProvider.php

@@ -78,9 +78,7 @@ class UserProvider extends BaseProvider {
 			}
 		}
 
-		return array_map(function (array $row) {
-			return User::fromRow($row);
-		}, array_values($result));
+		return array_values($result);
 	}
 
 	public function byKey($key): ?User {

src/app.php

@@ -1,38 +1,26 @@
-<?php declare(strict_types = 1);
+<?php declare(strict_types=1);
+
 namespace Demostf\API;
 
-
+use Demostf\API\Providers\Container;
 use Flight;
 
-require_once __DIR__ . '/init.php';
+/** @var Container $container */
+$container = require __DIR__ . '/init.php';
 
-
-$connectionParams = array(
-	'dbname' => getenv('DB_DATABASE'),
-	'user' => getenv('DB_USERNAME'),
-	'password' => getenv('DB_PASSWORD'),
-	'host' => getenv('DB_HOST'),
-	'port' => getenv('DB_PORT'),
-	'driver' => getenv('DB_TYPE'),
+$demoController = new Controllers\DemoController(
+	$container->getDemoProvider(),
+	$container->getChatProvider(),
+	$container->getDemoListProvider()
 );
-if ($connectionParams['driver'] === 'pgsql') {
-	$connectionParams['driver'] = 'pdo_pgsql';
-}
-$db = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
-$host = getenv('BASE_HOST');
-
-$demoProvider = new Providers\DemoProvider($db);
-
-$factory = new \RandomLib\Factory;
-$generator = $factory->getMediumStrengthGenerator();
-$authProvider = new Providers\AuthProvider($db, $generator);
-$userProvider = new Providers\UserProvider($db, $generator);
-$infoProvider = new Providers\InfoProvider($db);
-$chatProvider = new Providers\ChatProvider($db);
-$demoController = new Controllers\DemoController($demoProvider, $chatProvider);
-$authController = new Controllers\AuthController($userProvider, $authProvider, $host);
-$userController = new Controllers\UserController($userProvider);
-$infoController = new Controllers\InfoController($infoProvider);
+$authController = new Controllers\AuthController(
+	$container->getUserProvider(),
+	$container->getAuthProvider(),
+	$container->getBaseUrl(),
+	$container->getApiRoot()
+);
+$userController = new Controllers\UserController($container->getUserProvider());
+$infoController = new Controllers\InfoController($container->getInfoProvider());
 
 Flight::route('/*', function () {
 	header('Access-Control-Allow-Origin: *');

src/init.php

@@ -1,6 +1,42 @@
-<?php
+<?php declare(strict_types=1);
+
+use Demostf\API\Providers\Container;
+
 $autoloader = require __DIR__ . '/../vendor/autoload.php';
 
 if (!getenv('DB_TYPE')) {
 	Dotenv::load(__DIR__ . '/../');
 }
+
+$connectionParams = array(
+	'dbname' => getenv('DB_DATABASE'),
+	'user' => getenv('DB_USERNAME'),
+	'password' => getenv('DB_PASSWORD'),
+	'host' => getenv('DB_HOST'),
+	'port' => getenv('DB_PORT'),
+	'driver' => getenv('DB_TYPE'),
+);
+if ($connectionParams['driver'] === 'pgsql') {
+	$connectionParams['driver'] = 'pdo_pgsql';
+}
+$db = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
+$host = getenv('BASE_HOST');
+$storeRoot = getenv('DEMO_ROOT');
+$storeHost = getenv('DEMO_HOST');
+$parserUrl = getenv('PARSER_URL');
+$appRoot = getenv('APP_ROOT');
+
+$factory = new \RandomLib\Factory;
+$generator = $factory->getMediumStrengthGenerator();
+
+$container = new Container(
+	$db,
+	$generator,
+	'https://' . $host,
+	$parserUrl,
+	$storeRoot,
+	'https://' . $storeHost,
+	$appRoot
+);
+
+return $container;

src/upload.php

@@ -1,27 +1,21 @@
-<?php declare(strict_types = 1);
+<?php declare(strict_types=1);
+
 namespace Demostf\API;
 
-require_once __DIR__ . '/init.php';
+use Demostf\API\Providers\Container;
+use Flight;
 
-$connectionParams = array(
-	'dbname' => getenv('DB_DATABASE'),
-	'user' => getenv('DB_USERNAME'),
-	'password' => getenv('DB_PASSWORD'),
-	'host' => getenv('DB_HOST'),
-	'driver' => getenv('DB_TYPE'),
-);
-if ($connectionParams['driver'] === 'pgsql') {
-	$connectionParams['driver'] = 'pdo_pgsql';
-}
-$db = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
-$host = getenv('BASE_HOST');
-$storeRoot = getenv('DEMO_ROOT');
+/** @var Container $container */
+$container = require __DIR__ . '/init.php';
 
-$demoProvider = new Providers\DemoProvider($db);
+$uploadController = new Controllers\UploadController($container->getUploadProvider());
 
-$factory = new \RandomLib\Factory;
-$generator = $factory->getMediumStrengthGenerator();
-$userProvider = new Providers\UserProvider($db, $generator);
-$store = new Demo\DemoStore($storeRoot, 'static.' . $host);
-$uploadController = new Controllers\UploadController($demoProvider, $userProvider, new Demo\Parser(), $store);
-$uploadController->upload();
+Flight::route('/*', function () {
+	header('Access-Control-Allow-Origin: *');
+	return true;
+});
+
+Flight::route('/upload', [$uploadController, 'upload']);
+Flight::route('/do_upload', [$uploadController, 'upload']);
+
+Flight::start();