Skip to content

Commit

Permalink
Updated documentation to point to modules/vendor.
Browse files Browse the repository at this point in the history
Updated test Bootstrap to use module autoloader.
  • Loading branch information
Kyle Spraggs committed Nov 4, 2011
1 parent bff2faf commit 4840372
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 47 deletions.
45 changes: 0 additions & 45 deletions README.md.orig

This file was deleted.

4 changes: 2 additions & 2 deletions docs/INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Installing the SpiffyDoctrine module for Zend Framework 2
The simplest way to install is to clone the repository into your /modules directory add the
The simplest way to install is to clone the repository into your /modules/vendor directory add the
SpiffyDoctrine key to your modules array before your Application module key.

1. cd my/project/folder
2. git clone git://github.com/SpiffyJr/SpiffyDoctrine.git modules/SpiffyDoctrine --recursive
2. git clone git://github.com/SpiffyJr/SpiffyDoctrine.git modules/vendor/SpiffyDoctrine --recursive
3. open my/project/folder/configs/application.config.php and add 'SpiffyDoctrine' to your 'modules' parameter.
4. Alter the configuration (most likely your connection and entities path(s)) by adding the required changes to
my/project/folder/modules/Application/module.config.php.
Expand Down
6 changes: 6 additions & 0 deletions tests/Bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
require_once 'Zend/Loader/AutoloaderFactory.php';
\Zend\Loader\AutoloaderFactory::factory(array('Zend\Loader\StandardAutoloader' => array()));

$moduleLoader = new \Zend\Loader\ModuleAutoloader(array(
__DIR__ . '/../modules',
__DIR__ . '/../modules/vendor'
));
$moduleLoader->register();

$moduleManager = new \Zend\Module\Manager(array(MODULE_NAME));
$moduleManager->loadModule(MODULE_NAME);

Expand Down

0 comments on commit 4840372

Please sign in to comment.