Merge branch 'release/4.7.14'

.sandstorm/changelog.md

@@ -1,3 +1,6 @@
+# 4.7.14 (API 0.9.2)
+- 4.7.14 was released to fix an issue with the Composer installation script.
+
 # 4.7.13 (API 0.9.2)
 - 4.7.13 was released to fix an issue that affected the Softaculous build.
 - A routine has been added that warns about transactions with a 0.00 amount.

.sandstorm/sandstorm-pkgdef.capnp

@@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (
 
   manifest = (
     appTitle = (defaultText = "Firefly III"),
-    appVersion = 23,
+    appVersion = 24,
-    appMarketingVersion = (defaultText = "4.7.13"),
+    appMarketingVersion = (defaultText = "4.7.14"),
 
     actions = [
       # Define your "new document" handlers here.

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: bash
 env:
-  - VERSION=4.7.13
+  - VERSION=4.7.14
 
 dist: xenial
 

changelog.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.7.14 (API 0.9.2)] - 2019-02-24
+
+4.7.14 was released to fix an issue with the Composer installation script.
+
 ## [4.7.13 (API 0.9.2)] - 2019-02-23
 
 4.7.13 was released to fix an issue that affected the Softaculous build.

composer.json

@@ -123,7 +123,7 @@
   },
   "scripts": {
     "pre-install-cmd": [
-      "@php -r \"if (!(getenv('DYNO'))===false){file_exists('.env') || copy('.deploy/heroku/.env.heroku', '.env');copy('.deploy/heroku/.locales', '.locales')}\""
+      "@php -r \"if (!(getenv('DYNO'))===false){file_exists('.env') || copy('.deploy/heroku/.env.heroku', '.env');copy('.deploy/heroku/.locales', '.locales');}\""
     ],
     "post-root-package-install": [
       "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""

composer.lock

@@ -5564,21 +5564,21 @@
         },
         {
             "name": "johnkary/phpunit-speedtrap",
-            "version": "v3.0.0",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/johnkary/phpunit-speedtrap.git",
-                "reference": "5f1ede99bd53fd0e5ff72669877420e801256d90"
+                "reference": "dac11b8640d4be7a70f336616947fa84f169835a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/johnkary/phpunit-speedtrap/zipball/5f1ede99bd53fd0e5ff72669877420e801256d90",
+                "url": "https://api.github.com/repos/johnkary/phpunit-speedtrap/zipball/dac11b8640d4be7a70f336616947fa84f169835a",
-                "reference": "5f1ede99bd53fd0e5ff72669877420e801256d90",
+                "reference": "dac11b8640d4be7a70f336616947fa84f169835a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1",
-                "phpunit/phpunit": "^7.0"
+                "phpunit/phpunit": "^7.0 || ^8.0"
             },
             "type": "library",
             "extra": {
@@ -5608,7 +5608,7 @@
                 "profile",
                 "slow"
             ],
-            "time": "2018-02-24T18:55:28+00:00"
+            "time": "2019-02-24T02:40:12+00:00"
         },
         {
             "name": "justinrainbow/json-schema",

config/firefly.php

@@ -93,7 +93,7 @@ return [
         'is_demo_site'     => false,
     ],
     'encryption'                   => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true,
-    'version'                      => '4.7.13',
+    'version'                      => '4.7.14',
     'api_version'                  => '0.9.2',
     'db_version'                   => 9,
     'maxUploadSize'                => 15242880,