Merge pull request #82 from ARCANEDEV/patch-1

Fixing & cleaning
ARCANEDEV · Feb 4, 2019 · cbef775 · cbef775
2 parents 63947ca + f66e7ce
commit cbef775
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/_docs/3-Usage.md b/_docs/3-Usage.md
@@ -139,9 +139,9 @@ if ($_POST) {
 <?php echo $captcha->script(); ?>
 
 <script>
-  grecaptcha.ready(function() {
-      grecaptcha.execute('SITE-KEY', {action: 'homepage'});
-  });
+    grecaptcha.ready(function() {
+        grecaptcha.execute('SITE-KEY', {action: 'homepage'});
+    });
 </script>
 ```
 
@@ -156,7 +156,7 @@ Insert reCAPTCHA inside your form using one of this examples:
 ```php
 {!! Form::open([...]) !!}
     // Other inputs...
-    {!! Form::captcha() !!}  OR  {!! Captcha::display() !!}
+    {!! Form::captcha() !!}  OR  {!! no_captcha()->display() !!}
     {!! Form::submit('Submit') !!}
 {!! Form::close() !!}
 
@@ -173,13 +173,13 @@ Insert reCAPTCHA inside your form using one of this examples:
 
 echo Form::open([...]);
     // Other inputs...
-    echo Form::captcha();
+    echo no_captcha()->display()->toHtml();
     echo Form::submit('Submit');
 echo Form::close();
 
 ?>
 
-<?php echo Captcha::script(); ?>
+<?php echo no_captcha()->script()->toHtml(); ?>
 ```
 
 #### Back-end (Controller or somewhere in your project ...)

diff --git a/helpers.php b/helpers.php
@@ -3,7 +3,7 @@
 use Arcanedev\NoCaptcha\Contracts\NoCaptcha;
 use Arcanedev\NoCaptcha\Contracts\NoCaptchaManager;
 
-if ( ! function_exists('nocaptcha')) {
+if ( ! function_exists('no_captcha')) {
     /**
      * Get the NoCaptcha builder.
      *

diff --git a/src/NoCaptchaServiceProvider.php b/src/NoCaptchaServiceProvider.php
@@ -2,6 +2,7 @@
 
 use Arcanedev\LaravelHtml\Contracts\FormBuilder;
 use Arcanedev\Support\PackageServiceProvider as ServiceProvider;
+use Illuminate\Contracts\Foundation\Application;
 
 /**
  * Class     NoCaptchaServiceProvider
@@ -69,19 +70,15 @@ public function provides()
 
     private function registerNoCaptchaManager()
     {
-        $this->bind(Contracts\NoCaptchaManager::class, function ($app) {
+        $this->singleton(Contracts\NoCaptchaManager::class, function ($app) {
             return new NoCaptchaManager($app);
         });
 
-        $this->bind(Contracts\NoCaptcha::class, function ($app) {
-            /**
-             * @var  \Illuminate\Contracts\Config\Repository          $config
-             * @var  \Arcanedev\NoCaptcha\Contracts\NoCaptchaManager  $manager
-             */
-            $config  = $app['config'];
-            $manager = $app[Contracts\NoCaptchaManager::class];
+        $this->bind(Contracts\NoCaptcha::class, function (Application $app) {
+            /** @var  \Illuminate\Contracts\Config\Repository  $config */
+            $config = $app['config'];
 
-            return $manager->version(
+            return $app->make(Contracts\NoCaptchaManager::class)->version(
                 $config->get('no-captcha.version')
             );
         });