mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-13 07:54:25 +02:00
Code Issues Releases Wiki Activity

Applied fixes from StyleCI

Browse Source
This commit is contained in:
Toby Zerner
2016-02-25 22:09:39 -05:00
committed by StyleCI Bot
parent 83c22d73a4
commit a6cf10f854
96 changed files with 240 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Install/Console/FileDataProvider.php
View File

@@ -10,9 +10,9 @@
namespace Flarum\Install\Console;
use Exception;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Yaml\Yaml;
use Exception;
class FileDataProvider implements DataProviderInterface
{
@@ -39,7 +39,7 @@ class FileDataProvider implements DataProviderInterface
$this->baseUrl = isset($configuration['baseUrl']) ? rtrim($configuration['baseUrl'], '/') : null;
$this->databaseConfiguration = isset($configuration['databaseConfiguration']) ? $configuration['databaseConfiguration'] : [];
$this->adminUser = isset($configuration['adminUser']) ? $configuration['adminUser'] : [];
$this->settings = isset($configuration['settings']) ? $configuration['settings']: [];
$this->settings = isset($configuration['settings']) ? $configuration['settings'] : [];
} else {
throw new Exception('Configuration file does not exist.');
}
@@ -52,7 +52,7 @@ class FileDataProvider implements DataProviderInterface
public function getBaseUrl()
{
return (!is_null($this->baseUrl)) ? $this->baseUrl : $this->default->getBaseUrl();
return (! is_null($this->baseUrl)) ? $this->baseUrl : $this->default->getBaseUrl();
}
public function getAdminUser()

16
src/Install/Console/InstallCommand.php
View File

@@ -10,21 +10,17 @@
namespace Flarum\Install\Console;
use Exception;
use Flarum\Console\Command\AbstractCommand;
use Flarum\Database\AbstractModel;
use Flarum\Core\User;
use Flarum\Core\Group;
use Flarum\Core\Permission;
use Flarum\Core\User;
use Flarum\Database\AbstractModel;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Support\Arr;
use Illuminate\Validation\Factory;
use PDO;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Output\OutputInterface;
use Exception;
class InstallCommand extends AbstractCommand
{
@@ -77,7 +73,7 @@ class InstallCommand extends AbstractCommand
}
/**
* @inheritdoc
* {@inheritdoc}
*/
protected function fire()
{
@@ -238,7 +234,7 @@ class InstallCommand extends AbstractCommand
$migrator = $this->application->make('Flarum\Database\Migrator');
$migrator->getRepository()->createRepository();
$migrator->run(__DIR__ . '/../../../migrations');
$migrator->run(__DIR__.'/../../../migrations');
foreach ($migrator->getNotes() as $note) {
$this->info($note);
@@ -393,7 +389,7 @@ class InstallCommand extends AbstractCommand
$this->info($error['message']);
if (isset($error['detail'])) {
$this->output->writeln('<comment>' . $error['detail'] . '</comment>');
$this->output->writeln('<comment>'.$error['detail'].'</comment>');
}
}
}

6
src/Install/Console/UserDataProvider.php
View File

@@ -10,7 +10,6 @@
namespace Flarum\Install\Console;
use Symfony\Component\Console\Helper\HelperSet;
use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -26,7 +25,6 @@ class UserDataProvider implements DataProviderInterface
protected $baseUrl;
public function __construct(InputInterface $input, OutputInterface $output, QuestionHelper $questionHelper)
{
$this->input = $input;
@@ -77,13 +75,13 @@ class UserDataProvider implements DataProviderInterface
'forum_title' => $title,
'forum_description' => '',
'mail_driver' => 'mail',
'mail_from' => 'noreply@' . preg_replace('/^www\./i', '', parse_url($baseUrl, PHP_URL_HOST)),
'mail_from' => 'noreply@'.preg_replace('/^www\./i', '', parse_url($baseUrl, PHP_URL_HOST)),
'theme_colored_header' => '0',
'theme_dark_mode' => '0',
'theme_primary_color' => '#4D698E',
'theme_secondary_color' => '#4D698E',
'welcome_message' => 'This is beta software and you should not use it in production.',
'welcome_title' => 'Welcome to ' . $title,
'welcome_title' => 'Welcome to '.$title,
];
}

4
src/Install/Controller/IndexController.php
View File

@@ -10,10 +10,10 @@
namespace Flarum\Install\Controller;
use Flarum\Install\Prerequisite\PrerequisiteInterface;
use Flarum\Http\Controller\AbstractHtmlController;
use Psr\Http\Message\ServerRequestInterface as Request;
use Flarum\Install\Prerequisite\PrerequisiteInterface;
use Illuminate\Contracts\View\Factory;
use Psr\Http\Message\ServerRequestInterface as Request;
class IndexController extends AbstractHtmlController
{

25
src/Install/Controller/InstallController.php
View File

@@ -10,19 +10,16 @@
namespace Flarum\Install\Controller;
use Flarum\Core\User;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\Http\AccessToken;
use Flarum\Http\SessionAuthenticator;
use Psr\Http\Message\ServerRequestInterface as Request;
use Zend\Diactoros\Response\HtmlResponse;
use Zend\Diactoros\Response;
use Flarum\Install\Console\InstallCommand;
use Flarum\Install\Console\DefaultsDataProvider;
use Symfony\Component\Console\Output\StreamOutput;
use Symfony\Component\Console\Input\StringInput;
use Exception;
use DateTime;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\Http\SessionAuthenticator;
use Flarum\Install\Console\DefaultsDataProvider;
use Flarum\Install\Console\InstallCommand;
use Psr\Http\Message\ServerRequestInterface as Request;
use Symfony\Component\Console\Input\StringInput;
use Symfony\Component\Console\Output\StreamOutput;
use Zend\Diactoros\Response;
use Zend\Diactoros\Response\HtmlResponse;
class InstallController implements ControllerInterface
{
@@ -74,8 +71,8 @@ class InstallController implements ControllerInterface
$data->setBaseUrl($baseUrl);
$data->setSetting('forum_title', array_get($input, 'forumTitle'));
$data->setSetting('mail_from', 'noreply@' . preg_replace('/^www\./i', '', parse_url($baseUrl, PHP_URL_HOST)));
$data->setSetting('welcome_title', 'Welcome to ' . array_get($input, 'forumTitle'));
$data->setSetting('mail_from', 'noreply@'.preg_replace('/^www\./i', '', parse_url($baseUrl, PHP_URL_HOST)));
$data->setSetting('welcome_title', 'Welcome to '.array_get($input, 'forumTitle'));
$body = fopen('php://temp', 'wb+');
$input = new StringInput('');