Updating Service Provider to do the Laravel 5 way of adding resources

composer.json

@@ -32,6 +32,9 @@
             "src/migrations",
             "src/commands"
         ],
+        "files": [
+            "tests/Confide/helpers.php"
+        ],
         "psr-4": {
             "Zizaco\\Confide\\": "src/Confide/"
         }

src/Confide/ServiceProvider.php

@@ -21,7 +21,14 @@ class ServiceProvider extends IlluminateServiceProvider
      */
     public function boot()
     {
-        $this->package('zizaco/confide', 'confide', __DIR__.'/../');
+        $root = __DIR__.'/../';
+
+        $this->publishes([
+            $root . 'config/config.php' => config_path('confide.php'),
+        ]);
+        $this->mergeConfigFrom($root . 'config/config.php', 'confide');
+        $this->loadTranslationsFrom($root . 'lang', 'confide');
+        $this->loadViewsFrom($root . 'views', 'confide');
 
         $this->commands(
             'command.confide.controller',

tests/Confide/ServiceProviderTest.php

@@ -20,19 +20,44 @@ public function testShouldBoot()
         | Set
         |------------------------------------------------------------
         */
-        $sp = m::mock('Zizaco\Confide\ServiceProvider[package,commands]', ['something']);
+        $sp = m::mock(
+            'Zizaco\Confide\ServiceProvider[commands,loadTranslationsFrom,loadViewsFrom,mergeConfigFrom,publishes]',
+            ['something']
+        );
+        $sp->shouldAllowMockingProtectedMethods();
         $test = $this;
 
         /*
         |------------------------------------------------------------
         | Expectation
         |------------------------------------------------------------
         */
-        $sp->shouldReceive('package')
-            ->with('zizaco/confide', 'confide', m::any())
+        $sp->shouldReceive('publishes')
+            ->with(m::type('array'))
+            ->once()
+            ->andReturnUsing(function ($array) use ($test) {
+                $test->assertContains('test/confide.php', $array);
+            });
+
+        $sp->shouldReceive('mergeConfigFrom')
+            ->with(m::type('string'), 'confide')
+            ->once()
+            ->andReturnUsing(function ($a, $b) use ($test) {
+                $test->assertStringEndsWith('config/config.php', $a);
+            });
+
+        $sp->shouldReceive('loadTranslationsFrom')
+            ->with(m::type('string'), 'confide')
+            ->once()
+            ->andReturnUsing(function ($a, $b) use ($test) {
+                $test->assertStringEndsWith('lang', $a);
+            });
+
+        $sp->shouldReceive('loadViewsFrom')
+            ->with(m::type('string'), 'confide')
             ->once()
-            ->andReturnUsing(function ($a, $b, $c) use ($test) {
-                $test->assertContains('confide/src/Confide/../', $c);
+            ->andReturnUsing(function ($a, $b) use ($test) {
+                $test->assertStringEndsWith('views', $a);
             });
 
         $sp->shouldReceive('commands')

tests/Confide/helpers.php

@@ -0,0 +1,6 @@
+<?php namespace Zizaco\Confide;
+
+function config_path($path)
+{
+    return 'test/' . $path;
+}