Porting to Laravel 5.0

Author: nqxcode

README.md

@@ -1,4 +1,4 @@
-Laravel 4.2 Lucene search
+Laravel 5 Lucene search
 ==============
 
 [![Latest Stable Version](https://poser.pugx.org/nqxcode/laravel-lucene-search/v/stable.png)](https://packagist.org/packages/nqxcode/laravel-lucene-search)
@@ -7,7 +7,7 @@ Laravel 4.2 Lucene search
 [![Build Status](https://travis-ci.org/nqxcode/laravel-lucene-search.svg?branch=master)](https://travis-ci.org/nqxcode/laravel-lucene-search)
 
 
-Laravel 4.2 package for full-text search over Eloquent models based on ZendSearch Lucene.
+Laravel 5.0 package for full-text search over Eloquent models based on ZendSearch Lucene.
 
 ## Installation
 
@@ -16,7 +16,7 @@ Require this package in your composer.json and run composer update:
 ```json
 {
 	"require": {
-        "nqxcode/laravel-lucene-search": "1.*"
+        "nqxcode/laravel-lucene-search": "2.*"
 	}
 }
 ```
@@ -41,7 +41,7 @@ If you want to use the facade to search, add this to your facades in `app/config
 Publish the config file into your project by running:
 
 ```bash
-php artisan config:publish nqxcode/laravel-lucene-search
+php artisan vendor:publish --provider="Nqxcode\LuceneSearch\ServiceProvider"
 ```
 ###Basic
 In published config file add descriptions for models which need to be indexed, for example:

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "nqxcode/laravel-lucene-search",
-    "description": "Laravel 4.2 package for full-text search over Eloquent models based on ZendSearch Lucene.",
+    "description": "Laravel 5 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.4.0",
-        "illuminate/support": "4.2.*",
+        "illuminate/support": "5.0.*",
         "nqxcode/zendsearch": "2.*",
         "nqxcode/lucene-stemmer-en-ru": "1.*"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "mockery/mockery": "0.9.*",
-        "orchestra/testbench": "2.2.*"
+        "orchestra/testbench": "3.0.*"
     },
     "autoload": {
         "files": [

src/Nqxcode/LuceneSearch/Console/ClearCommand.php

@@ -15,7 +15,7 @@ public function fire()
             $this->output = new NullOutput;
         }
 
-        if ($result = rmdir_recursive(Config::get('laravel-lucene-search::index.path'))) {
+        if ($result = rmdir_recursive(Config::get('laravel-lucene-search.index.path'))) {
             $this->info('Search index is cleared.');
         } else {
             $this->comment('There is nothing to clear..');

src/Nqxcode/LuceneSearch/Query/Builder.php

@@ -1,6 +1,7 @@
 <?php namespace Nqxcode\LuceneSearch\Query;
 
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Pagination\Paginator;
 use ZendSearch\Lucene\Search\Query\AbstractQuery;
 use ZendSearch\Lucene\Search\Query\Boolean as QueryBoolean;
 use Input;
@@ -107,7 +108,7 @@ public function paginate($perPage = 25, $page = null)
 
         $total = $this->count();
 
-        $paginator = App::make('paginator')->make($models, $total, $perPage);
+        $paginator = new Paginator($models, $total, $perPage);
 
         return $paginator;
     }

src/Nqxcode/LuceneSearch/ServiceProvider.php

@@ -5,7 +5,6 @@
 use Nqxcode\LuceneSearch\Analyzer\Stopwords\FilterFactory;
 use Nqxcode\LuceneSearch\Index\Connection;
 use Nqxcode\LuceneSearch\Model\Config as ModelsConfig;
-use Nqxcode\LuceneSearch\Pagination\Factory;
 use ZendSearch\Lucene\Analysis\Analyzer\Common\Utf8Num\CaseInsensitive;
 
 class ServiceProvider extends \Illuminate\Support\ServiceProvider
@@ -25,7 +24,7 @@ class ServiceProvider extends \Illuminate\Support\ServiceProvider
      */
     public function boot()
     {
-        $this->package('nqxcode/laravel-lucene-search');
+        $this->mergeConfigFrom(__DIR__.'/../../config/config.php', 'laravel-lucene-search');
     }
 
     /**
@@ -35,14 +34,18 @@ public function boot()
      */
     public function register()
     {
+        $this->publishes([
+            __DIR__.'/../../config/config.php' => config_path('laravel-lucene-search.php'),
+        ]);
+
         $this->app->bind('Nqxcode\LuceneSearch\Search', function ($app) {
             return $app['search'];
         });
 
         $this->app->bindShared('search', function ($app) {
             return new Search(
-                $app['search.connection'],
-                $app['search.models.config']
+                $app['laravel-lucene-search.connection'],
+                $app['laravel-lucene-search.models.config']
             );
         });
 
@@ -52,26 +55,26 @@ public function register()
 
         $this->app->bind('Nqxcode\LuceneSearch\Analyzer\Config', function () {
             return new AnalyzerConfig(
-                Config::get('laravel-lucene-search::analyzer.filters', []),
-                Config::get('laravel-lucene-search::analyzer.stopwords', []),
+                Config::get('laravel-lucene-search.analyzer.filters', []),
+                Config::get('laravel-lucene-search.analyzer.stopwords', []),
                 new FilterFactory
             );
         });
 
-        $this->app->bindShared('search.index.path', function () {
-            return Config::get('laravel-lucene-search::index.path');
+        $this->app->bindShared('laravel-lucene-search.index.path', function () {
+            return Config::get('laravel-lucene-search.index.path');
         });
 
-        $this->app->bindShared('search.connection', function ($app) {
+        $this->app->bindShared('laravel-lucene-search.connection', function ($app) {
             return new Connection(
-                $app['search.index.path'],
+                $app['laravel-lucene-search.index.path'],
                 $app->make('Nqxcode\LuceneSearch\Analyzer\Config')
             );
         });
 
-        $this->app->bindShared('search.models.config', function ($app) {
+        $this->app->bindShared('laravel-lucene-search.models.config', function ($app) {
             return new ModelsConfig(
-                Config::get('laravel-lucene-search::index.models'),
+                Config::get('laravel-lucene-search.index.models'),
                 $app->make('Nqxcode\LuceneSearch\Model\Factory')
             );
         });

src/config/config.php

@@ -22,7 +22,7 @@
      */
     'index' => [
 
-        'path' => storage_path() . '/lucene-search/index',
+        'path' => storage_path('app') . '/lucene-search/index',
 
         'models' => [
             // Add models descriptions here.

tests/TestCase.php

@@ -34,12 +34,12 @@ protected function getEnvironmentSetUp($app)
         ));
     }
 
-    protected function getPackageProviders()
+    protected function getPackageProviders($app)
     {
         return array('Nqxcode\LuceneSearch\ServiceProvider');
     }
 
-    protected function getPackageAliases()
+    protected function getPackageAliases($app)
     {
         return array(
             'Search' => 'Nqxcode\LuceneSearch\Facade',

tests/functional/BaseTestCase.php

@@ -1,6 +1,7 @@
 <?php
 namespace tests\functional;
 
+use Illuminate\Support\Facades\Artisan;
 use tests\TestCase;
 use Config;
 
@@ -15,20 +16,18 @@ public function setUp()
         parent::setUp();
         $this->configure();
 
-        $artisan = $this->app->make('artisan');
-
         // Call migrations specific to our tests, e.g. to seed the db.
-        $artisan->call('migrate', ['--database' => 'testbench', '--path' => '../tests/migrations']);
+        Artisan::call('migrate', ['--database' => 'testbench', '--path' => '../tests/migrations']);
 
         // Call rebuild search index.
-        $artisan->call('search:rebuild');
+        Artisan::call('search:rebuild');
     }
 
     protected function configure()
     {
-        Config::set('laravel-lucene-search::index.path', storage_path() . '/lucene-search/index_' . uniqid());
+        Config::set('laravel-lucene-search.index.path', storage_path('app') . '/lucene-search/index_' . uniqid());
         Config::set(
-            'laravel-lucene-search::index.models',
+            'laravel-lucene-search.index.models',
             [
                 'tests\models\Product' => [
                     'fields' => [

tests/functional/FieldsBoostingTest.php

@@ -15,7 +15,7 @@ protected function configure()
         parent::configure();
 
         Config::set(
-            'laravel-lucene-search::index.models',
+            'laravel-lucene-search.index.models',
             [
                 'tests\models\Product' => [
                     'fields' => [

tests/functional/ModelBoostingTest.php

@@ -15,7 +15,7 @@ protected function configure()
         parent::configure();
 
         Config::set(
-            'laravel-lucene-search::index.models',
+            'laravel-lucene-search.index.models',
             [
                 'tests\models\Product' => [
                     'fields' => [