wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not add ICssManager to OCP

Browse source 
We can add it later if needed

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2016-11-22 12:08:53 +01:00
parent 2816177ecb
commit 95d85ba8eb
No known key found for this signature in database
GPG key ID: F941078878347C0C
5 changed files with 10 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/Application.php
View file

@ -31,6 +31,7 @@
namespace OC\Core;
use OC\AppFramework\Utility\SimpleContainer;
use OC\CssManager;
use OC\Security\IdentityProof\Manager;
use OCP\AppFramework\App;
use OCP\Files\IAppData;
@ -57,5 +58,8 @@ class Application extends App {
\OC::$server->getCrypto()
);
});
$container->registerService(CssManager::class, function () {
return new CssManager(\OC::$server->getAppDataDir('css'));
});
}
}

9
core/Controller/CssController.php
View file

@ -22,17 +22,18 @@
namespace OC\Core\Controller;
use OC\AppFramework\Utility\TimeFactory;
use OC\CssManager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\NotFoundResponse;
use OCP\AppFramework\Http\FileDisplayResponse;
use OCP\ICssManager;
use OCP\Files\NotFoundException;
use OCP\IRequest;
class CssController extends Controller {
/** @var ICssManager */
/** @var CssManager */
protected $cssManager;
/** @var TimeFactory */
@ -43,10 +44,10 @@ class CssController extends Controller {
/**
* @param string $appName
* @param IRequest $request
* @param ICssManager $cssManager
* @param CssManager $cssManager
* @param TimeFactory $timeFactory
*/
public function __construct($appName, IRequest $request, ICssManager $cssManager, TimeFactory $timeFactory) {
public function __construct($appName, IRequest $request, CssManager $cssManager, TimeFactory $timeFactory) {
parent::__construct($appName, $request);
$this->cssManager = $cssManager;

3
lib/private/CssManager.php
View file

@ -24,14 +24,13 @@ namespace OC;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\ICssManager;
/**
* This class implements methods to access SCSS cached files
* @since 11.0.0
*/
class CssManager implements ICssManager {
class CssManager {
/** @var IAppData */
private $appData;

14
lib/private/Server.php
View file

@ -417,11 +417,6 @@ class Server extends ServerContainer implements IServerContainer {
$c->getConfig()
);
});
$this->registerService(CssManager::class, function (Server $c) {
return new CssManager(
$c->getAppDataDir('css')
);
});
$this->registerService('Logger', function (Server $c) {
$logClass = $c->query('AllConfig')->getSystemValue('log_type', 'file');
// TODO: Drop backwards compatibility for config in the future
@ -912,15 +907,6 @@ class Server extends ServerContainer implements IServerContainer {
return $this->query('AvatarManager');
}
/**
* Returns the css manager
*
* @return \OCP\ICssManager
*/
public function getCssManager() {
return $this->query(CssManager::class);
}
/**
* Returns the root folder of ownCloud's data directory
*

43
lib/public/ICssManager.php
View file

@ -1,43 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, John Molakvoæ (skjnldsv@protonmail.com)
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCP;
use OCP\Files\NotFoundException;
use OCP\Files\SimpleFS\ISimpleFile;
/**
* This class provides scss functionality
* @since 11.0.0
*/
interface ICssManager {
/**
* Get the css file and return ISimpleFile
*
* @param string $fileName css filename with extension
* @param string $appName css app name
* @return ISimpleFile
* @throws NotFoundException
*/
public function getCss($fileName, $appName);
}