Drop ..\Services\.. namespace as it broke the package

Vinelab · Jun 8, 2013 · 6cb6b53 · 6cb6b53
1 parent c1ac587
commit 6cb6b53
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
 
     "autoload": {
         "psr-0": {
-            "Vinelab\\Services\\Country": "src/"
+            "Vinelab\\Country": "src/"
         }
     },
     "minimum-stability": "dev"

diff --git a/...rvices/Country/CountryServiceProvider.php → ...inelab/Country/CountryServiceProvider.php b/...rvices/Country/CountryServiceProvider.php → ...inelab/Country/CountryServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Vinelab\Services\Country;
+<?php namespace Vinelab\Country;
 
 use Illuminate\Support\ServiceProvider;
 
@@ -28,14 +28,15 @@ public function boot()
 	 */
 	public function register()
 	{
-		$this->app['country'] = $this->app->share(function($app){
+		$this->app->bind('vinelab.country', function()
+		{
 			return new Guide($this->app['config']);
 		});
 
 		$this->app->booting(function() {
 
 			$loader = \Illuminate\Foundation\AliasLoader::getInstance();
-			$loader->alias('Country', 'Vinelab\Services\Country\Facades\Guide');
+			$loader->alias('Country', 'Vinelab\Country\Facades\Guide');
 		});
 	}
 

diff --git a/...inelab/Services/Country/Facades/Guide.php → src/Vinelab/Country/Facades/Guide.php b/...inelab/Services/Country/Facades/Guide.php → src/Vinelab/Country/Facades/Guide.php
@@ -1,4 +1,4 @@
-<?php namespace Vinelab\Services\Country\Facades;
+<?php namespace Vinelab\Country\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
@@ -9,6 +9,6 @@
 	 *
 	 * @return string
 	 */
-	protected static function getFacadeAccessor() { return 'country'; }
+	protected static function getFacadeAccessor() { return 'vinelab.country'; }
 
 }
diff --git a/src/Vinelab/Services/Country/Guide.php → src/Vinelab/Country/Guide.php b/src/Vinelab/Services/Country/Guide.php → src/Vinelab/Country/Guide.php
@@ -1,4 +1,4 @@
-<?php namespace Vinelab\Services\Country;
+<?php namespace Vinelab\Country;
 
 Class Guide {