From 3ea2dfa5f9c0692f68ce64856bdf203a9bbc2018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 7 Oct 2013 11:36:38 +0200
Subject: [PATCH] remove getTrans() from API class
---
lib/private/appframework/core/api.php | 10 ---------
lib/public/appframework/iapi.php | 8 -------
.../dependencyinjection/DIContainerTest.php | 21 ++-----------------
3 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/lib/private/appframework/core/api.php b/lib/private/appframework/core/api.php
index c5991237ed..31da0706a1 100644
--- a/lib/private/appframework/core/api.php
+++ b/lib/private/appframework/core/api.php
@@ -99,16 +99,6 @@ class API implements IApi{
}
- /**
- * Returns the translation object
- * @return \OC_L10N the translation object
- */
- public function getTrans(){
- # TODO: use public api
- return \OC_L10N::get($this->appName);
- }
-
-
/**
* Returns the URL for a route
* @param string $routeName the name of the route
diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php
index fa6af5f596..818647c19f 100644
--- a/lib/public/appframework/iapi.php
+++ b/lib/public/appframework/iapi.php
@@ -67,14 +67,6 @@ interface IApi {
*/
function add3rdPartyStyle($name);
- /**
- * Returns the translation object
- * @return \OC_L10N the translation object
- *
- * FIXME: returns private object / should be retrieved from teh ServerContainer
- */
- function getTrans();
-
/**
* Returns the URL for a route
diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
index 25fdd20283..f3ebff0207 100644
--- a/tests/lib/appframework/dependencyinjection/DIContainerTest.php
+++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
@@ -29,23 +29,14 @@ namespace OC\AppFramework\DependencyInjection;
use \OC\AppFramework\Http\Request;
-//require_once(__DIR__ . "/../classloader.php");
-
-
class DIContainerTest extends \PHPUnit_Framework_TestCase {
private $container;
+ private $api;
protected function setUp(){
$this->container = new DIContainer('name');
- $this->api = $this->getMock('OC\AppFramework\Core\API', array('getTrans'), array('hi'));
- }
-
- private function exchangeAPI(){
- $this->api->expects($this->any())
- ->method('getTrans')
- ->will($this->returnValue('yo'));
- $this->container['API'] = $this->api;
+ $this->api = $this->getMock('OC\AppFramework\Core\API', array(), array('hi'));
}
public function testProvidesAPI(){
@@ -87,12 +78,4 @@ class DIContainerTest extends \PHPUnit_Framework_TestCase {
}
- public function testMiddlewareDispatcherDoesNotIncludeTwigWhenTplDirectoryNotSet(){
- $this->container['Request'] = new Request();
- $this->exchangeAPI();
- $dispatcher = $this->container['MiddlewareDispatcher'];
-
- $this->assertEquals(1, count($dispatcher->getMiddlewares()));
- }
-
}
--
GitLab