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

Merge pull request #24531 from owncloud/psr4-loading-for-install-and-commands 

Correctly register PSR-4 autoloading before install.php and loading commands
This commit is contained in:
Thomas Müller 2016-05-11 13:53:16 +02:00
parent efa545f8f0 db16dc6644
commit 8729415880
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Console/Application.php
View File

@ -98,7 +98,7 @@ class Application {
if($appPath === false) { if($appPath === false) {
continue; continue;
} }
\OC::$loader->addValidRoot($appPath); \OC_App::registerAutoloading($app, $appPath);
$file = $appPath . '/appinfo/register_command.php'; $file = $appPath . '/appinfo/register_command.php';
if (file_exists($file)) { if (file_exists($file)) {
require $file; require $file;

2
lib/private/Installer.php
View File

@ -564,7 +564,7 @@ class Installer {
} }
//run appinfo/install.php //run appinfo/install.php
\OC::$loader->addValidRoot($appPath); \OC_App::registerAutoloading($app, $appPath);
self::includeAppScript("$appPath/appinfo/install.php"); self::includeAppScript("$appPath/appinfo/install.php");
$info = OC_App::getAppInfo($app); $info = OC_App::getAppInfo($app);

3
lib/private/legacy/app.php
View File

@ -159,10 +159,11 @@ class OC_App {
} }
/** /**
* @internal
* @param string $app * @param string $app
* @param string $path * @param string $path
*/ */
protected static function registerAutoloading($app, $path) { public static function registerAutoloading($app, $path) {
// Register on PSR-4 composer autoloader // Register on PSR-4 composer autoloader
$appNamespace = \OC\AppFramework\App::buildAppNamespace($app); $appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
\OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true); \OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);

2
tests/settings/controller/EncryptionControllerTest.php
View File

@ -91,7 +91,7 @@ class EncryptionControllerTest extends TestCase {
public function testStartMigrationSuccessful() { public function testStartMigrationSuccessful() {
// we need to be able to autoload the class we're mocking // we need to be able to autoload the class we're mocking
\OC::$loader->addValidRoot(\OC_App::getAppPath('encryption')); \OC_App::registerAutoloading('encryption', \OC_App::getAppPath('encryption'));
$migration = $this->getMockBuilder('\\OCA\\Encryption\\Migration') $migration = $this->getMockBuilder('\\OCA\\Encryption\\Migration')
->disableOriginalConstructor()->getMock(); ->disableOriginalConstructor()->getMock();