mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-06 00:17:31 +02:00
Code Issues Releases Wiki Activity

Implemented extensions as an object, usable by backend and frontend.

Browse Source
This commit is contained in:
Daniel Klabbers
2016-02-10 15:12:24 +01:00
committed by Franz Liedke
parent 96c4e6b147
commit 191589e2b1
10 changed files with 430 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Database/DatabaseMigrationRepository.php
View File

@@ -39,9 +39,8 @@ class DatabaseMigrationRepository implements MigrationRepositoryInterface
/**
* Create a new database migration repository instance.
*
* @param \Illuminate\Database\ConnectionResolverInterface $resolver
* @param string $table
* @return void
* @param \Illuminate\Database\ConnectionResolverInterface $resolver
* @param string $table
*/
public function __construct(Resolver $resolver, $table)
{

80
src/Database/Migrator.php
View File

@@ -11,6 +11,7 @@
namespace Flarum\Database;
use Flarum\Extension\Extension;
use Illuminate\Database\ConnectionResolverInterface as Resolver;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Support\Str;
@@ -55,35 +56,34 @@ class Migrator
/**
* Create a new migrator instance.
*
* @param \Flarum\Database\MigrationRepositoryInterface $repository
* @param \Illuminate\Database\ConnectionResolverInterface $resolver
* @param \Illuminate\Filesystem\Filesystem $files
* @return void
* @param \Flarum\Database\MigrationRepositoryInterface $repository
* @param \Illuminate\Database\ConnectionResolverInterface $resolver
* @param \Illuminate\Filesystem\Filesystem $files
*/
public function __construct(
MigrationRepositoryInterface $repository,
Resolver $resolver,
Filesystem $files
) {
$this->files = $files;
$this->resolver = $resolver;
$this->files = $files;
$this->resolver = $resolver;
$this->repository = $repository;
}
/**
* Run the outstanding migrations at a given path.
*
* @param string $path
* @param string $extension
* @param string $path
* @param Extension $extension
* @return void
*/
public function run($path, $extension = null)
public function run($path, Extension $extension = null)
{
$this->notes = [];
$files = $this->getMigrationFiles($path);
$ran = $this->repository->getRan($extension);
$ran = $this->repository->getRan($extension ? $extension->getId() : null);
$migrations = array_diff($files, $ran);
@@ -95,11 +95,10 @@ class Migrator
/**
* Run an array of migrations.
*
* @param array $migrations
* @param bool $pretend
* @return void
* @param array $migrations
* @param Extension $extension
*/
public function runMigrationList($migrations, $extension)
public function runMigrationList($migrations, Extension $extension = null)
{
// First we will just make sure that there are any migrations to run. If there
// aren't, we will just make a note of it to the developer so they're aware
@@ -121,11 +120,11 @@ class Migrator
/**
* Run "up" a migration instance.
*
* @param string $file
* @param string $extension
* @param string $file
* @param Extension $extension
* @return void
*/
protected function runUp($file, $extension)
protected function runUp($file, Extension $extension = null)
{
// First we will resolve a "real" instance of the migration class from this
// migration file name. Once we have the instances we can run the actual
@@ -137,7 +136,7 @@ class Migrator
// Once we have run a migrations class, we will log that it was run in this
// repository so that we don't try to run it next time we do a migration
// in the application. A migration repository keeps the migrate order.
$this->repository->log($file, $extension);
$this->repository->log($file, $extension ? $extension->getId() : null);
$this->note("<info>Migrated:</info> $file");
}
@@ -145,14 +144,15 @@ class Migrator
/**
* Rolls all of the currently applied migrations back.
*
* @param bool $pretend
* @param string $path
* @param Extension $extension
* @return int
*/
public function reset($path, $extension = null)
public function reset($path, Extension $extension = null)
{
$this->notes = [];
$migrations = array_reverse($this->repository->getRan($extension));
$migrations = array_reverse($this->repository->getRan($extension->getId()));
$this->requireFiles($path, $migrations);
@@ -172,11 +172,11 @@ class Migrator
/**
* Run "down" a migration instance.
*
* @param string $file
* @param string $extension
* @param string $file
* @param Extension $extension
* @return void
*/
protected function runDown($file, $extension = null)
protected function runDown($file, Extension $extension = null)
{
// First we will get the file name of the migration so we can resolve out an
// instance of the migration. Once we get an instance we can either run a
@@ -188,7 +188,7 @@ class Migrator
// Once we have successfully run the migration "down" we will remove it from
// the migration repository so it will be considered to have not been run
// by the application then will be able to fire by any later operation.
$this->repository->delete($file, $extension);
$this->repository->delete($file, $extension ? $extension->getId() : null);
$this->note("<info>Rolled back:</info> $file");
}
@@ -196,12 +196,12 @@ class Migrator
/**
* Get all of the migration files in a given path.
*
* @param string $path
* @param string $path
* @return array
*/
public function getMigrationFiles($path)
{
$files = $this->files->glob($path.'/*_*.php');
$files = $this->files->glob($path . '/*_*.php');
// Once we have the array of files in the directory we will just remove the
// extension and take the basename of the file which is all we need when
@@ -225,28 +225,36 @@ class Migrator
/**
* Require in all the migration files in a given path.
*
* @param string $path
* @param array $files
* @param string $path
* @param array $files
* @return void
*/
public function requireFiles($path, array $files)
{
foreach ($files as $file) {
$this->files->requireOnce($path.'/'.$file.'.php');
$this->files->requireOnce($path . '/' . $file . '.php');
}
}
/**
* Resolve a migration instance from a file.
*
* @param string $file
* @param string $file
* @param Extension $extension
* @return object
*/
public function resolve($file, $extension = null)
public function resolve($file, Extension $extension = null)
{
$file = implode('_', array_slice(explode('_', $file), 4));
$class = ($extension ? str_replace('-', '\\', $extension) : 'Flarum\\Core') . '\\Migration\\';
// flagrow/image-upload
if ($extension) {
$class = str_replace('/', '\\', $extension->name);
} else {
$class = 'Flarum\\Core';
}
$class .= '\\Migration\\';
$class .= Str::studly($file);
@@ -256,7 +264,7 @@ class Migrator
/**
* Raise a note event for the migrator.
*
* @param string $message
* @param string $message
* @return void
*/
protected function note($message)
@@ -277,7 +285,7 @@ class Migrator
/**
* Resolve the database connection instance.
*
* @param string $connection
* @param string $connection
* @return \Illuminate\Database\Connection
*/
public function resolveConnection($connection)
@@ -288,7 +296,7 @@ class Migrator
/**
* Set the default connection name.
*
* @param string $name
* @param string $name
* @return void
*/
public function setConnection($name)