Merge pull request #11 from awjudd/development

Laravel 5 Support

README.md

@@ -1,7 +1,7 @@
-Laravel 4.2 - Feed Reader
+Laravel 5 - Feed Reader
 ===============
 
-A simple RSS feed reader for **Laravel 4.2**
+A simple RSS feed reader for **Laravel 5**
 
 ## Features
 
@@ -13,7 +13,7 @@ A simple RSS feed reader for **Laravel 4.2**
 In the `require` key of `composer.json` file add the following:
 
 ```
-"awjudd/feed-reader": "1.1.*"
+"awjudd/feed-reader": "1.2.*"
 ```
 
 Run the Composer update command
@@ -22,7 +22,7 @@ Run the Composer update command
 $ composer update
 ```
 
-In your `config/app.php` add `'Awjudd\Layoutview\LayoutviewServiceProvider'` to the end of the `$providers` array
+In your `config/app.php` add `'Awjudd\FeedReader\FeedReaderServiceProvider'` to the end of the `$providers` array
 
 ```php
 'providers' => array(

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "awjudd/feed-reader",
-    "description": "A simple RSS feed reader for Laravel 4.1",
+    "description": "A simple RSS feed reader for Laravel 5",
     "license": "MIT",
     "authors": [
         {
@@ -9,8 +9,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
-        "illuminate/support": "4.2.x",
+        "php": ">=5.4.0",
+        "illuminate/support": "~5",
         "simplepie/simplepie": "dev-master"
     },
     "autoload": {
@@ -19,4 +19,4 @@
         }
     },
     "minimum-stability": "dev"
-}
+}

src/Awjudd/FeedReader/FeedReader.php

@@ -1,4 +1,10 @@
 <?php namespace Awjudd\FeedReader;
+/**
+ * @Author: Andrew Judd
+ * @Date:   2015-03-22 22:16:19
+ * @Last Modified by:   Andrew Judd
+ * @Last Modified time: 2015-03-22 22:25:59
+ */
 
 use Config;
 use SimplePie;
@@ -97,6 +103,6 @@ private function setup_cache_directory($configuration)
      */
     private function read_config($configuration, $name, $default)
     {
-        return Config::get('feed-reader::profiles.' . $configuration . '.' . $name, $default);
+        return Config::get('feed-reader::config.profiles.' . $configuration . '.' . $name, $default);
     }
 }

src/Awjudd/FeedReader/FeedReaderServiceProvider.php

@@ -1,8 +1,15 @@
 <?php namespace Awjudd\FeedReader;
+/**
+ * @Author: Andrew Judd
+ * @Date:   2015-03-22 22:16:19
+ * @Last Modified by:   Andrew Judd
+ * @Last Modified time: 2015-03-22 22:22:37
+ */
 
 use Illuminate\Support\ServiceProvider;
 
-class FeedReaderServiceProvider extends ServiceProvider {
+class FeedReaderServiceProvider extends ServiceProvider
+{
 
 	/**
 	 * Indicates if loading of the provider is deferred.
@@ -18,7 +25,7 @@ class FeedReaderServiceProvider extends ServiceProvider {
      */
     public function boot()
     {
-        $this->package('awjudd/feed-reader');
+        $this->registerConfiguration();
     }
 
 	/**
@@ -53,4 +60,31 @@ public function provides()
 		return array('feed-reader');
 	}
 
+    /**
+     * Register configuration files, with L5 fallback
+     */
+    protected function registerConfiguration()
+    {
+        // Is it possible to register the config?
+        if (method_exists($this->app['config'], 'package'))
+        {
+            $this->app['config']->package('awjudd/feed-reader', __DIR__ . '/config');
+        }
+        else
+        {
+            // Derive the full path to the user's config
+            $userConfig = app()->configPath() . '/packages/awjudd/feed-reader/config.php';
+
+            // Check if the user-configuration exists
+            if(!file_exists($userConfig))
+            {
+                $userConfig = __DIR__ .'/../../config/config.php';
+            }
+
+            // Load the config for now..
+            $config = $this->app['files']->getRequire($userConfig);
+            $this->app['config']->set('feed-reader::config', $config);
+        }
+    }
+
 }