changes
This commit is contained in:
@ -1,35 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Installer;
|
||||
|
||||
use Illuminate\Routing\Controller;
|
||||
use App\Helpers\Installer\DatabaseManager;
|
||||
|
||||
class DatabaseController extends Controller
|
||||
{
|
||||
/**
|
||||
* @var DatabaseManager
|
||||
*/
|
||||
private $databaseManager;
|
||||
|
||||
/**
|
||||
* @param DatabaseManager $databaseManager
|
||||
*/
|
||||
public function __construct(DatabaseManager $databaseManager)
|
||||
{
|
||||
$this->databaseManager = $databaseManager;
|
||||
}
|
||||
|
||||
/**
|
||||
* Migrate and seed the database.
|
||||
*
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function database()
|
||||
{
|
||||
$response = $this->databaseManager->migrateAndSeed();
|
||||
|
||||
return redirect()->route('LaravelInstaller::final')
|
||||
->with(['message' => $response]);
|
||||
}
|
||||
}
|
@ -1,153 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Installer;
|
||||
|
||||
use Exception;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Routing\Controller;
|
||||
use Illuminate\Routing\Redirector;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use App\Events\EnvironmentSaved;
|
||||
use App\Helpers\Installer\EnvironmentManager;
|
||||
use Validator;
|
||||
|
||||
class EnvironmentController extends Controller
|
||||
{
|
||||
/**
|
||||
* @var EnvironmentManager
|
||||
*/
|
||||
protected $EnvironmentManager;
|
||||
|
||||
/**
|
||||
* @param EnvironmentManager $environmentManager
|
||||
*/
|
||||
public function __construct(EnvironmentManager $environmentManager)
|
||||
{
|
||||
$this->EnvironmentManager = $environmentManager;
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the Environment menu page.
|
||||
*
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function environmentMenu()
|
||||
{
|
||||
return view('vendor.installer.environment');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the Environment page.
|
||||
*
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function environmentWizard()
|
||||
{
|
||||
$envConfig = $this->EnvironmentManager->getEnvContent();
|
||||
|
||||
return view('vendor.installer.environment-wizard', compact('envConfig'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the Environment page.
|
||||
*
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function environmentClassic()
|
||||
{
|
||||
$envConfig = $this->EnvironmentManager->getEnvContent();
|
||||
|
||||
return view('vendor.installer.environment-classic', compact('envConfig'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Processes the newly saved environment configuration (Classic).
|
||||
*
|
||||
* @param Request $input
|
||||
* @param Redirector $redirect
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function saveClassic(Request $input, Redirector $redirect)
|
||||
{
|
||||
$message = $this->EnvironmentManager->saveFileClassic($input);
|
||||
|
||||
event(new EnvironmentSaved($input));
|
||||
|
||||
return $redirect->route('LaravelInstaller::environmentClassic')
|
||||
->with(['message' => $message]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Processes the newly saved environment configuration (Form Wizard).
|
||||
*
|
||||
* @param Request $request
|
||||
* @param Redirector $redirect
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function saveWizard(Request $request, Redirector $redirect)
|
||||
{
|
||||
$rules = config('installer.environment.form.rules');
|
||||
$messages = [
|
||||
'environment_custom.required_if' => trans('installer_messages.environment.wizard.form.name_required'),
|
||||
];
|
||||
|
||||
$validator = Validator::make($request->all(), $rules, $messages);
|
||||
|
||||
if ($validator->fails()) {
|
||||
return $redirect->route('LaravelInstaller::environmentWizard')->withInput()->withErrors($validator->errors());
|
||||
}
|
||||
|
||||
if (! $this->checkDatabaseConnection($request)) {
|
||||
return $redirect->route('LaravelInstaller::environmentWizard')->withInput()->withErrors([
|
||||
'database_connection' => trans('installer_messages.environment.wizard.form.db_connection_failed'),
|
||||
]);
|
||||
}
|
||||
|
||||
$results = $this->EnvironmentManager->saveFileWizard($request);
|
||||
|
||||
event(new EnvironmentSaved($request));
|
||||
|
||||
return $redirect->route('LaravelInstaller::database')
|
||||
->with(['results' => $results]);
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO: We can remove this code if PR will be merged: https://github.com/RachidLaasri/LaravelInstaller/pull/162
|
||||
* Validate database connection with user credentials (Form Wizard).
|
||||
*
|
||||
* @param Request $request
|
||||
* @return bool
|
||||
*/
|
||||
private function checkDatabaseConnection(Request $request)
|
||||
{
|
||||
$connection = $request->input('database_connection');
|
||||
|
||||
$settings = config("database.connections.$connection");
|
||||
|
||||
config([
|
||||
'database' => [
|
||||
'default' => $connection,
|
||||
'connections' => [
|
||||
$connection => array_merge($settings, [
|
||||
'driver' => $connection,
|
||||
'host' => $request->input('database_hostname'),
|
||||
'port' => $request->input('database_port'),
|
||||
'database' => $request->input('database_name'),
|
||||
'username' => $request->input('database_username'),
|
||||
'password' => $request->input('database_password'),
|
||||
]),
|
||||
],
|
||||
],
|
||||
]);
|
||||
|
||||
DB::purge();
|
||||
|
||||
try {
|
||||
DB::connection()->getPdo();
|
||||
|
||||
return true;
|
||||
} catch (Exception $e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
@ -1,32 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Installer;
|
||||
|
||||
use Illuminate\Routing\Controller;
|
||||
use App\Events\LaravelInstallerFinished;
|
||||
use App\Helpers\Installer\EnvironmentManager;
|
||||
use App\Helpers\Installer\FinalInstallManager;
|
||||
use App\Helpers\Installer\InstalledFileManager;
|
||||
|
||||
|
||||
class FinalController extends Controller
|
||||
{
|
||||
/**
|
||||
* Update installed file and display finished view.
|
||||
*
|
||||
* @param \App\Helpers\Installer\InstalledFileManager $fileManager
|
||||
* @param \App\Helpers\Installer\FinalInstallManager $finalInstall
|
||||
* @param \App\Helpers\Installer\EnvironmentManager $environment
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function finish(InstalledFileManager $fileManager, FinalInstallManager $finalInstall, EnvironmentManager $environment)
|
||||
{
|
||||
$finalMessages = $finalInstall->runFinal();
|
||||
$finalStatusMessage = $fileManager->update();
|
||||
$finalEnvFile = $environment->getEnvContent();
|
||||
|
||||
event(new LaravelInstallerFinished);
|
||||
|
||||
return view('vendor.installer.finished', compact('finalMessages', 'finalStatusMessage', 'finalEnvFile'));
|
||||
}
|
||||
}
|
@ -1,36 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Installer;
|
||||
|
||||
use Illuminate\Routing\Controller;
|
||||
use App\Helpers\Installer\PermissionsChecker;
|
||||
|
||||
class PermissionsController extends Controller
|
||||
{
|
||||
/**
|
||||
* @var PermissionsChecker
|
||||
*/
|
||||
protected $permissions;
|
||||
|
||||
/**
|
||||
* @param PermissionsChecker $checker
|
||||
*/
|
||||
public function __construct(PermissionsChecker $checker)
|
||||
{
|
||||
$this->permissions = $checker;
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the permissions check page.
|
||||
*
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function permissions()
|
||||
{
|
||||
$permissions = $this->permissions->check(
|
||||
config('installer.permissions')
|
||||
);
|
||||
|
||||
return view('vendor.installer.permissions', compact('permissions'));
|
||||
}
|
||||
}
|
@ -1,39 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Installer;
|
||||
|
||||
use Illuminate\Routing\Controller;
|
||||
use App\Helpers\Installer\RequirementsChecker;
|
||||
|
||||
class RequirementsController extends Controller
|
||||
{
|
||||
/**
|
||||
* @var RequirementsChecker
|
||||
*/
|
||||
protected $requirements;
|
||||
|
||||
/**
|
||||
* @param RequirementsChecker $checker
|
||||
*/
|
||||
public function __construct(RequirementsChecker $checker)
|
||||
{
|
||||
$this->requirements = $checker;
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the requirements page.
|
||||
*
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function requirements()
|
||||
{
|
||||
$phpSupportInfo = $this->requirements->checkPHPversion(
|
||||
config('installer.core.minPhpVersion')
|
||||
);
|
||||
$requirements = $this->requirements->check(
|
||||
config('installer.requirements')
|
||||
);
|
||||
|
||||
return view('vendor.installer.requirements', compact('requirements', 'phpSupportInfo'));
|
||||
}
|
||||
}
|
@ -1,62 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Installer;
|
||||
|
||||
use Illuminate\Routing\Controller;
|
||||
use App\Helpers\Installer\DatabaseManager;
|
||||
use App\Helpers\Installer\InstalledFileManager;
|
||||
|
||||
class UpdateController extends Controller
|
||||
{
|
||||
use \App\Helpers\Installer\MigrationsHelper;
|
||||
|
||||
/**
|
||||
* Display the updater welcome page.
|
||||
*
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function welcome()
|
||||
{
|
||||
return view('vendor.installer.update.welcome');
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the updater overview page.
|
||||
*
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function overview()
|
||||
{
|
||||
$migrations = $this->getMigrations();
|
||||
$dbMigrations = $this->getExecutedMigrations();
|
||||
|
||||
return view('vendor.installer.update.overview', ['numberOfUpdatesPending' => count($migrations) - count($dbMigrations)]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Migrate and seed the database.
|
||||
*
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function database()
|
||||
{
|
||||
$databaseManager = new DatabaseManager;
|
||||
$response = $databaseManager->migrateAndSeed();
|
||||
|
||||
return redirect()->route('LaravelUpdater::final')
|
||||
->with(['message' => $response]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update installed file and display finished view.
|
||||
*
|
||||
* @param InstalledFileManager $fileManager
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function finish(InstalledFileManager $fileManager)
|
||||
{
|
||||
$fileManager->update();
|
||||
|
||||
return view('vendor.installer.update.finished');
|
||||
}
|
||||
}
|
@ -1,19 +0,0 @@
|
||||
<?php
|
||||
namespace App\Http\Controllers\Installer;
|
||||
|
||||
|
||||
use Illuminate\Routing\Controller;
|
||||
|
||||
class WelcomeController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display the installer welcome page.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function welcome()
|
||||
{
|
||||
dd('test');
|
||||
return view('vendor.installer.welcome');
|
||||
}
|
||||
}
|
@ -36,8 +36,6 @@ class Kernel extends HttpKernel
|
||||
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
|
||||
\App\Http\Middleware\VerifyCsrfToken::class,
|
||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||
\App\Http\Middleware\Installer\canInstall::class,
|
||||
\App\Http\Middleware\Installer\canUpdate::class,
|
||||
],
|
||||
|
||||
'api' => [
|
||||
@ -66,7 +64,5 @@ class Kernel extends HttpKernel
|
||||
'signed' => \App\Http\Middleware\ValidateSignature::class,
|
||||
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
|
||||
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
|
||||
'install' => \App\Http\Middleware\Installer\canInstall::class,
|
||||
'update' =>\App\Http\Middleware\Installer\canUpdate::class,
|
||||
];
|
||||
}
|
||||
|
@ -1,56 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware\Installer;
|
||||
|
||||
use Closure;
|
||||
|
||||
class canInstall
|
||||
{
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @return \Illuminate\Http\RedirectResponse|mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
dd($this->alreadyInstalled());
|
||||
if ($this->alreadyInstalled()) {
|
||||
$installedRedirect = config('installer.installedAlreadyAction');
|
||||
|
||||
switch ($installedRedirect) {
|
||||
case 'route':
|
||||
$routeName = config('installer.installed.redirectOptions.route.name');
|
||||
$data = config('installer.installed.redirectOptions.route.message');
|
||||
return redirect()->route($routeName)->with(['data' => $data]);
|
||||
break;
|
||||
case 'abort':
|
||||
abort(config('installer.installed.redirectOptions.abort.type'));
|
||||
break;
|
||||
|
||||
case 'dump':
|
||||
$dump = config('installer.installed.redirectOptions.dump.data');
|
||||
break;
|
||||
|
||||
case '404':
|
||||
case 'default':
|
||||
default:
|
||||
abort(404);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
/**
|
||||
* If application is already installed.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function alreadyInstalled()
|
||||
{
|
||||
return file_exists(storage_path('installed'));
|
||||
}
|
||||
}
|
@ -1,64 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Middleware\Installer;
|
||||
|
||||
use Closure;
|
||||
|
||||
class canUpdate
|
||||
{
|
||||
use \App\Helpers\Installer\MigrationsHelper;
|
||||
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
$updateEnabled = filter_var(config('installer.updaterEnabled'), FILTER_VALIDATE_BOOLEAN);
|
||||
switch ($updateEnabled) {
|
||||
case true:
|
||||
$canInstall = new canInstall;
|
||||
|
||||
// if the application has not been installed,
|
||||
// redirect to the installer
|
||||
if (! $canInstall->alreadyInstalled()) {
|
||||
return redirect()->route('LaravelInstaller::welcome');
|
||||
}
|
||||
|
||||
if ($this->alreadyUpdated()) {
|
||||
abort(404);
|
||||
}
|
||||
break;
|
||||
|
||||
case false:
|
||||
default:
|
||||
abort(404);
|
||||
break;
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
/**
|
||||
* If application is already updated.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function alreadyUpdated()
|
||||
{
|
||||
$migrations = $this->getMigrations();
|
||||
$dbMigrations = $this->getExecutedMigrations();
|
||||
|
||||
// If the count of migrations and dbMigrations is equal,
|
||||
// then the update as already been updated.
|
||||
if (count($migrations) == count($dbMigrations)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Continue, the app needs an update
|
||||
return false;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user