Merge branch 'master' into 5.5

Author: dmitry-ivanov

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.0
   - 7.1
+  - 7.2
 
 services:
   - redis-server

composer.json

@@ -17,7 +17,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0",
-        "mockery/mockery": "^0.9",
+        "mockery/mockery": "^1.0",
         "orchestra/testbench": "3.5.*",
         "illuminated/testing-tools": "5.5.*",
         "predis/predis": "^1.1.1",

composer.lock

@@ -5,7 +5,6 @@
 use GenericCommand;
 use Illuminate\Support\Facades\Cache;
 use Illuminated\Console\Mutex;
-use Mockery;
 use NinjaMutex\Lock\FlockLock;
 use NinjaMutex\Lock\MemcachedLock;
 use NinjaMutex\Lock\MySqlLock;
@@ -22,8 +21,8 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->command = Mockery::mock(GenericCommand::class)->makePartial();
-        $this->command->shouldReceive('argument')->withNoArgs()->andReturn(['foo' => 'bar']);
+        $this->command = mock(GenericCommand::class)->makePartial();
+        $this->command->expects()->argument()->andReturn(['foo' => 'bar']);
     }
 
     /** @test */
@@ -43,7 +42,7 @@ public function it_determines_mutex_strategy_once_while_creation()
     /** @test */
     public function it_has_default_strategy_which_is_file()
     {
-        $this->command->shouldReceive('getMutexStrategy')->withNoArgs()->once()->andReturn('foobar');
+        $this->command->expects()->getMutexStrategy()->andReturn('foobar');
 
         $mutex = new Mutex($this->command);
         $expectedStrategy = new FlockLock(storage_path('app'));
@@ -53,7 +52,7 @@ public function it_has_default_strategy_which_is_file()
     /** @test */
     public function it_supports_mysql_strategy()
     {
-        $this->command->shouldReceive('getMutexStrategy')->withNoArgs()->once()->andReturn('mysql');
+        $this->command->expects()->getMutexStrategy()->andReturn('mysql');
 
         $mutex = new Mutex($this->command);
         $expectedStrategy = new MySqlLock(
@@ -68,7 +67,7 @@ public function it_supports_mysql_strategy()
     /** @test */
     public function it_supports_redis_strategy_with_predis_client_which_is_default()
     {
-        $this->command->shouldReceive('getMutexStrategy')->withNoArgs()->once()->andReturn('redis');
+        $this->command->expects()->getMutexStrategy()->andReturn('redis');
 
         $mutex = new Mutex($this->command);
         $expectedStrategy = new PredisRedisLock($mutex->getPredisClient());
@@ -80,7 +79,7 @@ public function it_supports_redis_strategy_with_phpredis_client()
     {
         config(['database.redis.client' => 'phpredis']);
 
-        $this->command->shouldReceive('getMutexStrategy')->withNoArgs()->once()->andReturn('redis');
+        $this->command->expects()->getMutexStrategy()->andReturn('redis');
 
         $mutex = new Mutex($this->command);
         $expectedStrategy = new PhpRedisLock($mutex->getPhpRedisClient());
@@ -108,7 +107,8 @@ public function it_supports_memcached_strategy()
     {
         Cache::shouldReceive('getStore')->withNoArgs()->twice()->andReturnSelf();
         Cache::shouldReceive('getMemcached')->withNoArgs()->twice()->andReturnSelf();
-        $this->command->shouldReceive('getMutexStrategy')->withNoArgs()->once()->andReturn('memcached');
+
+        $this->command->expects()->getMutexStrategy()->andReturn('memcached');
 
         $mutex = new Mutex($this->command);
         $expectedStrategy = new MemcachedLock(Cache::getStore()->getMemcached());
@@ -122,8 +122,8 @@ public function it_supports_memcached_strategy()
      */
     public function it_delegates_public_method_calls_to_ninja_mutex()
     {
-        $ninja = Mockery::mock('overload:NinjaMutex\Mutex');
-        $ninja->shouldReceive('isLocked')->once();
+        $ninja = mock('overload:NinjaMutex\Mutex');
+        $ninja->expects()->isLocked();
 
         $mutex = new Mutex($this->command);
         $mutex->isLocked();

tests/ConsoleMutex/MutexTest.php

@@ -5,6 +5,9 @@
 use Illuminate\Contracts\Console\Kernel as KernelContract;
 use Illuminated\Testing\TestingTools;
 use Kernel;
+use Mockery;
+
+Mockery::globalHelpers();
 
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {

tests/ConsoleMutex/TestCase.php

@@ -3,7 +3,6 @@
 namespace Illuminated\Console\ConsoleMutex\Tests;
 
 use GenericCommand;
-use Mockery;
 use MysqlStrategyCommand;
 use NullTimeoutCommand;
 use RuntimeException;
@@ -71,9 +70,9 @@ public function mutex_timeout_can_be_set_to_null_by_the_public_method()
     /** @test */
     public function it_generates_mutex_name_based_on_the_command_name_and_arguments()
     {
-        $command = Mockery::mock(GenericCommand::class)->makePartial();
-        $command->shouldReceive('getName')->withNoArgs()->once()->andReturn('icm:generic');
-        $command->shouldReceive('argument')->withNoArgs()->once()->andReturn(['foo' => 'bar', 'baz' => 'faz']);
+        $command = mock(GenericCommand::class)->makePartial();
+        $command->expects()->getName()->andReturn('icm:generic');
+        $command->expects()->argument()->andReturn(['foo' => 'bar', 'baz' => 'faz']);
 
         $md5 = md5(json_encode(['foo' => 'bar', 'baz' => 'faz']));
         $this->assertEquals("icmutex-icm:generic-{$md5}", $command->getMutexName());
@@ -86,9 +85,9 @@ public function it_generates_mutex_name_based_on_the_command_name_and_arguments(
      */
     public function it_allows_to_run_command_if_there_is_no_other_running_instances()
     {
-        $mutex = Mockery::mock('overload:Illuminated\Console\Mutex');
-        $mutex->shouldReceive('acquireLock')->with(0)->once()->andReturn(true);
-        $mutex->shouldReceive('releaseLock')->withNoArgs();
+        $mutex = mock('overload:Illuminated\Console\Mutex');
+        $mutex->expects()->acquireLock(0)->andReturn(true);
+        $mutex->allows()->releaseLock();
 
         $this->artisan('icm:generic');
     }
@@ -100,11 +99,10 @@ public function it_allows_to_run_command_if_there_is_no_other_running_instances(
      */
     public function it_blocks_if_trying_to_run_another_instance_of_the_command()
     {
-        $mutex = Mockery::mock('overload:Illuminated\Console\Mutex');
-        $mutex->shouldReceive('acquireLock')->with(0)->once()->andReturn(false);
+        $mutex = mock('overload:Illuminated\Console\Mutex');
+        $mutex->expects()->acquireLock(0)->andReturn(false);
 
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Command is running now!');
+        $this->willSeeException(RuntimeException::class, 'Command is running now!');
 
         $this->artisan('icm:generic');
     }
@@ -116,8 +114,8 @@ public function it_blocks_if_trying_to_run_another_instance_of_the_command()
      */
     public function it_is_releasing_the_lock_after_command_execution()
     {
-        $mutex = Mockery::mock('overload:Illuminated\Console\Mutex');
-        $mutex->shouldReceive('releaseLock')->withNoArgs()->once();
+        $mutex = mock('overload:Illuminated\Console\Mutex');
+        $mutex->expects()->releaseLock();
 
         $command = new GenericCommand;
         $command->releaseMutexLock($mutex);