Merge pull request #23 from ARCANEDEV/patch-service_providers

Updating service providers
ARCANEDEV · Dec 19, 2016 · caf24ea · caf24ea
2 parents 2fc2cce + eef3b52
commit caf24ea
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 38 deletions.
diff --git a/composer.json b/composer.json
@@ -18,11 +18,11 @@
     "license": "MIT",
     "require": {
         "php":               ">=5.6",
-        "arcanedev/support": "~3.0"
+        "arcanedev/support": "~3.20"
     },
     "require-dev": {
-        "phpunit/phpcov":    "~2.0|~3.0",
-        "phpunit/phpunit":   "~4.0|~5.0"
+        "phpunit/phpcov":  "~3.0",
+        "phpunit/phpunit": "~5.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Providers/UtilityServiceProvider.php b/src/Providers/UtilityServiceProvider.php
@@ -1,5 +1,6 @@
 <?php namespace Arcanedev\SeoHelper\Providers;
 
+use Arcanedev\SeoHelper\Contracts;
 use Arcanedev\SeoHelper\SeoMeta;
 use Arcanedev\SeoHelper\SeoOpenGraph;
 use Arcanedev\SeoHelper\SeoTwitter;
@@ -51,9 +52,9 @@ public function provides()
             'arcanedev.seo-helper.meta',
             'arcanedev.seo-helper.open-graph',
             'arcanedev.seo-helper.twitter',
-            \Arcanedev\SeoHelper\Contracts\SeoMeta::class,
-            \Arcanedev\SeoHelper\Contracts\SeoOpenGraph::class,
-            \Arcanedev\SeoHelper\Contracts\SeoTwitter::class,
+            Contracts\SeoMeta::class,
+            Contracts\SeoOpenGraph::class,
+            Contracts\SeoTwitter::class,
         ];
     }
 
@@ -66,52 +67,43 @@ public function provides()
      */
     private function registerSeoMetaService()
     {
-        $this->singleton('arcanedev.seo-helper.meta', function ($app) {
+        $this->singleton(Contracts\SeoMeta::class, function ($app) {
             /** @var  \Illuminate\Contracts\Config\Repository  $config */
             $config = $app['config'];
 
             return new SeoMeta($config->get('seo-helper'));
         });
 
-        $this->bind(
-            \Arcanedev\SeoHelper\Contracts\SeoMeta::class,
-            'arcanedev.seo-helper.meta'
-        );
+        $this->singleton('arcanedev.seo-helper.meta', Contracts\SeoMeta::class);
     }
 
     /**
      * Register SeoOpenGraph service.
      */
     private function registerSeoOpenGraphService()
     {
-        $this->singleton('arcanedev.seo-helper.open-graph', function ($app) {
+        $this->singleton(Contracts\SeoOpenGraph::class, function ($app) {
             /** @var  \Illuminate\Contracts\Config\Repository  $config */
             $config = $app['config'];
 
             return new SeoOpenGraph($config->get('seo-helper'));
         });
 
-        $this->bind(
-            \Arcanedev\SeoHelper\Contracts\SeoOpenGraph::class,
-            'arcanedev.seo-helper.open-graph'
-        );
+        $this->singleton('arcanedev.seo-helper.open-graph', Contracts\SeoOpenGraph::class);
     }
 
     /**
      * Register SeoTwitter service.
      */
     private function registerSeoTwitterService()
     {
-        $this->singleton('arcanedev.seo-helper.twitter', function ($app) {
+        $this->singleton(Contracts\SeoTwitter::class, function ($app) {
             /** @var  \Illuminate\Contracts\Config\Repository  $config */
             $config = $app['config'];
 
             return new SeoTwitter($config->get('seo-helper'));
         });
 
-        $this->bind(
-            \Arcanedev\SeoHelper\Contracts\SeoTwitter::class,
-            'arcanedev.seo-helper.twitter'
-        );
+        $this->singleton('arcanedev.seo-helper.twitter', Contracts\SeoTwitter::class);
     }
 }
diff --git a/src/SeoHelperServiceProvider.php b/src/SeoHelperServiceProvider.php
@@ -52,7 +52,7 @@ public function getBasePath()
     public function register()
     {
         $this->registerConfig();
-        $this->app->register(Providers\UtilityServiceProvider::class);
+        $this->registerProvider(Providers\UtilityServiceProvider::class);
         $this->registerSeoHelperService();
     }
 
@@ -76,14 +76,6 @@ public function provides()
         return [
             'arcanedev.seo-helper',
             Contracts\SeoHelper::class,
-
-            // Utilities
-            'arcanedev.seo-helper.meta',
-            'arcanedev.seo-helper.open-graph',
-            'arcanedev.seo-helper.twitter',
-            Contracts\SeoMeta::class,
-            Contracts\SeoOpenGraph::class,
-            Contracts\SeoTwitter::class,
         ];
     }
 

diff --git a/tests/SeoHelperServiceProviderTest.php b/tests/SeoHelperServiceProviderTest.php
@@ -60,14 +60,6 @@ public function it_can_provides()
         $expected = [
             'arcanedev.seo-helper',
             \Arcanedev\SeoHelper\Contracts\SeoHelper::class,
-
-            // Utilities
-            'arcanedev.seo-helper.meta',
-            'arcanedev.seo-helper.open-graph',
-            'arcanedev.seo-helper.twitter',
-            \Arcanedev\SeoHelper\Contracts\SeoMeta::class,
-            \Arcanedev\SeoHelper\Contracts\SeoOpenGraph::class,
-            \Arcanedev\SeoHelper\Contracts\SeoTwitter::class,
         ];
 
         $this->assertSame($expected, $this->provider->provides());