partkeepr

commit ef0b7bfd0fcd4f027f073543648a470a5c68ac29
parent c3891031907436bfd305db3bbf2ae18fd83bd254
Author: Felicitus <felicitus@felicitus.org>
Date:   Mon, 19 Aug 2013 17:59:50 +0200

Removed autoloader from PartKeepr, we're using the composer autoloader now

Diffstat:
M
composer.json
 | 
3
++-
M
composer.lock
 | 
58
++++++++++++++++++++++++++++++++++++++++++++++++++++++----
M
src/backend/PartKeepr/PartKeepr.php
 | 
1
+
M
src/frontend/index.php
 | 
13
+++++++++++--
M
src/frontend/rest.php
 | 
12
+++++++++---

5 files changed, 77 insertions(+), 10 deletions(-)
diff --git a/composer.json b/composer.json
@@ -37,7 +37,8 @@
         "sensio/generator-bundle": "~2.3",
         "incenteev/composer-parameter-handler": "~2.0",
         "friendsofsymfony/rest-bundle": "0.13.1",
-        "jms/serializer-bundle": "0.12.0"
+        "jms/serializer-bundle": "0.12.0",
+        "cbsi/doctrine2-nestedset": "dev-master"
     },
     "autoload": {
         "psr-0": { "": "src/",
diff --git a/composer.lock b/composer.lock
@@ -3,9 +3,59 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "a73097126e6cdf33144db3c2dc93c824",
+    "hash": "fa1fbaca0acae56b9e85ab678bdf427b",
     "packages": [
         {
+            "name": "cbsi/doctrine2-nestedset",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/cbsi/doctrine2-nestedset.git",
+                "reference": "f49a44e8a0b9bf0ee85db0f8f6fc96bece150713"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/cbsi/doctrine2-nestedset/zipball/f49a44e8a0b9bf0ee85db0f8f6fc96bece150713",
+                "reference": "f49a44e8a0b9bf0ee85db0f8f6fc96bece150713",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "doctrine/common": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "DoctrineExtensions\\NestedSet\\Tests": "tests/",
+                    "DoctrineExtensions\\NestedSet": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL 2.1"
+            ],
+            "authors": [
+                {
+                    "name": "Brandon Turner",
+                    "homepage": "https://github.com/blt04"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/cbsi/doctrine2-nestedset/graphs/contributors"
+                }
+            ],
+            "description": "This Doctrine2 extension implements the nested set model (modified pre-order tree traversal algorithm) for Doctrine2. ",
+            "homepage": "https://github.com/cbsi/doctrine2-nestedset",
+            "keywords": [
+                "doctrine2",
+                "extentions",
+                "nested set"
+            ],
+            "time": "2012-08-24 21:14:33"
+        },
+        {
             "name": "doctrine/annotations",
             "version": "v1.1.2",
             "source": {
@@ -2026,9 +2076,9 @@
 
     ],
     "minimum-stability": "dev",
-    "stability-flags": [
-
-    ],
+    "stability-flags": {
+        "cbsi/doctrine2-nestedset": 20
+    },
     "platform": {
         "php": ">=5.3.3"
     },
diff --git a/src/backend/PartKeepr/PartKeepr.php b/src/backend/PartKeepr/PartKeepr.php
@@ -42,6 +42,7 @@ class PartKeepr {
 	 * @return nothing
 	 */
 	public static function initializeClassLoaders() {
+        return;
 		require_once 'Doctrine/Common/ClassLoader.php';
 
 		$classLoader = new ClassLoader('PartKeepr', self::getRootDirectory() . "/src/backend");
diff --git a/src/frontend/index.php b/src/frontend/index.php
@@ -5,10 +5,19 @@ use PartKeepr\User\User,
 	PartKeepr\Service\ServiceManager,
 	PartKeepr\PartKeepr,
 	PartKeepr\Session\SessionManager,
-	PartKeepr\Util\Configuration;
+	PartKeepr\Util\Configuration,
+    Symfony\Component\ClassLoader\ApcClassLoader,
+    Symfony\Component\HttpFoundation\Request;
+
 
 include("../src/backend/PartKeepr/PartKeepr.php");
-include_once 'Twig/Autoloader.php';
+
+$loader = require_once __DIR__.'/../app/bootstrap.php.cache';
+
+require_once __DIR__.'/../app/AppKernel.php';
+
+$kernel = new AppKernel('dev', false);
+$kernel->loadClassCache();
 
 PartKeepr::initialize("");
 
diff --git a/src/frontend/rest.php b/src/frontend/rest.php
@@ -1,10 +1,16 @@
 <?php
-namespace PartKeepr\Frontend;
-
 use PartKeepr\PartKeepr,
 	PartKeepr\Service\ServiceManager;
 
-include("../src/backend/PartKeepr/PartKeepr.php");
+use Symfony\Component\ClassLoader\ApcClassLoader;
+use Symfony\Component\HttpFoundation\Request;
+
+$loader = require_once __DIR__.'/../app/bootstrap.php.cache';
+
+require_once __DIR__.'/../app/AppKernel.php';
+
+$kernel = new AppKernel('dev', false);
+$kernel->loadClassCache();
 
 PartKeepr::initialize("");