From 40e49ffc3700fd042f0f5c909f65a6c475fe1524 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 5 Jun 2015 16:49:16 +0200
Subject: [PATCH] Some bug fixes and cleanup.

---
 app/Http/Controllers/Chart/AccountController.php |  1 +
 app/Http/Controllers/Chart/BudgetController.php  | 14 +++++++++++---
 app/Repositories/Shared/ComponentRepository.php  | 11 +++++------
 app/Support/Navigation.php                       |  5 +++--
 composer.lock                                    | 14 +++++++-------
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index 9681fd7621..2c5d4f7a6e 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -63,6 +63,7 @@ class AccountController extends Controller
             }
         }
 
+        //
 
         $index = 1;
         /** @var Account $account */
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 46cba626e6..a10239f5cc 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -55,17 +55,25 @@ class BudgetController extends Controller
 
         while ($first < $last) {
             $end = Navigation::addPeriod($first, $range, 0);
+            $end->subDay();
+
+            // start date for chart.
+            $chartDate = clone $end;
+            $chartDate->startOfMonth();
 
             $spent = $repository->spentInPeriodCorrected($budget, $first, $end);
-            $chart->addRow($end, $spent);
-
+            $chart->addRow($chartDate, $spent);
 
             $first = Navigation::addPeriod($first, $range, 0);
+
+
         }
 
         $chart->generate();
 
         $data = $chart->getData();
+
+
         $cache->store($data);
 
         return Response::json($data);
@@ -242,7 +250,7 @@ class BudgetController extends Controller
             }
             $chart->addRowArray($row);
 
-            $start->addMonth();
+            $start->endOfMonth()->addDay();
         }
 
         $chart->generate();
diff --git a/app/Repositories/Shared/ComponentRepository.php b/app/Repositories/Shared/ComponentRepository.php
index d7b57bbfc5..e564b6d6ea 100644
--- a/app/Repositories/Shared/ComponentRepository.php
+++ b/app/Repositories/Shared/ComponentRepository.php
@@ -4,7 +4,6 @@ namespace FireflyIII\Repositories\Shared;
 
 use Carbon\Carbon;
 use Illuminate\Database\Query\JoinClause;
-use stdClass;
 
 /**
  * Class ComponentRepository
@@ -16,15 +15,15 @@ class ComponentRepository
 
 
     /**
-     * @param stdClass   $object
-     * @param Carbon   $start
-     * @param Carbon   $end
+     * @param        $object
+     * @param Carbon $start
+     * @param Carbon $end
      *
-     * @param bool     $shared
+     * @param bool   $shared
      *
      * @return string
      */
-    protected function spentInPeriod(stdClass $object, Carbon $start, Carbon $end, $shared = false)
+    protected function spentInPeriod($object, Carbon $start, Carbon $end, $shared = false)
     {
         if ($shared === true) {
             // shared is true.
diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php
index f2dd884673..b64fb9240e 100644
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -41,6 +41,7 @@ class Navigation
             '6M'        => 6,
             'half-year' => 6,
         ];
+        $specialMap  = ['1M', 'month', 'monthly'];
         if (!isset($functionMap[$repeatFreq])) {
             throw new FireflyException('Cannot do addPeriod for $repeat_freq "' . $repeatFreq . '"');
         }
@@ -118,7 +119,7 @@ class Navigation
             'year'      => 'endOfYear',
             'yearly'    => 'endOfYear',
         ];
-        $specials = ['mont', 'monthly'];
+        $specials    = ['mont', 'monthly'];
 
         $currentEnd = clone $theCurrentEnd;
 
@@ -270,7 +271,7 @@ class Navigation
             '3M' => 'lastOfQuarter',
             '1Y' => 'endOfYear',
         ];
-        $end = clone $start;
+        $end         = clone $start;
 
         if (isset($functionMap[$range])) {
             $function = $functionMap[$range];
diff --git a/composer.lock b/composer.lock
index e65ab9a13c..20b62cda5d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3647,16 +3647,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.6.10",
+            "version": "4.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "7b5fe98b28302a8b25693b2298bca74463336975"
+                "reference": "c2241b8d3381be3e4c6125ae347687d59f286784"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7b5fe98b28302a8b25693b2298bca74463336975",
-                "reference": "7b5fe98b28302a8b25693b2298bca74463336975",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c2241b8d3381be3e4c6125ae347687d59f286784",
+                "reference": "c2241b8d3381be3e4c6125ae347687d59f286784",
                 "shasum": ""
             },
             "require": {
@@ -3667,7 +3667,7 @@
                 "ext-spl": "*",
                 "php": ">=5.3.3",
                 "phpspec/prophecy": "~1.3,>=1.3.1",
-                "phpunit/php-code-coverage": "~2.0,>=2.0.11",
+                "phpunit/php-code-coverage": "~2.1",
                 "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
                 "phpunit/php-timer": "~1.0",
@@ -3689,7 +3689,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.6.x-dev"
+                    "dev-master": "4.7.x-dev"
                 }
             },
             "autoload": {
@@ -3715,7 +3715,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-06-03 05:03:30"
+            "time": "2015-06-05 04:14:02"
         },
         {
             "name": "phpunit/phpunit-mock-objects",