Merge branch 'master' of https://github.com/unicodeveloper/laravel-hackathon-starter into docs

Author: unicodeveloper

app/Http/Controllers/LastFmController.php

@@ -7,7 +7,7 @@
 use Buzz\Browser;
 use App\Http\Requests;
 use App\Http\Controllers\Controller;
-use MetalMatze\LastFm\LastFm;
+use Dandelionmood\LastFm\LastFm;
 
 class LastFmController extends Controller
 {
@@ -22,12 +22,11 @@ class LastFmController extends Controller
      */
     public function __construct()
     {
-         $this->lastfm = new LastFm(new Browser);
-         $this->lastfm->setApiKey(env('LASTFM_API_KEY'));
+        $this->lastfm = new LastFm(env('LASTFM_API_KEY'), env('LASTFM_API_SECRET'));
     }
 
     /**
-     * Return all tweets to the Twitter API dashboard
+     * Return all tweets to the LastFM API dashboard
      * @return mixed
      */
     public function getPage()
@@ -49,7 +48,7 @@ public function getPage()
      */
     private function getArtistInfo()
     {
-        $result = json_decode($this->lastfm->artist_getInfo(['artist' => 'The Pierces']), true);
+        $result = (array)$this->lastfm->artist_getInfo(['artist' => 'The Pierces']);
 
         return $result['artist'];
     }
@@ -60,9 +59,9 @@ private function getArtistInfo()
      */
     private function getTopAlbums()
     {
-        $result = json_decode($this->lastfm->artist_getTopAlbums(['artist' => 'The Pierces']), true);
+        $result = (array)$this->lastfm->artist_getTopAlbums(['artist' => 'The Pierces']);
 
-        return $result['topalbums']['album'];
+        return $result['topalbums']->album;
     }
 
     /**
@@ -71,8 +70,8 @@ private function getTopAlbums()
      */
     private function getTopTracks()
     {
-        $result = json_decode($this->lastfm->artist_getTopTracks(['artist' => 'The Pierces']), true);
+        $result = (array)$this->lastfm->artist_getTopTracks(['artist' => 'The Pierces']);
 
-        return $result['toptracks']['track'];
+        return $result['toptracks']->track;
     }
 }

composer.json

@@ -13,7 +13,6 @@
         "jrm2k6/cloudder": "^0.2.2",
         "graham-campbell/github": "^4.2",
         "thujohn/twitter": "^2.1",
-        "metalmatze/lastfm-api-wrapper": "dev-master",
         "aloha/twilio": "^2.0",
         "fabpot/goutte": "^3.1",
         "mjerwin/clockwork-sms": "^0.9.1",
@@ -23,7 +22,8 @@
         "linkedinapi/linkedin": "^1.1",
         "socialiteproviders/foursquare": "^1.1",
         "hownowstephen/php-foursquare": "1.2.*",
-        "jaapz/tumblr": "dev-master"
+        "jaapz/tumblr": "dev-master",
+        "dandelionmood/lastfm": "^0.6.0"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",

composer.lock

@@ -393,7 +393,7 @@ Recommended Laravel Libraries
 FAQ
 ---
 
-### Why do I get `Token Mismatch Exceptiom` when submitting a form?
+### Why do I get `Token Mismatch Exception` when submitting a form?
 You need to add the following hidden input element to your form. This has been
 added in the existing codebase as part of the CSRF protection.
 
@@ -637,4 +637,4 @@ Prosper Otemuyiwa.
 
 ## License
 
-The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
+The MIT License (MIT). Please see [License File](LICENSE.md) for more information.

readme.md

@@ -19,35 +19,35 @@
 
         <br>
 
-        <h3> {{ $details['name'] }}</h3>
+        <h3> {{ $details->name }}</h3>
 
         <img src="http://img2-ak.lst.fm/i/u/arQ/548cf8296e0e446bc4193a5b5a94bfb7.png" class="thumbnail">
 
         <h3> Tags </h3>
 
-        @foreach ($details['tags']['tag'] as $tag)
-            <span class="label label-primary"><i class="fa fa-tag"></i> {{ $tag['name']}}</span>
+        @foreach ($details->tags->tag as $tag)
+            <span class="label label-primary"><i class="fa fa-tag"></i> {{ $tag->name }}</span>
         @endforeach
 
         <h3> Biography </h3>
-        <p>{{ $details['bio']['summary'] }}</p>
+        <p>{{ $details->bio->summary }}</p>
 
         <h3> Top Albums </h3>
         @foreach ($albums as $album)
-            <img src="{{ $album['image'][3]['#text'] }}" width="150" height="150">
+            <img src="{{ $album->image[3]->{'#text'} }}" width="150" height="150">
         @endforeach
 
         <h3> Top Tracks </h3>
         <ol>
             @foreach ($tracks as $track)
-                <li><a href="{{ $track['url'] }}">{{ $track['name'] }}</a></li>
+                <li><a href="{{ $track->url }}">{{ $track->name }}</a></li>
             @endforeach
         </ol>
 
         <h3> Similar Artists </h3>
         <ul class="list-unstyled list-inline">
-            @foreach ($details['similar']['artist'] as $artist)
-                <li><a href="{{ $artist['url'] }}">{{ $artist['name'] }}</a></li>
+            @foreach ($details->similar->artist as $artist)
+                <li><a href="{{ $artist->url }}">{{ $artist->name }}</a></li>
             @endforeach
         </ul>