Merge pull request #108 from WordPoints/develop

2.3.1
WordPoints · Dec 19, 2015 · 069aff2 · 069aff2
2 parents 6b50cc8 + 59ec8ef
commit 069aff2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@
 language: php
 
 php:
-  - nightly
+  - 7.0
 
 # Use the new infrustructure.
 sudo: false
@@ -20,7 +20,7 @@ script:
   - phpenv global 5.4 && find . -name '*.php' -exec php -lf {} \;
   - phpenv global 5.5 && find . -name '*.php' -exec php -lf {} \;
   - phpenv global 5.6 && find . -name '*.php' -exec php -lf {} \;
-  - phpenv global nightly && find . -name '*.php' -exec php -lf {} \;
+  - phpenv global 7.0 && find . -name '*.php' -exec php -lf {} \;
   - phpenv global hhvm && find . -name '*.php' -exec php -lf {} \;
 
 # EOF
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 And as you can see, we [keep a CHANGELOG](http://keepachangelog.com/).
 
+## [2.3.1] - 2015-12-19
+### Added
+- WordPress 4.4 to Travis CI matrixes.
+- PHP 7.0 to Travis CI matrixes.
+- Support for installing modules that use the installables API.
+
 ## [2.3.0] - 2015-11-09
 ### Added
 - `WordPoints.PHPUnit.MissingCovers` sniff to flag tests missing `@covers`
@@ -169,6 +175,7 @@ automatically installed if there is a config file for it. #23
 - Initial code.
 
 [Unreleased]: https://github.com/WordPoints/dev-lib/compare/master...develop
+[2.3.1]: https://github.com/WordPoints/dev-lib/compare/2.3.0...2.3.1
 [2.3.0]: https://github.com/WordPoints/dev-lib/compare/2.2.0...2.3.0
 [2.2.0]: https://github.com/WordPoints/dev-lib/compare/2.1.1...2.2.0
 [2.1.1]: https://github.com/WordPoints/dev-lib/compare/2.1.0...2.1.1

diff --git a/phpunit/functions.php b/phpunit/functions.php
@@ -74,6 +74,12 @@ function wordpoints_dev_lib_load_module( $module_file ) {
 	 * @since 1.1.0
 	 */
 	do_action( "wordpoints_module_activate-{$module}", $network_wide );
+
+	WordPoints_Installables::install(
+		'module'
+		, WordPoints_Modules::get_slug( $module )
+		, $network_wide
+	);
 }
 
 /**

diff --git a/travis/module.yml b/travis/module.yml
@@ -9,11 +9,14 @@ php:
     - 5.4
     - 5.5
     - 5.6
+    - 7.0
 
 env:
     - TRAVISCI_RUN=codesniff
     - TRAVISCI_RUN=phpunit WP_VERSION=master WORDPOINTS_VERSION=master
     - TRAVISCI_RUN=phpunit WP_VERSION=master WORDPOINTS_VERSION=stable
+    - TRAVISCI_RUN=phpunit WP_VERSION=4.4 WORDPOINTS_VERSION=master
+    - TRAVISCI_RUN=phpunit WP_VERSION=4.4 WORDPOINTS_VERSION=stable
     - TRAVISCI_RUN=phpunit WP_VERSION=4.3 WORDPOINTS_VERSION=master
     - TRAVISCI_RUN=phpunit WP_VERSION=4.3 WORDPOINTS_VERSION=stable
     - TRAVISCI_RUN=phpunit WP_VERSION=4.2 WORDPOINTS_VERSION=master
@@ -39,6 +42,8 @@ matrix:
       env: TRAVISCI_RUN=codesniff
     - php: 5.6
       env: TRAVISCI_RUN=codesniff
+    - php: 7.0
+      env: TRAVISCI_RUN=codesniff
   allow_failures:
     - php: hhvm
     - php: nightly

diff --git a/travis/wordpoints.yml b/travis/wordpoints.yml
@@ -9,10 +9,12 @@ php:
     - 5.4
     - 5.5
     - 5.6
+    - 7.0
 
 env:
     - TRAVISCI_RUN=codesniff
     - TRAVISCI_RUN=phpunit WP_VERSION=master
+    - TRAVISCI_RUN=phpunit WP_VERSION=4.4
     - TRAVISCI_RUN=phpunit WP_VERSION=4.3
     - TRAVISCI_RUN=phpunit WP_VERSION=4.2
 
@@ -36,6 +38,8 @@ matrix:
       env: TRAVISCI_RUN=codesniff
     - php: 5.6
       env: TRAVISCI_RUN=codesniff
+    - php: 7.0
+      env: TRAVISCI_RUN=codesniff
   allow_failures:
     - php: hhvm
     - php: nightly