Updated README to go over submodule option.

Added composer autoloading to Skeleton and updated Module.php to reflect.

diff --git a/README.md b/README.md
index 35c3a87..f3fd2fa 100644 (file)
--- a/README.md
+++ b/README.md
@@ -10,7 +10,10 @@ looking to get their feet wet with ZF2.
 
 Installation
 ------------
-The easiest way to get a working copy of this project is to clone the repository
+
+Using Composer (recommended)
+----------------------------
+The recommended way to get a working copy of this project is to clone the repository
 and use composer to install dependencies:
 
     cd my/project/dir
@@ -18,5 +21,41 @@ and use composer to install dependencies:
     cd ZendSkeletonApplication
     php composer.phar install
 
+Using Git submodules
+--------------------
+Alternatively, you can install using native git submodules. This method works fine but it is
+recommended that you use Composer due to the dependency management it provides.
+
+    git clone git://github.com/zendframework/ZendSkeletonApplication.git --recursive
+
+You will also need to update public/index.php and modules/Application/Module.php to enable autoloading.
+For public/index.php, replace lines 2-13 with:
+
+    chdir(dirname(__DIR__));
+    require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
+
+    use Zend\Loader\AutoloaderFactory,
+        Zend\ServiceManager\ServiceManager,
+        Zend\Mvc\Service\ServiceManagerConfiguration;
+
+    // setup autoloader
+    AutoloaderFactory::factory();
+
+For modules/Application/Module.php add:
+
+    public function getAutoloaderConfig()
+    {
+        return array(
+            'Zend\Loader\ClassMapAutoloader' => array(
+                __DIR__ . '/autoload_classmap.php',
+            ),
+            'Zend\Loader\StandardAutoloader' => array(
+                'namespaces' => array(
+                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
+                ),
+            ),
+        );
+    }
+
 Afterwards, set up a virtual host to point to the public/ directory of the
 project and you should be ready to go!
\ No newline at end of file

diff --git a/composer.json b/composer.json
index 9927db9..6599bf5 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,11 @@
     "homepage": "http://framework.zend.com/",
     "require": {
         "php": ">=5.3.3",
-        "zendframework/zendframework": "dev-master#fedd11dce74ca2ec20c1370915be06615e91b9d2"
+        "zendframework/zendframework": "dev-master#5188f29db00222584de2e775dbf7fd004a2600b5"
+    },
+    "autoload": {
+        "psr-0": {
+            "Application": "module/Application/src"
+        }
     }
 }

diff --git a/module/Application/Module.php b/module/Application/Module.php
index a7dd66b..0ed2ef2 100644 (file)
--- a/module/Application/Module.php
+++ b/module/Application/Module.php
@@ -4,20 +4,6 @@ namespace Application;
 
 class Module
 {
-    public function getAutoloaderConfig()
-    {
-        return array(
-            'Zend\Loader\ClassMapAutoloader' => array(
-                __DIR__ . '/autoload_classmap.php',
-            ),
-            'Zend\Loader\StandardAutoloader' => array(
-                'namespaces' => array(
-                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
-                ),
-            ),
-        );
-    }
-
     public function getConfig()
     {
         return include __DIR__ . '/config/module.config.php';