Added composer.lock to git.

Added vendor/ to .gitignore, this directory is created by composer.
Modified index.php to skip the autoloader factory.

diff --git a/.gitignore b/.gitignore
index ad907fa..04932a3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@ nbproject
 .idea
 .project
 .settings
-composer.lock
+vendor

diff --git a/composer.lock b/composer.lock
new file mode 100644 (file)
index 0000000..bbfae7e
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,25 @@
+{
+    "hash": "0dec7f0ed037ec44a5f067188ff04355",
+    "packages": [
+        {
+            "package": "zendframework/zendframework",
+            "version": "dev-master",
+            "source-reference": "306191abc5fc4e6a8f682c3aa4549fb73fd85f43",
+            "alias-pretty-version": "2.0.x-dev",
+            "alias-version": "2.0.9999999.9999999-dev"
+        },
+        {
+            "package": "zendframework/zendframework",
+            "version": "dev-master",
+            "source-reference": "306191abc5fc4e6a8f682c3aa4549fb73fd85f43"
+        }
+    ],
+    "packages-dev": null,
+    "aliases": [
+
+    ],
+    "minimum-stability": "dev",
+    "stability-flags": {
+        "zendframework/zendframework": 20
+    }
+}

diff --git a/public/index.php b/public/index.php
index 1738321..05f5332 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -1,15 +1,12 @@
 <?php
 chdir(dirname(__DIR__));
 require_once('vendor/autoload.php');
-Zend\Loader\AutoloaderFactory::factory();
-
-$appConfig = include 'config/application.config.php';
 
+$appConfig        = include 'config/application.config.php';
 $sharedEvents     = new Zend\EventManager\SharedEventManager();
 $listenerOptions  = new Zend\Module\Listener\ListenerOptions($appConfig['module_listener_options']);
 $defaultListeners = new Zend\Module\Listener\DefaultListenerAggregate($listenerOptions);
 $defaultListeners->getConfigListener()->addConfigGlobPath("config/autoload/*.php");
-    
 
 $moduleManager = new Zend\Module\Manager($appConfig['modules']);
 $events        = $moduleManager->events();

diff --git a/vendor/.gitignore b/vendor/.gitignore
deleted file mode 100644 (file)
index b44e2de..0000000
--- a/vendor/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.composer
-composer
-autoload.php
-zendframework

diff --git a/vendor/README.md b/vendor/README.md
deleted file mode 100644 (file)
index 77ae06b..0000000
--- a/vendor/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This `vendor/` directory is where third-party modules should be installed.