Merge pull request #55 from dustinmoorman/zf1-d2-include-path-fixes

Zf1 d2 include path fixes

Author: guilhermeblanco

README.markdown

@@ -40,23 +40,23 @@ Here is an example of configuration:
 
     ; Doctrine Common ClassLoader class and file
     resources.doctrine.classLoader.loaderClass = "Doctrine\Common\ClassLoader"
-    resources.doctrine.classLoader.loaderFile  = APPLICATION_PATH "/../library/vendor/Doctrine/lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php"
+    resources.doctrine.classLoader.loaderFile  = APPLICATION_PATH "/../library/vendor/doctrine/common/lib/Doctrine/Common/ClassLoader.php"
 
     ; Namespace loader for Doctrine\Common
     resources.doctrine.classLoader.loaders.doctrine_common.namespace   = "Doctrine\Common"
-    resources.doctrine.classLoader.loaders.doctrine_common.includePath = APPLICATION_PATH "/../library/vendor/Doctrine/lib/vendor/doctrine-common/lib"
+    resources.doctrine.classLoader.loaders.doctrine_common.includePath = APPLICATION_PATH "/../library/vendor/doctrine/common/lib/Doctrine/Common"
 
     ; Namespace loader for Doctrine\DBAL
     resources.doctrine.classLoader.loaders.doctrine_dbal.namespace   = "Doctrine\DBAL"
-    resources.doctrine.classLoader.loaders.doctrine_dbal.includePath = APPLICATION_PATH "/../library/vendor/Doctrine/lib/vendor/doctrine-dbal/lib"
+    resources.doctrine.classLoader.loaders.doctrine_dbal.includePath = APPLICATION_PATH "/../library/vendor/doctrine/dbal/lib/Doctrine/DBAL"
 
     ; Namespace loader for Doctrine\ORM
     resources.doctrine.classLoader.loaders.doctrine_orm.namespace   = "Doctrine\ORM"
-    resources.doctrine.classLoader.loaders.doctrine_orm.includePath = APPLICATION_PATH "/../library/vendor/Doctrine/lib"
+    resources.doctrine.classLoader.loaders.doctrine_orm.includePath = APPLICATION_PATH "/../library/vendor/doctrine/orm/lib/Doctrine/ORM"
 
     ; Namespace loader for Symfony\Component\Console
     resources.doctrine.classLoader.loaders.symfony_console.namespace   = "Symfony\Component\Console"
-    resources.doctrine.classLoader.loaders.symfony_console.includePath = APPLICATION_PATH "/../library/vendor/Doctrine/lib/vendor"
+    resources.doctrine.classLoader.loaders.symfony_console.includePath = APPLICATION_PATH "/../library/vendor/symfony/console/Symfony/Component/Console"
 
     ; Namespace loader for Symfony\Component\Yaml
     resources.doctrine.classLoader.loaders.symfony_yaml.namespace   = "Symfony\Component\Yaml"
@@ -214,4 +214,4 @@ The following API exposes all available Doctrine Container methods to be used by
 	     * @return Doctrine\ORM\EntityManager ORM EntityManager
 	     */
 	    public function getEntityManager($emName = null);
-	}
+	}

application/configs/application.ini

@@ -36,19 +36,19 @@ resources.frontController.params.displayExceptions = 0
 ; ------------------------------------------------------------------------------
 
 resources.doctrine.classLoader.loaderClass = "Doctrine\Common\ClassLoader"
-resources.doctrine.classLoader.loaderFile  = APPLICATION_PATH "/../library/vendor/Doctrine/lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php"
+resources.doctrine.classLoader.loaderFile  = APPLICATION_PATH "/../library/vendor/doctrine/common/lib/Doctrine/Common/ClassLoader.php"
 
 resources.doctrine.classLoader.loaders.doctrine_common.namespace   = "Doctrine\Common"
-resources.doctrine.classLoader.loaders.doctrine_common.includePath = APPLICATION_PATH "/../library/vendor/Doctrine/lib/vendor/doctrine-common/lib"
+resources.doctrine.classLoader.loaders.doctrine_common.includePath = APPLICATION_PATH "/../library/vendor/doctrine/common/lib/Doctrine/Common"
 
 resources.doctrine.classLoader.loaders.doctrine_dbal.namespace   = "Doctrine\DBAL"
-resources.doctrine.classLoader.loaders.doctrine_dbal.includePath = APPLICATION_PATH "/../library/vendor/Doctrine/lib/vendor/doctrine-dbal/lib"
+resources.doctrine.classLoader.loaders.doctrine_dbal.includePath = APPLICATION_PATH "/../library/vendor/doctrine/dbal/lib/Doctrine/DBAL"
 
 resources.doctrine.classLoader.loaders.doctrine_orm.namespace   = "Doctrine\ORM"
-resources.doctrine.classLoader.loaders.doctrine_orm.includePath = APPLICATION_PATH "/../library/vendor/Doctrine/lib"
+resources.doctrine.classLoader.loaders.doctrine_orm.includePath = APPLICATION_PATH "/../library/vendor/doctrine/orm/lib/Doctrine/ORM"
 
 resources.doctrine.classLoader.loaders.symfony_console.namespace   = "Symfony\Component\Console"
-resources.doctrine.classLoader.loaders.symfony_console.includePath = APPLICATION_PATH "/../library/vendor/Doctrine/lib/vendor"
+resources.doctrine.classLoader.loaders.symfony_console.includePath = APPLICATION_PATH "/../library/vendor/symfony/console/Symfony/Component/Console"
 
 resources.doctrine.classLoader.loaders.symfony_yaml.namespace   = "Symfony\Component\Yaml"
 resources.doctrine.classLoader.loaders.symfony_yaml.includePath = APPLICATION_PATH "/../library/vendor/Doctrine/lib/vendor"
@@ -120,7 +120,7 @@ resources.doctrine.orm.entityManagers.default.proxy.dir                 = APPLIC
 ;resources.doctrine.orm.entityManagers.default.queryCache    = default
 ;resources.doctrine.orm.entityManagers.default.resultCache   = default
 ;resources.doctrine.orm.entityManagers.default.DQLFunctions.numeric.PI = "DoctrineExtensions\ORM\Query\Functions\Numeric\PiFunction"
-resources.doctrine.orm.entityManagers.default.metadataDrivers.annotationRegistry.annotationFiles[]     = APPLICATION_PATH "/../library/vendor/Doctrine/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php"
+resources.doctrine.orm.entityManagers.default.metadataDrivers.annotationRegistry.annotationFiles[]     = APPLICATION_PATH "/../library/vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php"
 ;resources.doctrine.orm.entityManagers.default.metadataDrivers.annotationRegistry.annotationNamespaces.0.namespace   = "Gedmo"
 ;resources.doctrine.orm.entityManagers.default.metadataDrivers.annotationRegistry.annotationNamespaces.0.includePath = APPLICATION_PATH "/../library/vendor"
 resources.doctrine.orm.entityManagers.default.metadataDrivers.drivers.0.adapterClass          = "Doctrine\ORM\Mapping\Driver\AnnotationDriver"