Merge branch 'promote/develop'

Promote develop to master in preparation for 1.1.

README.md

@@ -3,7 +3,7 @@ Apigility Skeleton Application
 
 Requirements
 ------------
-  
+
 Please see the [composer.json](composer.json) file.
 
 Installation
@@ -26,7 +26,7 @@ tar xzf zf-apigility-skeleton-0.9.1.tgz
 ### Via Composer (create-project)
 
 You can use the `create-project` command from [Composer](http://getcomposer.org/)
-to create the project in one go:
+to create the project in one go (you need to install [composer.phar](https://getcomposer.org/doc/00-intro.md#downloading-the-composer-executable)):
 
 ```bash
 curl -s https://getcomposer.org/installer | php --

composer.json

@@ -21,22 +21,27 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev",
-            "dev-develop": "1.1-dev"
+            "dev-master": "1.1-dev",
+            "dev-develop": "1.2-dev"
         }
     },
     "require": {
         "php": ">=5.3.23",
-        "zendframework/zendframework": ">=2.3.2,<3.0.0",
+        "zendframework/zendframework": "~2.4",
         "zfcampus/zf-apigility": "~1.0",
-        "zfcampus/zf-apigility-documentation": "~1.0",
-        "zfcampus/zf-development-mode": "~2.0"
+        "zfcampus/zf-apigility-documentation": "~1.0"
     },
     "require-dev": {
         "zendframework/zftool": "dev-master",
         "zendframework/zend-developer-tools": "dev-master",
-        "zfcampus/zf-apigility-admin": "~1.0",
-        "zfcampus/zf-apigility-welcome": "~1.0",
-        "zfcampus/zf-deploy": "~1.0"
+        "zfcampus/zf-apigility-admin": "~1.1",
+        "zfcampus/zf-apigility-admin-ui": "~1.1",
+        "zfcampus/zf-deploy": "~1.0",
+        "zfcampus/zf-development-mode": "~2.0"
+    },
+    "suggest": {
+        "zfcampus/zf-apigility-doctrine": "zfcampus/zf-apigility-doctrine ~1.0 to create Doctrine-Connected REST services",
+        "zfcampus/zf-http-cache": "zfcampus/zf-http-cache ~1.0 to add HTTP caching to your API",
+        "zfr/zfr-cors": "zfr/zfr-cors ~1.2 to add CORS support to your API"
     }
 }

config/development.config.php.dist

@@ -9,7 +9,6 @@ return array(
     'modules' => array(
         'ZFTool',
         'ZF\Apigility\Admin',
-        'ZF\Apigility\Welcome',
     ),
     // development time configuration globbing
     'module_listener_options' => array(

module/Application/config/module.config.php

@@ -8,7 +8,7 @@
     'router' => array(
         'routes' => array(
             'home' => array(
-                'type' => 'Zend\Mvc\Router\Http\Literal',
+                'type' => 'Literal',
                 'options' => array(
                     'route'    => '/',
                     'defaults' => array(
@@ -17,36 +17,6 @@
                     ),
                 ),
             ),
-            // The following is a route to simplify getting started creating
-            // new controllers and actions without needing to create a new
-            // module. Simply drop new controllers in, and you can access them
-            // using the path /application/:controller/:action
-            'application' => array(
-                'type'    => 'Literal',
-                'options' => array(
-                    'route'    => '/application',
-                    'defaults' => array(
-                        '__NAMESPACE__' => 'Application\Controller',
-                        'controller'    => 'Index',
-                        'action'        => 'index',
-                    ),
-                ),
-                'may_terminate' => true,
-                'child_routes' => array(
-                    'default' => array(
-                        'type'    => 'Segment',
-                        'options' => array(
-                            'route'    => '/[:controller[/:action]]',
-                            'constraints' => array(
-                                'controller' => '[a-zA-Z][a-zA-Z0-9_-]*',
-                                'action'     => '[a-zA-Z][a-zA-Z0-9_-]*',
-                            ),
-                            'defaults' => array(
-                            ),
-                        ),
-                    ),
-                ),
-            ),
         ),
     ),
     'service_manager' => array(
@@ -55,19 +25,6 @@
             'Zend\Db\Adapter\AdapterAbstractServiceFactory',
             'Zend\Log\LoggerAbstractServiceFactory',
         ),
-        'aliases' => array(
-            'translator' => 'MvcTranslator',
-        ),
-    ),
-    'translator' => array(
-        'locale' => 'en_US',
-        'translation_file_patterns' => array(
-            array(
-                'type'     => 'gettext',
-                'base_dir' => __DIR__ . '/../language',
-                'pattern'  => '%s.mo',
-            ),
-        ),
     ),
     'controllers' => array(
         'invokables' => array(