diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-22 21:28:45 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-22 21:28:45 +0100 |
| commit | 640e6351f17c7307d467bfa9e1665a30fabbdc4b (patch) | |
| tree | 07ea8e4a8dedc340e3749d585da16925177ef78a | |
| parent | d5be21fe8159f7dc567ae9c1264b1f9087f16e8e (diff) | |
| parent | 5b78c604b5479bf88cf2972a7970158f4ea35fe3 (diff) | |
| download | nextcloud-server-640e6351f17c7307d467bfa9e1665a30fabbdc4b.tar.gz nextcloud-server-640e6351f17c7307d467bfa9e1665a30fabbdc4b.zip | |
Merge pull request #23485 from owncloud/composer_allow_ocp
Allow OCP classes to be PSR-4 as well
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_psr4.php | 1 | ||||
| -rw-r--r-- | lib/public/IServerContainer.php (renamed from lib/public/iservercontainer.php) | 0 |
3 files changed, 5 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 495a9896ae2..21575b5fa60 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,10 @@ "vendor-dir": "lib/composer" }, "autoload" : { - "psr-4": {"OC\\": "lib/private"} + "psr-4": { + "OC\\": "lib/private", + "OCP\\": "lib/public" + } }, "require-dev": { "jakub-onderka/php-parallel-lint": "^0.9.2", diff --git a/lib/composer/composer/autoload_psr4.php b/lib/composer/composer/autoload_psr4.php index a4b49f0f55f..4610a912c6d 100644 --- a/lib/composer/composer/autoload_psr4.php +++ b/lib/composer/composer/autoload_psr4.php @@ -7,4 +7,5 @@ $baseDir = dirname(dirname($vendorDir)); return array( 'OC\\' => array($baseDir . '/lib/private'), + 'OCP\\' => array($baseDir . '/lib/public'), ); diff --git a/lib/public/iservercontainer.php b/lib/public/IServerContainer.php index de48daeef88..de48daeef88 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/IServerContainer.php |