Merge

.gitattributes

@@ -4,5 +4,5 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
-/phpunit.xml export-ignore
+/phpunit.xml.dist export-ignore
 /README.md export-ignore

.gitignore

@@ -1,6 +1,3 @@
-/vendor
-composer.phar
 composer.lock
-.DS_Store
-.idea
 phpunit.xml
+vendor

.travis.yml

@@ -1,12 +1,21 @@
 language: php
 
 php:
+  - 5.5.9
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
-before_script:
-  - composer self-update
-  - composer install --prefer-source --no-interaction --dev
+sudo: false
 
-script: vendor/bin/phpspec run
+install:
+  - travis_retry composer install --no-interaction --prefer-source
+
+script:
+  - if [ "$TRAVIS_PHP_VERSION" != "5.5.9" ] && [ "$TRAVIS_PHP_VERSION" != "5.5" ] && [ "$TRAVIS_PHP_VERSION" != "5.6" ]; then vendor/bin/phpunit; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi
+
+after_script:
+  - if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "5.5.9" ] || [ "$TRAVIS_PHP_VERSION" == "5.5" ] || [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Tom Lingham
+Copyright (c) 2014-2016 Tom Lingham <tjlingham@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -10,17 +10,24 @@
         }
     ],
     "require": {
-        "php": ">=5.5.0",
-        "illuminate/support": "5.*"
+        "php": "^5.5.9 || ^7.0",
+        "illuminate/support": "5.1.* || 5.2.*"
     },
     "require-dev" :{
-        "phpspec/phpspec": "~2.0"
+        "graham-campbell/testbench": "^3.1",
+        "mockery/mockery": "^0.9.4",
+        "phpunit/phpunit": "^4.8 || ^5.0"
     },
     "autoload": {
         "psr-4": {
             "TomLingham\\Searchy\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "TomLingham\\Tests\\Searchy\\": "tests/"
+        }
+    },
     "config": {
         "preferred-install": "dist"
     },

phpunit.xml.dist

@@ -1,18 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
          bootstrap="vendor/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
+         failOnRisky="true"
+         failOnWarning="true"
          processIsolation="false"
+         stopOnError="false"
          stopOnFailure="false"
-         syntaxCheck="false"
+         verbose="true"
 >
     <testsuites>
         <testsuite name="Laravel Searchy Test Suite">
-            <directory suffix=".php">./tests/</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
 </phpunit>

src/SearchyServiceProvider.php

@@ -2,67 +2,82 @@
 
 namespace TomLingham\Searchy;
 
+use Illuminate\Contracts\Container\Container;
+use Illuminate\Foundation\Application as LaravelApplication;
 use Illuminate\Support\ServiceProvider;
+use Laravel\Lumen\Application as LumenApplication;
 
+/**
+ * This is the searchy service provider class.
+ *
+ * @author Tom Lingham <tjlingham@gmail.com>
+ * @author Vincent Klaiber <hello@vinkla.com>
+ */
 class SearchyServiceProvider extends ServiceProvider
 {
     /**
-     * Indicates if loading of the provider is deferred.
+     * Boot the service provider.
      *
-     * @var bool
-     */
-    protected $defer = false;
-
-    /**
-     * Register the service provider.
+     * @return void
      */
-    public function register()
+    public function boot()
     {
-        //
+        $this->setupConfig();
     }
 
     /**
-     * Registers searchy.
+     * Setup the config.
+     *
+     * @return void
      */
-    public function registerSearchy()
+    protected function setupConfig()
     {
-        // Laravel <= 5.1
-        $closure = function ($app) {
-            return new SearchBuilder( $app['config'] );
-        };
-
+        $source = realpath(__DIR__.'/../config/searchy.php');
 
-        if ( method_exists($this->app, 'bindShared') )
-        {
-            $this->app->bindShared('searchy', $closure);
+        if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
+            $this->publishes([$source => config_path('searchy.php')]);
+        } elseif ($this->app instanceof LumenApplication) {
+            $this->app->configure('searchy');
         }
 
-        // Laravel 5.2 Goodness :)
-        else {
-            $this->app->singleton('searchy', $closure);
-        }
+        $this->mergeConfigFrom($source, 'searchy');
     }
 
     /**
-     * Loads the configuration file.
+     * Register the service provider.
+     *
+     * @return void
      */
-    public function setupConfig()
+    public function register()
     {
-        $source = realpath(__DIR__.'/../config/searchy.php');
+        $this->registerSearchBuilder();
+    }
 
-        if (class_exists('Illuminate\Foundation\Application', false)) {
-            $this->publishes([$source => config_path('searchy.php')]);
-        }
+    /**
+     * Register the search builder class.
+     *
+     * @return void
+     */
+    public function registerSearchBuilder()
+    {
+        $this->app->singleton('searchy', function (Container $app) {
+            $config = $app['config'];
 
-        $this->mergeConfigFrom($source, 'searchy');
+            return new SearchBuilder($config);
+        });
+
+        $this->app->alias('searchy', HashidsFactory::class);
     }
 
     /**
-     * Boot the service provider.
+     * Get the services provided by the provider.
+     *
+     * @return string[]
      */
-    public function boot()
+    public function provides()
     {
-        $this->setupConfig();
-        $this->registerSearchy();
+        return [
+            'searchy',
+        ];
     }
 }

tests/AbstractTestCase.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace TomLingham\Tests\Searchy;
+
+use GrahamCampbell\TestBench\AbstractPackageTestCase;
+use TomLingham\Searchy\SearchyServiceProvider;
+
+/**
+ * This is the abstract test case class.
+ *
+ * @author Vincent Klaiber <hello@vinkla.com>
+ */
+abstract class AbstractTestCase extends AbstractPackageTestCase
+{
+    /**
+     * Get the service provider class.
+     *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     *
+     * @return string
+     */
+    protected function getServiceProviderClass($app)
+    {
+        return SearchyServiceProvider::class;
+    }
+}

tests/Facades/SearchyTest.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace TomLingham\Tests\Searchy\Facades;
+
+use GrahamCampbell\TestBenchCore\FacadeTrait;
+use TomLingham\Searchy\Facades\Searchy;
+use TomLingham\Searchy\SearchBuilder;
+use TomLingham\Tests\Searchy\AbstractTestCase;
+
+/**
+ * This is the searchy facade test class.
+ *
+ * @author Vincent Klaiber <hello@vinkla.com>
+ */
+class SearchyTest extends AbstractTestCase
+{
+    use FacadeTrait;
+
+    /**
+     * Get the facade accessor.
+     *
+     * @return string
+     */
+    protected function getFacadeAccessor()
+    {
+        return 'searchy';
+    }
+
+    /**
+     * Get the facade class.
+     *
+     * @return string
+     */
+    protected function getFacadeClass()
+    {
+        return Searchy::class;
+    }
+
+    /**
+     * Get the facade root.
+     *
+     * @return string
+     */
+    protected function getFacadeRoot()
+    {
+        return SearchBuilder::class;
+    }
+}

tests/ServiceProviderTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace TomLingham\Tests\Searchy;
+
+use GrahamCampbell\TestBenchCore\ServiceProviderTrait;
+use TomLingham\Searchy\SearchBuilder;
+
+/**
+ * This is the service provider test.
+ *
+ * @author Vincent Klaiber <hello@vinkla.com>
+ */
+class ServiceProviderTest extends AbstractTestCase
+{
+    use ServiceProviderTrait;
+
+    public function testSearchBuilderIsInjectable()
+    {
+        $this->assertIsInjectable(SearchBuilder::class);
+    }
+}