Porting to Laravel 5.2.

Author: nqxcode

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "nqxcode/laravel-lucene-search",
-    "description": "Laravel 5 package for full-text search over Eloquent models based on ZendSearch Lucene.",
+    "description": "Laravel 5.2 package for full-text search over Eloquent models based on ZendSearch Lucene.",
     "keywords": ["laravel", "lucene", "zendsearch", "eloquent", "search", "fulltext"],
     "license": "MIT",
     "authors": [
@@ -11,14 +11,14 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "illuminate/support": "5.1.*",
+        "illuminate/support": "5.2.*",
         "nqxcode/zendsearch": "2.*",
         "nqxcode/lucene-stemmer-en-ru": "1.*"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "mockery/mockery": "0.9.*",
-        "orchestra/testbench": "3.1.*"
+        "orchestra/testbench": "3.2.*"
     },
     "autoload": {
         "psr-4": {

src/Nqxcode/LuceneSearch/Query/Builder.php

@@ -4,7 +4,6 @@
 use Illuminate\Pagination\Paginator;
 use ZendSearch\Lucene\Search\Query\AbstractQuery;
 use ZendSearch\Lucene\Search\Query\Boolean as QueryBoolean;
-use Input;
 use App;
 
 /**
@@ -98,7 +97,7 @@ public function count()
      */
     public function paginate($perPage = 25, $page = null)
     {
-        $page = $page ?: Input::get('page', 1);
+        $page = $page ?: request()->input('page', 1);
 
         $this->limit($perPage, ($page - 1) * $perPage);
         $models = $this->get()->all();

src/Nqxcode/LuceneSearch/ServiceProvider.php

@@ -42,7 +42,7 @@ public function register()
             return $app['search'];
         });
 
-        $this->app->bindShared('search', function ($app) {
+        $this->app->singleton('search', function ($app) {
             return new Search(
                 $app['laravel-lucene-search.connection'],
                 $app['laravel-lucene-search.models.config']
@@ -61,29 +61,29 @@ public function register()
             );
         });
 
-        $this->app->bindShared('laravel-lucene-search.index.path', function () {
+        $this->app->singleton('laravel-lucene-search.index.path', function () {
             return Config::get('laravel-lucene-search.index.path');
         });
 
-        $this->app->bindShared('laravel-lucene-search.connection', function ($app) {
+        $this->app->singleton('laravel-lucene-search.connection', function ($app) {
             return new Connection(
                 $app['laravel-lucene-search.index.path'],
                 $app->make('Nqxcode\LuceneSearch\Analyzer\Config')
             );
         });
 
-        $this->app->bindShared('laravel-lucene-search.models.config', function ($app) {
+        $this->app->singleton('laravel-lucene-search.models.config', function ($app) {
             return new ModelsConfig(
                 Config::get('laravel-lucene-search.index.models'),
                 $app->make('Nqxcode\LuceneSearch\Model\Factory')
             );
         });
 
-        $this->app->bindShared('command.search.rebuild', function () {
+        $this->app->singleton('command.search.rebuild', function () {
             return new Console\RebuildCommand;
         });
 
-        $this->app->bindShared('command.search.clear', function () {
+        $this->app->singleton('command.search.clear', function () {
             return new Console\ClearCommand;
         });
 

tests/unit/Query/BuilderTest.php

@@ -9,7 +9,6 @@
 use ZendSearch\Lucene\Search\Query\Boolean;
 
 use App;
-use Input;
 
 class BuilderTest extends TestCase
 {