mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use autoloading instead of require_once from a different dir 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2017-06-02 14:22:04 +02:00 committed by Morris Jobke
parent 194ef1a171
commit 3969a6b1eb
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/private/DB/MigrationService.php
View File

@ -58,7 +58,7 @@ class MigrationService {
* @param IOutput|null $output
* @throws \Exception
*/
function __construct($appName, IDBConnection $connection, IOutput $output = null, AppLocator $appLocator = null) {
public function __construct($appName, IDBConnection $connection, IOutput $output = null, AppLocator $appLocator = null) {
$this->appName = $appName;
$this->connection = $connection;
$this->output = $output;
@ -74,21 +74,16 @@ class MigrationService {
$appLocator = new AppLocator();
}
$appPath = $appLocator->getAppPath($appName);
$this->migrationsPath = "$appPath/appinfo/Migrations";
$this->migrationsNamespace = "OCA\\$appName\\Migrations";
$namespace = \OCP\AppFramework\App::buildAppNamespace($appName);
$this->migrationsPath = "$appPath/lib/Migration";
$this->migrationsNamespace = $namespace . '\\Migration';
}
if (!is_dir($this->migrationsPath)) {
if (!mkdir($this->migrationsPath)) {
throw new \Exception("Could not create migration folder \"{$this->migrationsPath}\"");
};
if (!is_dir($this->migrationsPath) && !mkdir($this->migrationsPath)) {
throw new \Exception("Could not create migration folder \"{$this->migrationsPath}\"");
}
}
private static function requireOnce($file) {
require_once $file;
}
/**
* Returns the name of the app for which this migration is executed
*
@ -180,7 +175,6 @@ class MigrationService {
$migrations = [];
foreach ($files as $file) {
static::requireOnce($file);
$className = basename($file, '.php');
$version = (string) substr($className, 7);
if ($version === '0') {