Merge pull request #64 from EvanDotPro/hotfix/composer-fixes

Hotfix/composer fixes

diff --git a/.gitignore b/.gitignore
index f86d474..6ab883d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ nbproject
 .DS_Store
 .idea
 .project
-.settings
\ No newline at end of file
+.settings

diff --git a/README.md b/README.md
index 531b01d..dd9072b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -46,9 +46,6 @@ Within modules/Application/Module.php add this method to the Application class:
     public function getAutoloaderConfig()
     {
         return array(
-            'Zend\Loader\ClassMapAutoloader' => array(
-                __DIR__ . '/autoload_classmap.php',
-            ),
             'Zend\Loader\StandardAutoloader' => array(
                 'namespaces' => array(
                     __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
@@ -60,4 +57,4 @@ Within modules/Application/Module.php add this method to the Application class:
 Virtual Host
 ------------
 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
+project and you should be ready to go!

diff --git a/composer.json b/composer.json
index ff59307..f31c385 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     "homepage": "http://framework.zend.com/",
     "require": {
         "php": ">=5.3.3",
-        "zendframework/zendframework": "dev-master#96750fd8e6e85ead7ca42e5cb6b890816e67cbcc"
+        "zendframework/zendframework": "dev-master#cef2f9c90a9dc3fe3018b624ff9113666a397b73"
     },
     "autoload": {
         "psr-0": {

diff --git a/composer.lock b/composer.lock
deleted file mode 100644 (file)
index f0922d0..0000000
--- a/composer.lock
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "hash": "aeff3640d146b3542c567f85bb07ab23",
-    "packages": [
-        {
-            "package": "zendframework/zendframework",
-            "version": "dev-master",
-            "source-reference": "5188f29db00222584de2e775dbf7fd004a2600b5",
-            "alias-pretty-version": "2.0.x-dev",
-            "alias-version": "2.0.9999999.9999999-dev"
-        },
-        {
-            "package": "zendframework/zendframework",
-            "version": "dev-master",
-            "source-reference": "5188f29db00222584de2e775dbf7fd004a2600b5"
-        },
-        {
-            "package": "zendframework/zendframework",
-            "version": "dev-master",
-            "source-reference": "5188f29db00222584de2e775dbf7fd004a2600b5",
-            "alias-pretty-version": "2.0.x-dev",
-            "alias-version": "2.0.9999999.9999999-dev"
-        },
-        {
-            "package": "zendframework/zendframework",
-            "version": "dev-master",
-            "source-reference": "fedd11dce74ca2ec20c1370915be06615e91b9d2",
-            "alias-pretty-version": "2.0.x-dev",
-            "alias-version": "2.0.9999999.9999999-dev"
-        }
-    ],
-    "packages-dev": null,
-    "aliases": [
-
-    ],
-    "minimum-stability": "dev",
-    "stability-flags": {
-        "zendframework/zendframework": 20
-    }
-}