Initial composer commit.

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

diff --git a/README.md b/README.md
index 5f21e53..5ac885c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -10,33 +10,14 @@ looking to get their feet wet with ZF2.
 
 Installation
 ------------
-The easiest way to get a working copy of this project is to do a recursive
-clone:
+The easiest way to get a working copy of this project is to clone the repository
+and use composer to install dependencies:
 
-    git clone --recursive git://github.com/zendframework/ZendSkeletonApplication.git
+    cd my/project/dir
+    git clone git://github.com/zendframework/ZendSkeletonApplication.git
+    cd ZendSkeletonApplication
+    curl -s http://getcomposer.org/installer | php (windows: download http://getcomposer.org/installer and execute with PHP)
+    php composer.phar install
 
-After the clone is complete, set up a virtual host to point to the public/
-directory of the project and you should be ready to go!
-
-If you're wondering what the `--recursive` flag is, keep reading:
-
-Git Submodules
---------------
-This project makes use of [Git submodules](http://book.git-scm.com/5_submodules.html).
-Utilizing Git submodules allows us to reference an exact commit in the upstream
-[zendframework/zf2](https://github.com/zendframework/zf2) repository and ensure
-that those who have cloned the project have that same commit checked out. This
-provides several benefits:
-
-* Developers do not have to worry about which commit of the zf2 project to have
-  checked out for this project to work.
-* No additional steps to "install" Zend Framework are needed; it "just works"
-  after a cloning the project.
-
-There are a couple of mild caveats to be aware of:
-
-* Be sure to always run `git submodule update` after pulling, as merge/rebase
-  does not automatically update the checked out commit in submodules if it has
-  been changed.
-* The initial clone will be a bit slower, due to it having to pull down a
-  separate copy of ZF2 from what you already have.
+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
new file mode 100644 (file)
index 0000000..5dee8be
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,14 @@
+{
+    "name": "zendframework/skeleton-application",
+    "description": "Skeleton Application for ZF2",
+    "license": "BSD-3-Clause",
+    "keywords": [
+        "framework",
+        "zf2"
+    ],
+    "homepage": "http://framework.zend.com/",
+    "require": {
+        "php": ">=5.3.3",
+        "zendframework/zendframework": "dev-master"
+    }
+}

diff --git a/composer.phar b/composer.phar
new file mode 100755 (executable)
index 0000000..52c7a1a
Binary files /dev/null and b/composer.phar differ

diff --git a/public/index.php b/public/index.php
index edd629b..1738321 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -1,6 +1,6 @@
 <?php
 chdir(dirname(__DIR__));
-require_once (getenv('ZF2_PATH') ?: 'vendor/ZendFramework/library') . '/Zend/Loader/AutoloaderFactory.php';
+require_once('vendor/autoload.php');
 Zend\Loader\AutoloaderFactory::factory();
 
 $appConfig = include 'config/application.config.php';

diff --git a/vendor/ZendFramework b/vendor/ZendFramework
deleted file mode 160000 (submodule)
index 448f2bf..0000000
--- a/vendor/ZendFramework
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 448f2bfaad4bfde6200401efda29250a5d6a6af6