Merge pull request #31 from candasm/php_54_class_name_bug_fix

Update mockery mock class names for php 54.

Author: candasm

tests/Unit/ElasticsearchServiceProviderUnitTest.php

@@ -2,63 +2,60 @@
 namespace Shift31\LaravelElasticsearch\Tests\Unit;
 
 use Mockery;
-use Elasticsearch\Client;
 use Mockery\MockInterface;
-use Illuminate\Config\Repository;
-use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\AliasLoader;
-use Illuminate\Foundation\Application;
 use Shift31\LaravelElasticsearch\Tests\TestCase;
 use Shift31\LaravelElasticsearch\ElasticsearchServiceProvider;
 
 class ElasticsearchServiceProviderUnitTest extends TestCase
 {
     public function test_it_should_provide_elasticsearch()
     {
-        $provider = new ElasticsearchServiceProvider(Mockery::mock(Application::class));
+        $provider = new ElasticsearchServiceProvider(Mockery::mock('Illuminate\Foundation\Application'));
         $this->assertEquals(['elasticsearch'], $provider->provides());
     }
 
     public function test_boot_method_to_set_config_file()
     {
         $configPath = realpath($this->getSourcePath('config'));
-        $filesMock = Mockery::mock(Filesystem::class, function (MockInterface $m) use ($configPath) {
+        $filesMock = Mockery::mock('Illuminate\Filesystem\Filesystem', function (MockInterface $m) use ($configPath) {
             $m->shouldReceive('isDirectory')->with($configPath)->once()->andReturn(true);
             $m->shouldReceive('isDirectory')->withAnyArgs()->times(3)->andReturn(false);
         });
-        $configMock = Mockery::mock(Repository::class, function (MockInterface $m) use ($configPath) {
+        $configMock = Mockery::mock('Illuminate\Config\Repository', function (MockInterface $m) use ($configPath) {
             $m->shouldReceive('package')
                 ->with('shift31/laravel-elasticsearch', $configPath, 'laravel-elasticsearch')
                 ->once()
                 ->andReturnSelf();
         });
-        $application = Mockery::mock(Application::class, function (MockInterface $m) use ($configMock, $filesMock) {
-            $m->shouldReceive('offsetGet')->with('config')->once()->andReturn($configMock);
-            $m->shouldReceive('offsetGet')->with('files')->times(4)->andReturn($filesMock);
-            $m->shouldReceive('offsetGet')->with('path')->once()->andReturn($this->getSourcePath());
-        });
+        $application = Mockery::mock('Illuminate\Foundation\Application',
+            function (MockInterface $m) use ($configMock, $filesMock) {
+                $m->shouldReceive('offsetGet')->with('config')->once()->andReturn($configMock);
+                $m->shouldReceive('offsetGet')->with('files')->times(4)->andReturn($filesMock);
+                $m->shouldReceive('offsetGet')->with('path')->once()->andReturn($this->getSourcePath());
+            });
         $provider = new ElasticsearchServiceProvider($application);
         $this->assertNull($provider->boot());
     }
 
     public function test_register_method_to_set_singleton_elastic_search_client()
     {
         $configPath = $this->getSourcePath('config/elasticsearch.php');
-        $configMock = Mockery::mock(Repository::class, function (MockInterface $m) {
+        $configMock = Mockery::mock('Illuminate\Config\Repository', function (MockInterface $m) {
             $m->shouldReceive('get')->with('elasticsearch')->andReturn([]);
         });
-        $filesMock = Mockery::mock(Filesystem::class, function (MockInterface $m) use ($configPath) {
+        $filesMock = Mockery::mock('Illuminate\Filesystem\Filesystem', function (MockInterface $m) use ($configPath) {
             $m->shouldReceive('getRequire')
                 ->with($configPath)
                 ->once()->andReturn([]);
         });
-        $application = Mockery::mock(Application::class, function (MockInterface $m) use ($configMock, $filesMock) {
+        $application = Mockery::mock('Illuminate\Foundation\Application', function (MockInterface $m) use ($configMock, $filesMock) {
             $m->shouldReceive('booting')->once()->andReturnSelf();
             $m->shouldReceive('offsetGet')->with('config')->andReturn($configMock);
             $m->shouldReceive('offsetGet')->with('files')->andReturn($filesMock);
             $m->shouldReceive('singleton')->with('elasticsearch',
                 Mockery::on(function ($closure) {
-                    $this->assertInstanceOf(Client::class, $closure());
+                    $this->assertInstanceOf('Elasticsearch\Client', $closure());
 
                     return true;
                 }))->once()->andReturnSelf();
@@ -69,7 +66,7 @@ public function test_register_method_to_set_singleton_elastic_search_client()
 
     public function test_register_method_to_set_elastic_search_facade()
     {
-        $application = Mockery::mock(Application::class, function (MockInterface $m) {
+        $application = Mockery::mock('Illuminate\Foundation\Application', function (MockInterface $m) {
             $m->shouldReceive('singleton')->once()->andReturnSelf();
             $m->shouldReceive('booting')->with(Mockery::on(function ($closure) {
                 $closure();

tests/Unit/EsUnitTest.php

@@ -3,7 +3,6 @@
 
 use Mockery;
 use ReflectionClass;
-use Illuminate\Foundation\Application;
 use Shift31\LaravelElasticsearch\Facades\Es;
 use Shift31\LaravelElasticsearch\Tests\TestCase;
 use Shift31\LaravelElasticsearch\ElasticsearchServiceProvider;
@@ -15,7 +14,7 @@ public function test_to_facade_accessor_matches_service_provider()
         $class = new ReflectionClass(new Es());
         $method = $class->getMethod('getFacadeAccessor');
         $method->setAccessible(true);
-        $provider = new ElasticsearchServiceProvider(Mockery::mock(Application::class));
+        $provider = new ElasticsearchServiceProvider(Mockery::mock('Illuminate\Foundation\Application'));
         $this->assertEquals($provider->provides(), (array)$method->invoke(new Es()));
     }
 }