diff options
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/AppFramework/Routing/RouteConfig.php | 16 | ||||
| -rw-r--r-- | lib/private/Preview.php | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/lib/private/AppFramework/Routing/RouteConfig.php b/lib/private/AppFramework/Routing/RouteConfig.php index e94f2e50c1d..70208725f46 100644 --- a/lib/private/AppFramework/Routing/RouteConfig.php +++ b/lib/private/AppFramework/Routing/RouteConfig.php @@ -36,14 +36,25 @@ use OCP\Route\IRouter; * @package OC\AppFramework\routing */ class RouteConfig { + /** @var DIContainer */ private $container; + + /** @var IRouter */ private $router; + + /** @var array */ private $routes; + + /** @var string */ private $appName; + /** @var string[] */ + private $controllerNameCache = []; + /** * @param \OC\AppFramework\DependencyInjection\DIContainer $container * @param \OCP\Route\IRouter $router + * @param array $routes * @internal param $appName */ public function __construct(DIContainer $container, IRouter $router, $routes) { @@ -234,7 +245,10 @@ class RouteConfig { */ private function buildControllerName($controller) { - return $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller'; + if (!isset($this->controllerNameCache[$controller])) { + $this->controllerNameCache[$controller] = $this->underScoreToCamelCase(ucfirst($controller)) . 'Controller'; + } + return $this->controllerNameCache[$controller]; } /** diff --git a/lib/private/Preview.php b/lib/private/Preview.php index 9c6a7b54988..ccaec738caf 100644 --- a/lib/private/Preview.php +++ b/lib/private/Preview.php @@ -131,7 +131,7 @@ class Preview { $this->setFile($file); $this->setMaxX((int)$maxX); $this->setMaxY((int)$maxY); - $this->setScalingUp($scalingUp); + $this->setScalingup($scalingUp); $this->preview = null; |