Skip to content
Browse files

Updated Doctrine submodule to be just doctrine-orm.

Updated classmap.
Updated doctrine/bin.
  • Loading branch information...
1 parent cf70fbe commit c21ed488da9dfcf257b77e28960167e757fa7b1a Kyle Spraggs committed Oct 26, 2011
Showing with 335 additions and 342 deletions.
  1. +0 −9 .gitmodules
  2. +329 −325 autoload_classmap.php
  3. +6 −5 bin/doctrine.php
  4. +0 −1 library/Symfony/Component/Console
  5. +0 −1 library/doctrine-common
  6. +0 −1 library/doctrine-dbal
View
9 .gitmodules
@@ -1,12 +1,3 @@
[submodule "lib/doctrine-orm"]
path = library/doctrine-orm
url = https://github.com/doctrine/doctrine2.git
-[submodule "lib/doctrine-dbal"]
- path = library/doctrine-dbal
- url = https://github.com/doctrine/dbal.git
-[submodule "lib/doctrine-common"]
- path = library/doctrine-common
- url = https://github.com/doctrine/common.git
-[submodule "lib/Symfony/Component/Console"]
- path = library/Symfony/Component/Console
- url = git://github.com/symfony/Console.git
View
654 autoload_classmap.php
329 additions, 325 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
11 bin/doctrine.php
@@ -9,21 +9,22 @@
// Ensure library/ is on include_path
set_include_path(implode(PATH_SEPARATOR, array(
- realpath(__DIR__ . '/../../../lib'), // just for git submodule
+ realpath(__DIR__ . '/../../../library'), // just for git submodule
+ realpath(__DIR__ . '/../../../library/ZendFramework/library'), // just for git submodule
get_include_path(),
)));
require_once 'Zend/Loader/AutoloaderFactory.php';
Zend\Loader\AutoloaderFactory::factory(array('Zend\Loader\StandardAutoloader' => array()));
-$appConfig = include __DIR__ . '/../../../etc/application.config.php';
+$appConfig = new Zend\Config\Config(include __DIR__ . '/../../../configs/application.config.php');
-$moduleLoader = new Zend\Loader\ModuleAutoloader($appConfig->module_paths);
+$moduleLoader = new Zend\Loader\ModuleAutoloader($appConfig['module_paths']);
$moduleLoader->register();
$moduleManager = new Zend\Module\Manager(
- array('SpiffyDoctrine'),
- new Zend\Module\ManagerOptions($appConfig->module_manager_options)
+ array('SpiffyDoctrine', 'Application'),
+ new Zend\Module\ManagerOptions($appConfig['module_manager_options'])
);
\Doctrine\ORM\Tools\Console\ConsoleRunner::run(
1 library/Symfony/Component/Console
@@ -1 +0,0 @@
-Subproject commit cc01c2c6b2f699f680700c12e1a1207facaf7074
1 library/doctrine-common
@@ -1 +0,0 @@
-Subproject commit f5314bd482b87a0badc08add0dcd9cd6af32262f
1 library/doctrine-dbal
@@ -1 +0,0 @@
-Subproject commit aff4df3066bafcce9452f52b492a10869e4e0a7c

0 comments on commit c21ed48

Please sign in to comment.
Something went wrong with that request. Please try again.