From 526100dc90511bb3f37115c02fd449234ff6105c Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sat, 12 Apr 2014 01:33:21 +0200 Subject: [PATCH 1/2] be nice and use a relative import so people can use the class without firing up owncloud --- lib/private/appframework/utility/simplecontainer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php index d08a4879e3..9197ec1385 100644 --- a/lib/private/appframework/utility/simplecontainer.php +++ b/lib/private/appframework/utility/simplecontainer.php @@ -3,7 +3,7 @@ namespace OC\AppFramework\Utility; // register 3rdparty autoloaders -require_once 'Pimple/Pimple.php'; +require_once __DIR__ . '/../../../../3rdparty/Pimple/Pimple.php'; /** * Class SimpleContainer From 6935364b33b0fb8206a83b67aa9a8e6eb874a541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 28 Apr 2014 20:57:44 +0200 Subject: [PATCH 2/2] add class Pimple to autloader --- lib/base.php | 1 + lib/private/appframework/utility/simplecontainer.php | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/base.php b/lib/base.php index 6ea77aa7a5..cf533a031a 100644 --- a/lib/base.php +++ b/lib/base.php @@ -404,6 +404,7 @@ class OC { self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing'); self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console'); self::$loader->registerPrefix('Patchwork', '3rdparty'); + self::$loader->registerPrefix('Pimple', '3rdparty/Pimple'); spl_autoload_register(array(self::$loader, 'load')); // set some stuff diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php index 9197ec1385..1ad06b9ab2 100644 --- a/lib/private/appframework/utility/simplecontainer.php +++ b/lib/private/appframework/utility/simplecontainer.php @@ -2,9 +2,6 @@ namespace OC\AppFramework\Utility; -// register 3rdparty autoloaders -require_once __DIR__ . '/../../../../3rdparty/Pimple/Pimple.php'; - /** * Class SimpleContainer *