Merging develop to master in preparation for 1.5.0 release.

Author: michalbundyra

.coveralls.yml

@@ -0,0 +1,2 @@
+coverage_clover: clover.xml
+json_path: coveralls-upload.json

.gitattributes

@@ -0,0 +1,7 @@
+/test export-ignore
+.coveralls.yml
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+phpcs.xml export-ignore
+phpunit.xml.dist export-ignore

.gitignore

@@ -1,11 +1,4 @@
-vendor
-composer.lock
-composer.phar
-test/data
-test/code-coverage
-test/assets/module/*
-!test/assets/module/*Original
-test/build
-.buildpath
-.project
-.settings/
+vendor/
+phpunit.xml
+clover.xml
+coveralls-upload.json

.travis.yml

@@ -5,36 +5,88 @@ language: php
 services:
   - mongodb
 
+cache:
+  directories:
+    - $HOME/.composer/cache
+    - vendor
+
+env:
+  global:
+    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - ADAPTER_DEPS="alcaeus/mongo-php-adapter"
+    - COVERAGE_DEPS="satooshi/php-coveralls"
+    - MONGO_DRIVER=mongo
+
 matrix:
-  fast_finish: true
   include:
-    - php: 5.5
+    - php: 5.6
+      env:
+        - DEPS=lowest
+    - php: 5.6
       env:
-        EXECUTE_CS_CHECK=true
-        INSTALL_PECL_MONGO=true
+        - DEPS=locked
+        - TEST_COVERAGE=true
     - php: 5.6
       env:
-        EXECUTE_COVERAGE=true
-        INSTALL_PECL_MONGO=true
+        - DEPS=latest
     - php: 7
+      env:
+        - DEPS=lowest
+        - MONGO_DRIVER=mongodb
+    - php: 7
+      env:
+        - DEPS=locked
+        - CS_CHECK=true
+        - MONGO_DRIVER=mongodb
+    - php: 7
+      env:
+        - DEPS=latest
+        - MONGO_DRIVER=mongodb
+    - php: 7.1
+      env:
+        - DEPS=lowest
+        - MONGO_DRIVER=mongodb
+    - php: 7.1
+      env:
+        - DEPS=locked
+        - MONGO_DRIVER=mongodb
+    - php: 7.1
+      env:
+        - DEPS=latest
+        - MONGO_DRIVER=mongodb
+    - php: hhvm
+      env:
+        - DEPS=lowest
     - php: hhvm
+      env:
+        - DEPS=locked
+    - php: hhvm
+      env:
+        - DEPS=latest
   allow_failures:
-    - php: 7
+    - php: 7.1
     - php: hhvm
 
 notifications:
   irc: "irc.freenode.org#apigility-dev"
   email: false
 
 before_install:
-  - if [[ $EXECUTE_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - if [[ $INSTALL_PECL_MONGO == 'true' ]]; then pecl install -f mongo-1.4.1 || return 0 ; fi
-  - composer self-update
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
+  - travis_retry composer self-update
 
 install:
-  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source --dev
+  - yes '' | pecl -q install -f $MONGO_DRIVER
+  - if [[ $MONGO_DRIVER == 'mongodb' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $ADAPTER_DEPS ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
+  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - travis_retry composer install $COMPOSER_ARGS
+  - composer show
 
 script:
-  - mkdir -p build/logs
-  - ./vendor/bin/phpunit
-  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs --standard=PSR2 --ignore=test/Bootstrap.php src test; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
+
+after_script:
+  - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi

CHANGELOG.md

@@ -0,0 +1,33 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.5.0 - TBD
+
+Added
+-----
+
+- [#32](https://github.com/zfcampus/zf-doctrine-querybuilder/pull/32) adds
+  support for PHP 7.
+- [#32](https://github.com/zfcampus/zf-doctrine-querybuilder/pull/32) adds
+  support for v3 releases of Zend Framework components, while retaining
+  compatibility for v2 releases.
+- [#32](https://github.com/zfcampus/zf-doctrine-querybuilder/pull/32) exposes
+  the module to [zendframework/zend-component-installer](https://github.com/zendframework/zend-component-installer).
+
+Deprecated
+----------
+
+- Nothing.
+
+Removed
+-------
+
+- [#32](https://github.com/zfcampus/zf-doctrine-querybuilder/pull/32) removes
+  support for PHP 5.4 and PHP 5.5.
+
+Fixed
+-----
+
+- [#32](https://github.com/zfcampus/zf-doctrine-querybuilder/pull/32) adds a
+  ton of tests to the module.

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

@@ -0,0 +1,80 @@
+# CONTRIBUTING
+
+Apigility and related modules (of which this is one) are open source and licensed
+as [BSD-3-Clause](http://opensource.org/licenses/BSD-3-Clause). Contributions
+are welcome in the form of issue reports and pull requests.
+
+All pull requests should include unit tests when applicable, and should follow
+our coding standards (more on these below); failure to do so may result in
+rejection of the pull request. If you need help writing tests, please ask on the
+developer mailing list and/or in IRC.
+
+## RESOURCES
+
+If you wish to contribute to Apigility modules, please be sure to
+read/subscribe to the following resources:
+
+ -  [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
+ -  [ZF Git Guide](https://github.com/zendframework/zf2/blob/master/README-GIT.md)
+ -  [Apigility developer mailing list](http://bit.ly/apigility-dev)
+ -  Apigility developer IRC channel: #apigility-dev on Freenode.net
+
+If you are working on new features, refactoring an existing module, or proposing
+a new module, please send an email to the developer mailing list.
+
+## REPORTING POTENTIAL SECURITY ISSUES
+
+If you have encountered a potential security vulnerability in any Apigility
+module, please report it to us at [[email protected]](mailto:[email protected]).
+We will work with you to verify the vulnerability and patch it.
+
+When reporting issues, please provide the following information:
+
+- Module(s) affected
+- A description indicating how to reproduce the issue
+- A summary of the security vulnerability and impact
+
+We request that you contact us via the email address above and give the project
+contributors a chance to resolve the vulnerability and issue a new release prior
+to any public exposure; this helps protect Apigility users, and provides them
+with a chance to upgrade and/or update in order to protect their applications.
+
+For sensitive email communications, please use 
+[our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
+
+## RUNNING TESTS
+
+First, use [Composer](https://getcomposer.org) to install all dependencies:
+
+```console
+$ composer install
+```
+
+To run tests:
+
+```console
+$ composer test
+```
+
+## CODING STANDARDS
+
+While Apigility uses Zend Framework 2 coding standards, in practice, we check
+standards against PSR-1/2. To check for CS issues:
+
+```console
+$ composer cs-check
+```
+
+This will report CS issues. You can also attempt to fix many reported errors
+automatically:
+
+```console
+$ composer cs-fix
+```
+
+If you use `cs-fix` to fix issues, make certain you add and commit any files
+changed!
+
+## Conduct
+
+Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project.

LICENSE.md

@@ -0,0 +1,28 @@
+Copyright (c) 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 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.
+
+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
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.