Merge branch 'feature/zf-v3-readiness' into develop

Close #130

.gitignore

@@ -1,17 +1,5 @@
-nbproject
-._*
-.~lock.*
-.buildpath
-.DS_Store
-.idea
-.project
-.settings
+.vagrant/
 vendor/
-public/vendor/
 config/development.config.php
-config/autoload/local.php
-config/autoload/*.local.php
-!public/vendor/README.md
 data/cache/*
 !data/cache/.gitkeep
-.vagrant

CONDUCT.md

@@ -0,0 +1,43 @@
+# Contributor Code of Conduct
+
+The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
+as its guidelines for contributor interactions.
+
+## The Code Manifesto
+
+We want to work in an ecosystem that empowers developers to reach their
+potential — one that encourages growth and effective collaboration. A space that
+is safe for all.
+
+A space such as this benefits everyone that participates in it. It encourages
+new developers to enter our field. It is through discussion and collaboration
+that we grow, and through growth that we improve.
+
+In the effort to create such a place, we hold to these values:
+
+1. **Discrimination limits us.** This includes discrimination on the basis of
+   race, gender, sexual orientation, gender identity, age, nationality, technology
+   and any other arbitrary exclusion of a group of people.
+2. **Boundaries honor us.** Your comfort levels are not everyone’s comfort
+   levels. Remember that, and if brought to your attention, heed it.
+3. **We are our biggest assets.** None of us were born masters of our trade.
+   Each of us has been helped along the way. Return that favor, when and where
+   you can.
+4. **We are resources for the future.** As an extension of #3, share what you
+   know. Make yourself a resource to help those that come after you.
+5. **Respect defines us.** Treat others as you wish to be treated. Make your
+   discussions, criticisms and debates from a position of respectfulness. Ask
+   yourself, is it true? Is it necessary? Is it constructive? Anything less is
+   unacceptable.
+6. **Reactions require grace.** Angry responses are valid, but abusive language
+   and vindictive actions are toxic. When something happens that offends you,
+   handle it assertively, but be respectful. Escalate reasonably, and try to
+   allow the offender an opportunity to explain themselves, and possibly correct
+   the issue.
+7. **Opinions are just that: opinions.** Each and every one of us, due to our
+   background and upbringing, have varying opinions. The fact of the matter, is
+   that is perfectly acceptable. Remember this: if you respect your own
+   opinions, you should respect the opinions of others.
+8. **To err is human.** You might not intend it, but mistakes do happen and
+   contribute to build experience. Tolerate honest mistakes, and don't hesitate
+   to apologize if you make one yourself.

CONTRIBUTING.md

@@ -50,25 +50,31 @@ First, use [Composer](https://getcomposer.org) to install all dependencies:
 $ composer install
 ```
 
-To run tests, use the PHPUnit executable installed by Composer:
+To run tests:
 
 ```console
-$ ./vendor/bin/phpunit
+$ composer test
 ```
 
 ## CODING STANDARDS
 
-While Apigility uses Zend Framework 2 coding standards, in practice, we check
-standards using [php-cs-fixer](https://github.com/fabpot/PHP-CS-Fixer) (which is
-installed via Composer with other dependencies). To check for CS issues:
+While Apigility uses Zend Framework 2 coding standards, in practice, we verify
+against [PSR-2](http://www.php-fig.org/psr/psr-2/). To check for CS issues:
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix . --dry-run
+$ composer cs-check
 ```
 
-This will report CS issues. Alternately, you can have the tool fix them for you
-by omitting the `--dry-run` switch:
+This will report CS issues. Alternately, you can have most errors automatically
+fixed as well:
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix .
+$ composer cs-fix
 ```
+
+After running `composer cs-fix`, be sure to add and commit any files that were
+updated, after first verifying that the changes do not break tests.
+
+## Conduct
+
+Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project.

Dockerfile

@@ -1,22 +1,36 @@
-FROM php:5.6-apache
+#
+# Use this dockerfile to run apigility.
+#
+# Start the server using docker-compose:
+#
+#   docker-compose build
+#   docker-compose up
+#
+# You can install dependencies via the container:
+#
+#   docker-compose run apigility composer install
+#
+# You can manipulate dev mode from the container:
+#
+#   docker-compose run apigility composer development-enable
+#   docker-compose run apigility composer development-disable
+#   docker-compose run apigility composer development-status
+#
+# OR use plain old docker 
+#
+#   docker build -f Dockerfile-dev -t apigility .
+#   docker run -it -p "8080:80" -v $PWD:/var/www apigility
+#
+FROM php:7.0-apache
 
 RUN apt-get update \
- && apt-get install git zlib1g-dev nano -y --no-install-recommends \
- && rm -r /var/lib/apt/lists/* \
+ && apt-get install -y git zlib1g-dev \
  && docker-php-ext-install zip \
- && curl -sS https://getcomposer.org/installer \
-  | php -- --install-dir=/usr/local/bin --filename=composer \
  && a2enmod rewrite \
  && sed -i 's!/var/www/html!/var/www/public!g' /etc/apache2/apache2.conf \
- && echo "AllowEncodedSlashes On" >> /etc/apache2/apache2.conf \
  && mv /var/www/html /var/www/public \
- && cp /usr/src/php/php.ini-production /usr/local/etc/php/php.ini \
- && printf '[Date]\ndate.timezone=UTC' > /usr/local/etc/php/conf.d/timezone.ini
+ && curl -sS https://getcomposer.org/installer \
+  | php -- --install-dir=/usr/local/bin --filename=composer \
+ && echo "AllowEncodedSlashes On" >> /etc/apache2/apache2.conf
 
 WORKDIR /var/www
-
-COPY . .
-
-RUN chown www-data.www-data /var/www/data/cache \
- && composer install
-

LICENSE.txt → LICENSE.md

@@ -1,19 +1,19 @@
-Copyright (c) 2013, Zend Technologies USA, Inc.
+Copyright (c) 2013 - 2016, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
 
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-    * Neither the name of Zend Technologies USA, Inc. nor the names of its
-      contributors may be used to endorse or promote products derived from this
-      software without specific prior written permission.
+- Neither the name of Zend Technologies USA, Inc. nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED