Merge pull request #29 from skipperbent/v4-development

Version 4.0.0

.codeclimate.yml

@@ -0,0 +1,22 @@
+engines:
+  phpmd:
+    enabled: true
+    checks:
+      Design/TooManyPublicMethods:
+        enabled: true
+      Naming/ShortVariable:
+        enabled: true
+      CleanCode/StaticAccess:
+        enabled: true
+      Controversial/CamelCaseMethodName:
+        enabled: true
+  fixme:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - php:
+ratings:
+  paths:
+  - src/**

.gitignore

@@ -1,7 +1,86 @@
-vendor
 composer.phar
-composer.lock
 .DS_Store
-.idea
-test.php
-*~
+*~
+/devel/
+/coverage.clover
+.idea/
+
+### Composer template
+/vendor/
+
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
+### Windows template
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties

.scrutinizer.yml

@@ -0,0 +1,13 @@
+build:
+    tests:
+        override:
+            -
+                command: './vendor/bin/phpunit --coverage-clover=coverage.clover'
+                coverage:
+                    file: 'coverage.clover'
+                    format: 'clover'
+checks:
+    php:
+        code_rating: true
+        duplication: true
+

.travis.yml

@@ -3,13 +3,11 @@ sudo: false
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 7.0
 
 before_script:
   - curl -sS http://getcomposer.org/installer | php
   - php composer.phar install --prefer-source --no-interaction
 
 script:
-  - ./vendor/bin/phpunit
+  - ./vendor/bin/phpunit

README.md

@@ -13,7 +13,7 @@ This library is stable, maintained and are used by many sites, including:
 - [BookAndBegin.com](https://bookandbegin.com)
 
 **Requirements:**
-- PHP version 5.5 or higher is required.
+- PHP version 7.0 or higher is required.
 
 #### Feedback and development
 
@@ -303,6 +303,21 @@ $result = $queryBuilder
 
 ### Select
 
+#### Select from query
+
+You can easily select items from another query by using
+
+```php
+$subQuery = $queryBuilder->table('person');
+$builder = $queryBuilder->table($queryBuilder->subQuery($subQuery))->where('id', '=', 2);
+```
+
+Will produce the following output:
+
+```sql
+SELECT * FROM (SELECT * FROM `person`) WHERE `id` = 2
+```
+
 #### Select single field
 
 ```php

composer.json

@@ -34,12 +34,12 @@
     }
   ],
   "require": {
-    "php": ">=5.5.0",
+    "php": ">=7.0",
     "usmanhalalit/viocon": "1.0.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8",
-    "mockery/mockery": "0.9.4"
+    "phpunit/phpunit": "^6.0",
+    "mockery/mockery": "^1"
   },
   "autoload": {
     "psr-4": {