From ad31cc1c1f9890796be802534fb87da2bba817b2 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 24 Feb 2019 07:27:24 +0100
Subject: [PATCH] Fixes #2119 and bump version.

---
 .sandstorm/changelog.md           |  3 +++
 .sandstorm/sandstorm-pkgdef.capnp |  4 ++--
 .travis.yml                       |  2 +-
 changelog.md                      |  4 ++++
 composer.json                     |  2 +-
 composer.lock                     | 12 ++++++------
 config/firefly.php                |  2 +-
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.sandstorm/changelog.md b/.sandstorm/changelog.md
index b93bb4c4f1..2740887540 100644
--- a/.sandstorm/changelog.md
+++ b/.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.
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
index 62b11d9c40..7b50c9fd7e 100644
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (
 
   manifest = (
     appTitle = (defaultText = "Firefly III"),
-    appVersion = 23,
-    appMarketingVersion = (defaultText = "4.7.13"),
+    appVersion = 24,
+    appMarketingVersion = (defaultText = "4.7.14"),
 
     actions = [
       # Define your "new document" handlers here.
diff --git a/.travis.yml b/.travis.yml
index b90ad5cf9c..047b402ec4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: required
 language: bash
 env:
-  - VERSION=4.7.13
+  - VERSION=4.7.14
 
 dist: xenial
 
diff --git a/changelog.md b/changelog.md
index d68aa3ff76..cb871f415c 100644
--- a/changelog.md
+++ b/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.
diff --git a/composer.json b/composer.json
index 28aaab3565..f031613a8c 100644
--- a/composer.json
+++ b/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');\""
diff --git a/composer.lock b/composer.lock
index c28ab90888..1dd343a205 100644
--- a/composer.lock
+++ b/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",
-                "reference": "5f1ede99bd53fd0e5ff72669877420e801256d90",
+                "url": "https://api.github.com/repos/johnkary/phpunit-speedtrap/zipball/dac11b8640d4be7a70f336616947fa84f169835a",
+                "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",
diff --git a/config/firefly.php b/config/firefly.php
index 00d4f39073..6b80c14d1a 100644
--- a/config/firefly.php
+++ b/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,