Removing of code compatibility with php5.4, changes for readme.

Author: nqxcode

README.md

@@ -16,7 +16,7 @@ Require this package in your composer.json and run composer update:
 ```json
 {
 	"require": {
-        "nqxcode/laravel-lucene-search": "2.1.*-dev"
+        "nqxcode/laravel-lucene-search": "2.1.*"
 	}
 }
 ```
@@ -25,15 +25,15 @@ After updating composer, add the ServiceProvider to the providers array in `app/
 
 ```php
 'providers' => [
-	'Nqxcode\LuceneSearch\ServiceProvider',
+	Nqxcode\LuceneSearch\ServiceProvider::class,
 ],
 ```
 
 If you want to use the facade to search, add this to your facades in `app/config/app.php`:
 
 ```php
 'aliases' => [
-	'Search' => 'Nqxcode\LuceneSearch\Facade',
+	'Search' => Nqxcode\LuceneSearch\Facade::class,
 ],
 ```
 ## Configuration 
@@ -50,13 +50,13 @@ In published config file add descriptions for models which need to be indexed, f
 
 	// ...
 
-	'namespace\FirstModel' => [
+	namespace\FirstModel::class => [
 		'fields' => [
 			'name', 'full_description', // Fields for indexing.
 		]
 	],
 
-	'namespace\SecondModel' => [
+	namespace\SecondModel::class => [
 		'fields' => [
 			'name', 'short_description', // Fields for indexing.
 		]
@@ -88,7 +88,7 @@ Example:
 In config file:
 
 ```php
-        'namespace\FirstModel' => [
+        namespace\FirstModel::class => [
                 'fields' => [
                     'name', 'full_description', // Fixed fields for indexing.
                 ],
@@ -100,7 +100,7 @@ In config file:
 In model add following accessor:
 
 ```php
-        publc function getOptionalAttributesAttribute()
+        public function getOptionalAttributesAttribute()
         {
                 return [
                         'optional_attribute1' => "value1",
@@ -119,7 +119,7 @@ This filters can be deleted or replaced with others.
 'analyzer' => [
     'filters' => [
     	// Default stemming filter.
-    	'Nqxcode\Stemming\TokenFilterEnRu',
+    	Nqxcode\Stemming\TokenFilterEnRu::class,
     ],
 
     // List of paths to files with stopwords. 
@@ -262,8 +262,9 @@ Highlighting of matches is available for any html fragment encoded in **utf-8**
 Search::find('nearly all words must be highlighted')->get();
 $highlighted = Search::highlight('all words');
 
-// highlighted html: 
-// '<span class="highlight">all</span> <span class="highlight">words</span>'
+echo $highlighted;
+ 
+// Echo: <span class="highlight">all</span> <span class="highlight">words</span>
 ```
 ##
 ## License

src/Nqxcode/LuceneSearch/Analyzer/Config.php

@@ -35,7 +35,7 @@ public function __construct(array $filterClasses, array $stopWordFiles, FilterFa
     public function setDefaultAnalyzer()
     {
         /** @var AbstractCommon $analyzer */
-        $analyzer = App::make('ZendSearch\Lucene\Analysis\Analyzer\Common\AbstractCommon');
+        $analyzer = App::make(AbstractCommon::class);
 
         foreach ($this->stopWordFiles as $file) {
             $analyzer->addFilter($this->stopwordsFilterFactory->newInstance($file));
@@ -54,7 +54,7 @@ public function setDefaultAnalyzer()
     public function setHighlighterAnalyzer()
     {
         /** @var AbstractCommon $analyzer */
-        $analyzer = App::make('ZendSearch\Lucene\Analysis\Analyzer\Common\AbstractCommon');
+        $analyzer = App::make(AbstractCommon::class);
 
         foreach ($this->filterClasses as $filterClass) {
             $analyzer->addFilter(App::make($filterClass));

src/Nqxcode/LuceneSearch/Console/RebuildCommand.php

@@ -45,14 +45,13 @@ public function fire()
                         $progress->advance();
                     }
                     $progress->finish();
-
                 } else {
                     $this->comment(' No available models found. ');
                 }
             }
-            $this->info('Operation is fully complete!');
+            $this->info(PHP_EOL . 'Operation is fully complete!');
         } else {
-            $this->error('No models found in config.php file..');
+            $this->error('No models found in config file..');
         }
     }
 }

src/Nqxcode/LuceneSearch/Model/Config.php

@@ -192,8 +192,8 @@ function ($i) use ($field) {
      */
     public function model(QueryHit $hit)
     {
-        $repo = $this->createModelByClassUid(object_get($hit, 'class_uid'));
-        $model = $repo->find(object_get($hit, 'private_key'));
+        $repository = $this->createModelByClassUid(object_get($hit, 'class_uid'));
+        $model = $repository->find(object_get($hit, 'private_key'));
 
         return $model;
     }

src/Nqxcode/LuceneSearch/Model/Factory.php

@@ -1,6 +1,7 @@
 <?php namespace Nqxcode\LuceneSearch\Model;
 
 use App;
+use Illuminate\Database\Eloquent\Model;
 
 class Factory
 {
@@ -11,7 +12,7 @@ class Factory
      */
     public function newInstance($className)
     {
-        $baseClass = 'Illuminate\Database\Eloquent\Model';
+        $baseClass = Model::class;
 
         if (!is_subclass_of($className, $baseClass)) {
             throw new \InvalidArgumentException(

src/Nqxcode/LuceneSearch/Query/Builder.php

@@ -233,8 +233,8 @@ public function rawQuery($query)
             $this->query = $query;
         } else {
             throw new \InvalidArgumentException(
-                "Argument 'query' must be a string or ZendSearch\\Lucene\\Search\\Query\\AbstractQuery instance " .
-                "or callable returning a string or ZendSearch\\Lucene\\Search\\Query\\AbstractQuery instance."
+                "Argument 'query' must be a string or " . AbstractQuery::class . " instance " .
+                "or callable returning a string or " . AbstractQuery::class . " instance."
             );
         }
 

src/Nqxcode/LuceneSearch/Search.php

@@ -3,6 +3,8 @@
 use Illuminate\Database\Eloquent\Model;
 use Nqxcode\LuceneSearch\Highlighting\Html;
 use Nqxcode\LuceneSearch\Model\Config;
+use Nqxcode\LuceneSearch\Query\Builder as QueryBuilder;
+use Nqxcode\LuceneSearch\Highlighting\Html as Highlighter;
 use ZendSearch\Lucene\Document;
 use ZendSearch\Lucene\Index\Term;
 use ZendSearch\Lucene\Search\Query\MultiTerm;
@@ -156,7 +158,7 @@ public function delete(Model $model)
      */
     public function __call($name, $arguments)
     {
-        $queryBuilder = App::make('Nqxcode\LuceneSearch\Query\Builder');
+        $queryBuilder = App::make(QueryBuilder::class);
         return call_user_func_array([$queryBuilder, $name], $arguments);
     }
 
@@ -169,7 +171,7 @@ public function __call($name, $arguments)
     public function highlight($html)
     {
         /** @var Html $highlighter */
-        $highlighter = App::make('Nqxcode\LuceneSearch\Highlighting\Html');
+        $highlighter = App::make(Highlighter::class);
         return $highlighter->highlight($html);
     }
 }

src/config/config.php

@@ -13,7 +13,7 @@
      |
      | For example, model's description can be like this:
      |
-     |      'namespace\ModelClass' => [
+     |      namespace\ModelClass::class => [
      |          'fields' => [
      |              'name', 'description', // Fields for indexing.
      |          ]
@@ -46,7 +46,7 @@
     'analyzer' => [
 
         'filters' => [
-            'Nqxcode\Stemming\TokenFilterEnRu',
+            Nqxcode\Stemming\TokenFilterEnRu::class,
         ],
 
         'stopwords' => Nqxcode\LuceneSearch\Analyzer\Stopwords\Files::get(),