From 5d1c77cb166c7eb1a2e1168ad69001756c71a361 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 2 Apr 2018 15:40:43 +0200 Subject: [PATCH] New version: 4.7.2.1 --- changelog.md | 5 +++++ config/firefly.php | 2 +- .../Controllers/TransactionControllerTest.php | 12 ++++++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/changelog.md b/changelog.md index 8f78da8813..0f4a629f43 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.7.2.1] - 2018-04-02 +### Fixed +- Null pointer exception in transaction overview. +- Installations running in subdirs were incapable of creating OAuth tokens. +- OAuth keys were not created in all cases. ## [4.7.2] - 2018-04-01 ### Added diff --git a/config/firefly.php b/config/firefly.php index 64e6277cf0..70a3b9047a 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -86,7 +86,7 @@ return [ 'is_demo_site' => false, ], 'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true, - 'version' => '4.7.2', + 'version' => '4.7.2.1', 'api_version' => '0.1', 'db_version' => 2, 'maxUploadSize' => 15242880, diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index 1e532ad5e1..2e2200a1b1 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -68,7 +68,8 @@ class TransactionControllerTest extends TestCase $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); - $repository->shouldReceive('first')->times(2)->andReturn($transfer); + $repository->shouldReceive('first')->once()->andReturn($transfer); + $repository->shouldReceive('firstNull')->once()->andReturn($transfer); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); @@ -144,7 +145,8 @@ class TransactionControllerTest extends TestCase $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); - $repository->shouldReceive('first')->twice()->andReturn($transfer); + $repository->shouldReceive('firstNull')->once()->andReturn($transfer); + $repository->shouldReceive('first')->once()->andReturn($transfer); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); @@ -186,7 +188,8 @@ class TransactionControllerTest extends TestCase $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); - $repository->shouldReceive('first')->twice()->andReturn($transfer); + $repository->shouldReceive('first')->once()->andReturn($transfer); + $repository->shouldReceive('firstNull')->once()->andReturn($transfer); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); @@ -228,7 +231,8 @@ class TransactionControllerTest extends TestCase $repository = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); - $repository->shouldReceive('first')->twice()->andReturn($transfer); + $repository->shouldReceive('firstNull')->once()->andReturn($transfer); + $repository->shouldReceive('first')->once()->andReturn($transfer); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf();