This refs #16

jelovac · Apr 5, 2015 · ab2a9e5 · ab2a9e5
1 parent 1b6ab60
commit ab2a9e5
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "phpunit/phpunit": "4.4.*"
     },
     "autoload": {
-        "psr-4": {
+        "psr-0": {
             "Jelovac\\Bitly4laravel\\": "src/"
         }
     },

diff --git a/src/API.php → src/Jelovac/Bitly4laravel/API.php b/src/API.php → src/Jelovac/Bitly4laravel/API.php
diff --git a/src/Bitly4laravel.php → src/Jelovac/Bitly4laravel/Bitly4laravel.php b/src/Bitly4laravel.php → src/Jelovac/Bitly4laravel/Bitly4laravel.php
diff --git a/src/Bitly4laravelServiceProvider.php → ...4laravel/Bitly4laravelServiceProvider.php b/src/Bitly4laravelServiceProvider.php → ...4laravel/Bitly4laravelServiceProvider.php
diff --git a/src/BitlyInterface.php → src/Jelovac/Bitly4laravel/BitlyInterface.php b/src/BitlyInterface.php → src/Jelovac/Bitly4laravel/BitlyInterface.php
diff --git a/src/Exceptions/InvalidTypeException.php → ...ravel/Exceptions/InvalidTypeException.php b/src/Exceptions/InvalidTypeException.php → ...ravel/Exceptions/InvalidTypeException.php
diff --git a/src/Exceptions/NonBooleanTypeException.php → ...el/Exceptions/NonBooleanTypeException.php b/src/Exceptions/NonBooleanTypeException.php → ...el/Exceptions/NonBooleanTypeException.php
diff --git a/src/Exceptions/NonIntegerTypeException.php → ...el/Exceptions/NonIntegerTypeException.php b/src/Exceptions/NonIntegerTypeException.php → ...el/Exceptions/NonIntegerTypeException.php
diff --git a/src/Exceptions/NonStringTypeException.php → ...vel/Exceptions/NonStringTypeException.php b/src/Exceptions/NonStringTypeException.php → ...vel/Exceptions/NonStringTypeException.php
diff --git a/src/Facades/Bitly4laravel.php → ...c/Bitly4laravel/Facades/Bitly4laravel.php b/src/Facades/Bitly4laravel.php → ...c/Bitly4laravel/Facades/Bitly4laravel.php
diff --git a/src/Laravel4ServiceProvider.php → ...Bitly4laravel/Laravel4ServiceProvider.php b/src/Laravel4ServiceProvider.php → ...Bitly4laravel/Laravel4ServiceProvider.php
@@ -23,7 +23,7 @@ public function boot()
     public function register()
     {
         $this->app['bitly4laravel'] = $this->app->share(function($app) {
-            $config = $app['config']->get('bitly4laravel::bitly4laravel');
+            $config = $app['config']->get('bitly4laravel::config');
             return new Bitly4laravel($config);
         });
     }

diff --git a/src/Laravel5ServiceProvider.php → ...Bitly4laravel/Laravel5ServiceProvider.php b/src/Laravel5ServiceProvider.php → ...Bitly4laravel/Laravel5ServiceProvider.php
@@ -12,7 +12,7 @@ class Laravel5ServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $configPath = __DIR__ . '/config/bitly4laravel.php';
+        $configPath = __DIR__ . '/../../config/config.php';
 
         $paths = array(
             $configPath => config_path("bitly4laravel.php"),

diff --git a/src/Model.php → src/Jelovac/Bitly4laravel/Model.php b/src/Model.php → src/Jelovac/Bitly4laravel/Model.php
diff --git a/src/config/bitly4laravel.php → src/config/config.php b/src/config/bitly4laravel.php → src/config/config.php